diff --git a/devices/HW_device_template.py b/devices/HW_device_template.py
index c9365b496f7717d764b4f38d1011ece09a8d1665..6eec04be90c81a101cfd1a01d588fbd0044a9028 100644
--- a/devices/HW_device_template.py
+++ b/devices/HW_device_template.py
@@ -15,7 +15,7 @@
 from tango.server import run
 # Additional import
 
-from src.hardware_device import *
+from util.hardware_device import *
 
 
 __all__ = ["HW_dev"]
diff --git a/devices/PCC.py b/devices/PCC.py
index 753b06285329bc50a980f795839c6f48056c73ef..764be89ade56abf035498d9874cdf36b0df24d5e 100644
--- a/devices/PCC.py
+++ b/devices/PCC.py
@@ -18,9 +18,9 @@ from tango.server import device_property
 
 # Additional import
 from clients.opcua_connection import OPCUAConnection
-from src.attribute_wrapper import *
-from src.hardware_device import *
-from src.lofar_logging import device_logging_to_python
+from util.attribute_wrapper import *
+from util.hardware_device import *
+from util.lofar_logging import device_logging_to_python
 
 
 __all__ = ["PCC", "main"]
diff --git a/devices/SDP.py b/devices/SDP.py
index 10a1d8a5578b0df80cad13ef2dd2b9e9482d51c0..30672a7ebf5047edc6560db3a621cb7d2033b973 100644
--- a/devices/SDP.py
+++ b/devices/SDP.py
@@ -17,9 +17,9 @@ from tango.server import device_property
 # Additional import
 
 from clients.opcua_connection import OPCUAConnection
-from src.attribute_wrapper import *
-from src.hardware_device import *
-from src.lofar_logging import device_logging_to_python
+from util.attribute_wrapper import *
+from util.hardware_device import *
+from util.lofar_logging import device_logging_to_python
 
 
 __all__ = ["SDP", "main"]
diff --git a/devices/clients/opcua_connection.py b/devices/clients/opcua_connection.py
index 676b24c650f0de251d850625fce1a47b1bc6518a..f4c52a3ad6484b6c350265247e56f65628133d37 100644
--- a/devices/clients/opcua_connection.py
+++ b/devices/clients/opcua_connection.py
@@ -1,4 +1,4 @@
-from src.comms_client import *
+from util.comms_client import *
 import opcua
 
 __all__ = ["OPCUAConnection"]
diff --git a/devices/clients/test_client.py b/devices/clients/test_client.py
index 662bd692b462953414208c4cb1fc346474a2827b..4575f3054922dead09045dde3562efc5969e85bf 100644
--- a/devices/clients/test_client.py
+++ b/devices/clients/test_client.py
@@ -1,4 +1,4 @@
-from src.comms_client import *
+from util.comms_client import *
 
 # <class 'numpy.bool_'>
 
diff --git a/devices/test_device.py b/devices/test_device.py
index ea7c333512b41d0dcb25efd1b1cbb556010f1881..857baf42577c03bf41a6c20780756e51c417bff3 100644
--- a/devices/test_device.py
+++ b/devices/test_device.py
@@ -18,8 +18,8 @@ from tango import DevState
 # Additional import
 
 from clients.test_client import example_client
-from src.attribute_wrapper import *
-from src.hardware_device import *
+from util.attribute_wrapper import *
+from util.hardware_device import *
 
 __all__ = ["test_device", "main"]
 
diff --git a/devices/src/attribute_wrapper.py b/devices/util/attribute_wrapper.py
similarity index 98%
rename from devices/src/attribute_wrapper.py
rename to devices/util/attribute_wrapper.py
index bdf457df41ba76c037de64faf4e99ecf4940ca70..a303cfddbf1ded9044b46b9b8f89807eaaf9e687 100644
--- a/devices/src/attribute_wrapper.py
+++ b/devices/util/attribute_wrapper.py
@@ -3,7 +3,7 @@ from tango import AttrWriteType
 
 import numpy
 
-from src.wrappers import only_when_on, fault_on_error
+from util.wrappers import only_when_on, fault_on_error
 import logging
 logger = logging.getLogger()
 
diff --git a/devices/src/comms_client.py b/devices/util/comms_client.py
similarity index 100%
rename from devices/src/comms_client.py
rename to devices/util/comms_client.py
diff --git a/devices/src/hardware_device.py b/devices/util/hardware_device.py
similarity index 97%
rename from devices/src/hardware_device.py
rename to devices/util/hardware_device.py
index a65f91287027608057657254693c01c2765270bc..9933c1cb8606fa14804a633e7860ee830938b5af 100644
--- a/devices/src/hardware_device.py
+++ b/devices/util/hardware_device.py
@@ -16,13 +16,13 @@ from tango.server import Device, command
 from tango import DevState, DebugIt
 # Additional import
 
-from src.attribute_wrapper import *
-from src.lofar_logging import log_exceptions
+from util.attribute_wrapper import *
+from util.lofar_logging import log_exceptions
 
 
 __all__ = ["hardware_device"]
 
-from src.wrappers import only_in_states
+from util.wrappers import only_in_states
 
 
 class hardware_device(Device):
diff --git a/devices/src/lofar_logging.py b/devices/util/lofar_logging.py
similarity index 100%
rename from devices/src/lofar_logging.py
rename to devices/util/lofar_logging.py
diff --git a/devices/src/wrappers.py b/devices/util/wrappers.py
similarity index 100%
rename from devices/src/wrappers.py
rename to devices/util/wrappers.py