diff --git a/src/paveit/datamodels/infrastructure.py b/src/paveit/datamodels/infrastructure.py
deleted file mode 100755
index e02ff8c..0000000
--- a/src/paveit/datamodels/infrastructure.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from mongoengine import *
-
-
-class MachineBase(Document):
-    
-    name = StringField(default=None)
-    
-    meta = {
-        'allow_inheritance': True,
-        'index_opts': {},
-        'index_background': True,
-        'index_cls': False,
-        'auto_create_index': True,
-        'collection': 'infrastructure',
-        "db_alias": 'dblabtests',
-    }
\ No newline at end of file
diff --git a/src/paveit/datamodels/machines.py b/src/paveit/datamodels/machines.py
index 0e5464e..0947f02 100755
--- a/src/paveit/datamodels/machines.py
+++ b/src/paveit/datamodels/machines.py
@@ -2,14 +2,14 @@ import datetime
 
 from mongoengine import *
 
-from paveit.datamodels import (
+from paveit.helper import fetch_recursive, mongo_to_dict
+
+from .components import (
     ComponentsServoHydraulicMachineKMD,
     ComponentsServoHydraulicMachineLVDT,
     ComponentsServoHydraulicMachineTemperatureControl,
-    Labtest,
 )
-from paveit.helper import fetch_recursive, mongo_to_dict
-
+from .enumeration import Labtest
 from .usermanagement import Organisation
 
 
@@ -19,7 +19,7 @@ class Experiment(EmbeddedDocument):
     config = ListField(StringField(), required=True)
 
 
-class Machine(Document):
+class MachineBase(Document):
     
     company = StringField(required=True)
     name = StringField(required=True)
@@ -71,5 +71,6 @@ class Machine(Document):
         ]
     }
 
-class ServoHydraulicMachine(Machine):
-    pass
+class ServoHydraulicMachine(MachineBase):
+    
+    pass
\ No newline at end of file