diff --git a/RO-VIM-openvim/Makefile b/RO-VIM-openvim/Makefile
deleted file mode 100644
index 8c68832..0000000
--- a/RO-VIM-openvim/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-all: clean package
-
-clean:
-	rm -rf dist deb_dist osm_rovim_openvim-*.tar.gz osm_rovim_openvim.egg-info .eggs
-
-package:
-	python3 setup.py --command-packages=stdeb.command sdist_dsc
-	cd deb_dist/osm-rovim-openvim*/ && dpkg-buildpackage -rfakeroot -uc -us
-
diff --git a/RO-VIM-openvim/requirements.txt b/RO-VIM-openvim/osm_rovim_openvim/__init__.py
similarity index 82%
copy from RO-VIM-openvim/requirements.txt
copy to RO-VIM-openvim/osm_rovim_openvim/__init__.py
index 5802df5..94a6a32 100644
--- a/RO-VIM-openvim/requirements.txt
+++ b/RO-VIM-openvim/osm_rovim_openvim/__init__.py
@@ -1,4 +1,6 @@
-##
+#!/usr/bin/env python3
+# Copyright ETSI Contributors and Others.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,8 +14,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-
-PyYAML
-requests
-netaddr
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-openvim/requirements.txt b/RO-VIM-openvim/osm_rovim_openvim/tests/__init__.py
similarity index 70%
copy from RO-VIM-openvim/requirements.txt
copy to RO-VIM-openvim/osm_rovim_openvim/tests/__init__.py
index 5802df5..04f7d49 100644
--- a/RO-VIM-openvim/requirements.txt
+++ b/RO-VIM-openvim/osm_rovim_openvim/tests/__init__.py
@@ -1,4 +1,6 @@
-##
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,9 +13,4 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-##
-
-PyYAML
-requests
-netaddr
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
+#######################################################################################
diff --git a/RO-VIM-openvim/requirements.txt b/RO-VIM-openvim/requirements.in
similarity index 86%
rename from RO-VIM-openvim/requirements.txt
rename to RO-VIM-openvim/requirements.in
index 5802df5..610aa9a 100644
--- a/RO-VIM-openvim/requirements.txt
+++ b/RO-VIM-openvim/requirements.in
@@ -1,4 +1,5 @@
-##
+# Copyright ETSI Contributors and Others.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,4 +17,3 @@
 PyYAML
 requests
 netaddr
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-openvim/setup.py b/RO-VIM-openvim/setup.py
index 6cc4447..5332aa2 100644
--- a/RO-VIM-openvim/setup.py
+++ b/RO-VIM-openvim/setup.py
@@ -19,8 +19,16 @@
 from setuptools import setup
 
 _name = "osm_rovim_openvim"
+_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full")
+_description = "OSM ro vim plugin for openvim"
+_author = "OSM Support"
+_author_email = "osmsupport@etsi.org"
+_maintainer = "OSM Support"
+_maintainer_email = "osmsupport@etsi.org"
+_license = "Apache 2.0"
+_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary"
 
-README = """
+_readme = """
 ===========
 osm-rovim_openvim
 ===========
@@ -30,28 +38,17 @@
 
 setup(
     name=_name,
-    description="OSM ro vim plugin for openvim",
-    long_description=README,
-    version_command=(
-        "git describe --match v* --tags --long --dirty",
-        "pep440-git-full",
-    ),
-    # version=VERSION,
-    # python_requires='>3.5.0',
-    author="ETSI OSM",
-    author_email="alfonso.tiernosepulveda@telefonica.com",
-    maintainer="Alfonso Tierno",
-    maintainer_email="alfonso.tiernosepulveda@telefonica.com",
-    url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary",
-    license="Apache 2.0",
+    description=_description,
+    long_description=_readme,
+    version_command=_version_command,
+    author=_author,
+    author_email=_author_email,
+    maintainer=_maintainer,
+    maintainer_email=_maintainer_email,
+    url=_url,
+    license=_license,
     packages=[_name],
     include_package_data=True,
-    install_requires=[
-        "requests",
-        "netaddr",
-        "PyYAML",
-        "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin",
-    ],
     setup_requires=["setuptools-version-command"],
     entry_points={
         "osm_rovim.plugins": [
diff --git a/RO-VIM-openvim/stdeb.cfg b/RO-VIM-openvim/stdeb.cfg
index b5efb97..262a47c 100644
--- a/RO-VIM-openvim/stdeb.cfg
+++ b/RO-VIM-openvim/stdeb.cfg
@@ -15,5 +15,3 @@
 
 [DEFAULT]
 X-Python3-Version : >= 3.5
-Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
-Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin
diff --git a/RO-VIM-openvim/tox.ini b/RO-VIM-openvim/tox.ini
deleted file mode 100644
index c26f778..0000000
--- a/RO-VIM-openvim/tox.ini
+++ /dev/null
@@ -1,41 +0,0 @@
-##
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-[tox]
-envlist = flake8
-toxworkdir={toxinidir}/../.tox
-
-[testenv]
-basepython = python3
-install_command = python3 -m pip install -r requirements.txt -U {opts} {packages}
-# deps = -r{toxinidir}/test-requirements.txt
-commands=python3 -m unittest discover -v
-
-[testenv:flake8]
-basepython = python3
-deps = flake8
-commands = flake8 osm_rovim_openvim --max-line-length 120 \
-    --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241
-
-[testenv:unittest]
-basepython = python3
-commands = python3 -m unittest osm_rovim_openvim.tests
-
-[testenv:build]
-basepython = python3
-deps = stdeb
-       setuptools-version-command
-commands = python3 setup.py --command-packages=stdeb.command bdist_deb
-