diff --git a/RO-VIM-openstack/Makefile b/RO-VIM-openstack/Makefile
deleted file mode 100644
index dfafea3..0000000
--- a/RO-VIM-openstack/Makefile
+++ /dev/null
@@ -1,25 +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_openstack-*.tar.gz osm_rovim_openstack.egg-info .eggs
-
-package:
-	python3 setup.py --command-packages=stdeb.command sdist_dsc
-	cp debian/python3-osm-rovim-openstack.postinst deb_dist/osm-rovim-openstack*/debian/
-	cd deb_dist/osm-rovim-openstack*/ && dpkg-buildpackage -rfakeroot -uc -us
-
diff --git a/RO-VIM-openstack/debian/python3-osm-rovim-openstack.postinst b/RO-VIM-openstack/debian/python3-osm-rovim-openstack.postinst
deleted file mode 100755
index 055d4a5..0000000
--- a/RO-VIM-openstack/debian/python3-osm-rovim-openstack.postinst
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-##
-# 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.
-#
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact with: OSM_TECH@list.etsi.org
-##
-
-echo "POST INSTALL OSM-ROVIM-OPENSTACK"
-
-#Pip packages required for openstack connector
-python3 -m pip install networking-l2gw
diff --git a/RO-VIM-openstack/requirements.txt b/RO-VIM-openstack/osm_rovim_openstack/__init__.py
similarity index 64%
copy from RO-VIM-openstack/requirements.txt
copy to RO-VIM-openstack/osm_rovim_openstack/__init__.py
index 2a4b69e..94a6a32 100644
--- a/RO-VIM-openstack/requirements.txt
+++ b/RO-VIM-openstack/osm_rovim_openstack/__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,15 +14,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ##
-
-PyYAML
-python-openstackclient
-python-neutronclient
-requests
-netaddr
-#TODO py3 networking-l2gw
-#TODO py3 python-novaclient
-#TODO py3 python-keystoneclient
-#TODO py3 python-glanceclient
-#TODO py3 python-cinderclient
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
diff --git a/RO-VIM-openstack/requirements.txt b/RO-VIM-openstack/osm_rovim_openstack/tests/__init__.py
similarity index 63%
copy from RO-VIM-openstack/requirements.txt
copy to RO-VIM-openstack/osm_rovim_openstack/tests/__init__.py
index 2a4b69e..04f7d49 100644
--- a/RO-VIM-openstack/requirements.txt
+++ b/RO-VIM-openstack/osm_rovim_openstack/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,16 +13,4 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-##
-
-PyYAML
-python-openstackclient
-python-neutronclient
-requests
-netaddr
-#TODO py3 networking-l2gw
-#TODO py3 python-novaclient
-#TODO py3 python-keystoneclient
-#TODO py3 python-glanceclient
-#TODO py3 python-cinderclient
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
+#######################################################################################
diff --git a/RO-VIM-openstack/requirements.txt b/RO-VIM-openstack/requirements.in
similarity index 72%
rename from RO-VIM-openstack/requirements.txt
rename to RO-VIM-openstack/requirements.in
index 2a4b69e..0fee2ae 100644
--- a/RO-VIM-openstack/requirements.txt
+++ b/RO-VIM-openstack/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
@@ -18,9 +19,8 @@
 python-neutronclient
 requests
 netaddr
-#TODO py3 networking-l2gw
-#TODO py3 python-novaclient
-#TODO py3 python-keystoneclient
-#TODO py3 python-glanceclient
-#TODO py3 python-cinderclient
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin
+networking-l2gw
+python-novaclient
+python-keystoneclient
+python-glanceclient
+python-cinderclient
diff --git a/RO-VIM-openstack/setup.py b/RO-VIM-openstack/setup.py
index cc88dbd..ae163bf 100644
--- a/RO-VIM-openstack/setup.py
+++ b/RO-VIM-openstack/setup.py
@@ -19,8 +19,16 @@
 from setuptools import setup
 
 _name = "osm_rovim_openstack"
+_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full")
+_description = "OSM ro vim plugin for openstack"
+_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_openstack
 ===========
@@ -30,32 +38,17 @@
 
 setup(
     name=_name,
-    description="OSM ro vim plugin for openstack",
-    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=[
-        "python-openstackclient",
-        "python-neutronclient",
-        "requests",
-        "netaddr",
-        "PyYAML",
-        "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin",
-        # TODO py3 "networking-l2gw"
-        # "python-novaclient", "python-keystoneclient", "python-glanceclient", "python-cinderclient",
-    ],
     setup_requires=["setuptools-version-command"],
     entry_points={
         "osm_rovim.plugins": [
diff --git a/RO-VIM-openstack/stdeb.cfg b/RO-VIM-openstack/stdeb.cfg
index a0adf96..262a47c 100644
--- a/RO-VIM-openstack/stdeb.cfg
+++ b/RO-VIM-openstack/stdeb.cfg
@@ -15,7 +15,3 @@
 
 [DEFAULT]
 X-Python3-Version : >= 3.5
-Maintainer: Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>
-Depends3: python3-openstackclient, python3-neutronclient, python3-requests, python3-netaddr, python3-yaml,
-          python3-osm-ro-plugin, python3-pip
-          # TODO py3 python3-networking-l2gw
diff --git a/RO-VIM-openstack/tox.ini b/RO-VIM-openstack/tox.ini
deleted file mode 100644
index a2bde73..0000000
--- a/RO-VIM-openstack/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_openstack --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_openstack.tests
-
-[testenv:build]
-basepython = python3
-deps = stdeb
-       setuptools-version-command
-commands = python3 setup.py --command-packages=stdeb.command bdist_deb
-