diff --git a/setup.py b/setup.py
index 1d3138f..fac60ea 100755
--- a/setup.py
+++ b/setup.py
@@ -1,41 +1,16 @@
 #!/usr/bin/env python
 
-from setuptools import setup, find_packages
-from setuptools.command.install import install
-from os import system
 from setuptools import setup
 
-__name__ = 'lib-osm-openvim'
-__version__ = '1.0.0'
-__description__ = 'OSM Openvim library'
-__author__ = 'ETSI OSM'
-__author_email__ = 'alfonso.tiernosepulveda@telefonica.com'
-__maintainer__ = 'mirabal'
-__maintainer_email__ = 'leonardo.mirabal@altran.com'
-__license__ = 'Apache 2.0'
-__url__ = 'https://osm.etsi.org/gitweb/?p=osm/openvim.git;a=summary'
-
-cmd = 'cp ovim.py ovim'
-system(cmd)
-
-__data_files__ = [('osm/openvim/', ['openvimd.cfg']),
-                  ('osm/openvim/database_utils/', ['database_utils/vim_db_structure.sql',
-                                                   'database_utils/nets.sql',
-                                                   'database_utils/of_ports_pci_correspondence.sql',
-                                                   'database_utils/host_ranking.sql',
-                                                   'database_utils/dump_db.sh',
-                                                   'database_utils/init_vim_db.sh',
-                                                   'database_utils/migrate_vim_db.sh',
-                                                   'database_utils/install-db-server.sh'
-                                                   ]),
-                  ('osm/openvim/scripts/', ['scripts/service-openvim.sh',
-                                            'scripts/openvim-report.sh',
-                                            'scripts/service-floodlight.sh',
-                                            'scripts/service-opendaylight.sh',
-                                            'scripts/initopenvim.sh'
-                                            ]),
-                  ]
-
+__name = 'osm_openvim'
+__version = '1.0.0'
+__description = 'OSM Openvim library'
+__author = 'ETSI OSM'
+__author_email = 'alfonso.tiernosepulveda@telefonica.com'
+__maintainer = 'mirabal'
+__maintainer_email = 'leonardo.mirabal@altran.com'
+__license = 'Apache 2.0'
+__url = 'https://osm.etsi.org/gitweb/?p=osm/openvim.git;a=summary'
 
 _req = [
     "asn1crypto",
@@ -64,66 +39,31 @@
     "libvirt-python"
 ]
 
-__scripts__ = ['openflow', 'openvim', 'ovim']
+__scripts__ = ['openflow',
+               'openvim',
+               'openvimd',
+               'osm_openvim/scripts/service-openvim',
+               'osm_openvim/scripts/service-opendaylight',
+               'osm_openvim/scripts/service-floodlight',
+               'osm_openvim/scripts/service-openvim',
+               'osm_openvim/scripts/openvim-report',
+               'osm_openvim/scripts/get_dhcp_lease.sh']
 
-
-class LibOpenvimInstaller(install):
-    lite = None
-    user_options = install.user_options + [('lite', None, "Don't install without Machine Learning modules.")]
-
-    def initialize_options(self):
-        self.lite = None
-        install.initialize_options(self)
-
-    def finalize_options(self):
-        install.finalize_options(self)
-
-    def run(self):
-
-        cmd = 'ln -sf -v /usr/local/osm/openvim/openvimd.cfg /etc/default/openvimd.cfg'
-        system(cmd)
-        cmd = 'ln -sf -v /usr/local/osm/openvim/openflow /usr/bin/openflow'
-        system(cmd)
-        cmd = 'ln -sf -v /usr/local/osm/openvim/ovim.py /usr/bin/ovim'
-        system(cmd)
-
-        install.run(self)
-
-
-setup(name=__name__,
-      version=__version__,
-      description=__description__,
-      long_description=__description__,
-      author=__author__,
-      author_email=__author_email__,
-      license=__license__,
-      maintainer=__maintainer__,
-      maintainer_email=__maintainer_email__,
-      url=__url__,
-      py_modules=['ovim',
-                  'openvimd',
-                  'vim_db',
-                  'httpserver',
-                  'RADclass',
-                  'auxiliary_functions',
-                  'dhcp_thread',
-                  'definitionsClass',
-                  'host_thread',
-                  'vim_schema',
-                  'ovim',
-                  'openflow_thread',
-                  'openflow_conn',
-                  'onos',
-                  'ODL',
-                  'floodlight',
-                  ],
-      packages=find_packages() + ['database_utils'] + ['scripts'],
-      package_dir={__name__: __name__},
-      package_data={'database_utils': ['*'], 'scripts': ['*']},
+setup(name=__name,
+      version=__version,
+      description=__description,
+      long_description=__description,
+      author=__author,
+      author_email=__author_email,
+      license=__license,
+      maintainer=__maintainer,
+      maintainer_email=__maintainer_email,
+      url=__url,
+      packages=[__name],
+      package_dir={__name: __name},
       scripts=__scripts__,
-      data_files=__data_files__,
+      package_data={'osm_openvim': ['*']},
       include_package_data=True,
-      cmdclass={'install': LibOpenvimInstaller},
       install_requires=_req
       )