restructure machine data

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