diff --git a/voltha_omci/omci_entities.py b/voltha_omci/omci_entities.py
index 38d6942..a906552 100644
--- a/voltha_omci/omci_entities.py
+++ b/voltha_omci/omci_entities.py
@@ -21,9 +21,9 @@
 from scapy.fields import IntField, StrFixedLenField
 from scapy.packet import Packet
 
-from voltha_omci.omci.omci_defs import OmciUninitializedFieldError, \
+from voltha_omci.omci_defs import OmciUninitializedFieldError, \
     AttributeAccess, OmciNullPointer, EntityOperations
-from voltha_omci.omci.omci_defs import bitpos_from_mask
+from voltha_omci.omci_defs import bitpos_from_mask
 
 
 class EntityClassAttribute(object):
diff --git a/voltha_omci/omci_frame.py b/voltha_omci/omci_frame.py
index e05742e..b107539 100644
--- a/voltha_omci/omci_frame.py
+++ b/voltha_omci/omci_frame.py
@@ -17,14 +17,14 @@
 from scapy.fields import ShortField, ConditionalField
 from scapy.packet import Packet
 
-from voltha_omci.omci.omci_defs import FixedLenField
-from voltha_omci.omci.omci_messages import OmciCreate, OmciDelete, \
+from voltha_omci.omci_defs import FixedLenField
+from voltha_omci.omci_messages import OmciCreate, OmciDelete, \
     OmciDeleteResponse, OmciSet, OmciSetResponse, OmciGet, OmciGetResponse, \
     OmciGetAllAlarms, OmciGetAllAlarmsResponse, OmciGetAllAlarmsNext, \
     OmciMibResetResponse, OmciMibReset, OmciMibUploadNextResponse, \
     OmciMibUploadNext, OmciMibUploadResponse, OmciMibUpload, \
     OmciGetAllAlarmsNextResponse
-from voltha_omci.omci.omci_messages import OmciCreateResponse
+from voltha_omci.omci_messages import OmciCreateResponse
 
 
 class OmciFrame(Packet):
diff --git a/voltha_omci/omci_messages.py b/voltha_omci/omci_messages.py
index 0c78297..fe53517 100644
--- a/voltha_omci/omci_messages.py
+++ b/voltha_omci/omci_messages.py
@@ -19,8 +19,8 @@
 from scapy.fields import ShortField
 from scapy.packet import Packet
 
-from voltha_omci.omci.omci_defs import AttributeAccess
-from voltha_omci.omci.omci_entities import entity_id_to_class_map
+from voltha_omci.omci_defs import AttributeAccess
+from voltha_omci.omci_entities import entity_id_to_class_map
 
 
 log = structlog.get_logger()