diff --git a/setup.py b/setup.py
index 242e9f1..3c97037 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 from distutils.core import setup
-setup(name='omci',
+
+setup(name='voltha_omci',
       version='1.0',
-      py_modules=['omci'],
-      )
+      packages=['voltha_omci'],
+     )
diff --git a/__init__.py b/voltha_omci/__init__.py
similarity index 100%
rename from __init__.py
rename to voltha_omci/__init__.py
diff --git a/omci.py b/voltha_omci/omci.py
similarity index 100%
rename from omci.py
rename to voltha_omci/omci.py
diff --git a/omci_defs.py b/voltha_omci/omci_defs.py
similarity index 100%
rename from omci_defs.py
rename to voltha_omci/omci_defs.py
diff --git a/omci_entities.py b/voltha_omci/omci_entities.py
similarity index 100%
rename from omci_entities.py
rename to voltha_omci/omci_entities.py
diff --git a/omci_frame.py b/voltha_omci/omci_frame.py
similarity index 100%
rename from omci_frame.py
rename to voltha_omci/omci_frame.py
diff --git a/omci_messages.py b/voltha_omci/omci_messages.py
similarity index 100%
rename from omci_messages.py
rename to voltha_omci/omci_messages.py