diff --git a/devices/clients/__init__.py b/devices/clients/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/util/attribute_wrapper.py b/devices/clients/attribute_wrapper.py
similarity index 100%
rename from devices/util/attribute_wrapper.py
rename to devices/clients/attribute_wrapper.py
diff --git a/devices/util/comms_client.py b/devices/clients/comms_client.py
similarity index 100%
rename from devices/util/comms_client.py
rename to devices/clients/comms_client.py
diff --git a/devices/clients/opcua_connection.py b/devices/clients/opcua_client.py
similarity index 100%
rename from devices/clients/opcua_connection.py
rename to devices/clients/opcua_client.py
diff --git a/devices/common/__init__.py b/devices/common/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/util/lofar_git.py b/devices/common/lofar_git.py
similarity index 97%
rename from devices/util/lofar_git.py
rename to devices/common/lofar_git.py
index e95f6bdf369e9f21bfb89f0d3359a1328157d0a3..353748d985ccf72483792456cbcd8a0a5aa1056b 100644
--- a/devices/util/lofar_git.py
+++ b/devices/common/lofar_git.py
@@ -52,7 +52,7 @@ def get_version(repo: git.Repo = None) -> str:
 
     branch = repo.active_branch
     commit = repo.commit()
-    tags = { tag.commit: tag for tag in repo.tags }
+    tags = {tag.commit: tag for tag in repo.tags}
 
     if commit in tags:
         commit_str = "{}".format(tags[commit])
diff --git a/devices/util/lofar_logging.py b/devices/common/lofar_logging.py
similarity index 100%
rename from devices/util/lofar_logging.py
rename to devices/common/lofar_logging.py
diff --git a/devices/devices/__init__.py b/devices/devices/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/APSCTL.py b/devices/devices/apsctl.py
similarity index 96%
rename from devices/APSCTL.py
rename to devices/devices/apsctl.py
index 068ec2ab411c25395e06577121d78ffc575cdb55..5187aa8eb9f2a5231ec404636ccc5aae3ace15ce 100644
--- a/devices/APSCTL.py
+++ b/devices/devices/apsctl.py
@@ -17,12 +17,12 @@ from tango.server import device_property, attribute
 from tango import AttrWriteType
 # Additional import
 
-from clients.opcua_connection import OPCUAConnection
-from util.attribute_wrapper import attribute_wrapper
-from util.hardware_device import hardware_device
+from clients.opcua_client import OPCUAConnection
+from devices.clients.attribute_wrapper import attribute_wrapper
+from devices.devices.hardware_device import hardware_device
 
-from util.lofar_logging import device_logging_to_python, log_exceptions
-from util.lofar_git import get_version
+from devices.common.lofar_logging import device_logging_to_python, log_exceptions
+from devices.common.lofar_git import get_version
 
 import numpy
 
@@ -188,7 +188,7 @@ class APSCTL(hardware_device):
 def main(args=None, **kwargs):
     """Main function of the SDP module."""
 
-    from util.lofar_logging import configure_logger
+    from devices.common.lofar_logging import configure_logger
     import logging
     configure_logger(logging.getLogger())
 
diff --git a/devices/util/wrappers.py b/devices/devices/device_decorators.py
similarity index 100%
rename from devices/util/wrappers.py
rename to devices/devices/device_decorators.py
diff --git a/devices/util/hardware_device.py b/devices/devices/hardware_device.py
similarity index 100%
rename from devices/util/hardware_device.py
rename to devices/devices/hardware_device.py
diff --git a/devices/PCC.py b/devices/devices/pcc.py
similarity index 95%
rename from devices/PCC.py
rename to devices/devices/pcc.py
index e8eb9bc94b689bc616ce49dba9601b0ed99de7a7..fe2a1841d33fec9d6157a581c75dda3a01f2971f 100644
--- a/devices/PCC.py
+++ b/devices/devices/pcc.py
@@ -19,13 +19,13 @@ from tango import AttrWriteType
 import numpy
 # Additional import
 
-from util.wrappers import *
+from devices.devices.device_decorators import *
 
-from clients.opcua_connection import OPCUAConnection
-from util.attribute_wrapper import attribute_wrapper
-from util.hardware_device import hardware_device
-from util.lofar_logging import device_logging_to_python, log_exceptions
-from util.lofar_git import get_version
+from clients.opcua_client import OPCUAConnection
+from devices.clients.attribute_wrapper import attribute_wrapper
+from devices.devices.hardware_device import hardware_device
+from devices.common.lofar_logging import device_logging_to_python, log_exceptions
+from devices.common.lofar_git import get_version
 
 __all__ = ["PCC", "main"]
 
@@ -244,7 +244,7 @@ class PCC(hardware_device):
 def main(args=None, **kwargs):
     """Main function of the PCC module."""
 
-    from util.lofar_logging import configure_logger
+    from devices.common.lofar_logging import configure_logger
     import logging
     configure_logger(logging.getLogger())
 
diff --git a/devices/SDP.py b/devices/devices/sdp.py
similarity index 96%
rename from devices/SDP.py
rename to devices/devices/sdp.py
index 56091d98bcd2f2eca6ff859e8ec0590c044b8854..f6eb07f271425e8883312ef1f326bcf71ed0e67e 100644
--- a/devices/SDP.py
+++ b/devices/devices/sdp.py
@@ -17,12 +17,12 @@ from tango.server import device_property, attribute
 from tango import AttrWriteType
 # Additional import
 
-from clients.opcua_connection import OPCUAConnection
-from util.attribute_wrapper import attribute_wrapper
-from util.hardware_device import hardware_device
+from clients.opcua_client import OPCUAConnection
+from devices.clients.attribute_wrapper import attribute_wrapper
+from devices.devices.hardware_device import hardware_device
 
-from util.lofar_logging import device_logging_to_python, log_exceptions
-from util.lofar_git import get_version
+from devices.common.lofar_logging import device_logging_to_python, log_exceptions
+from devices.common.lofar_git import get_version
 
 import numpy
 
@@ -168,7 +168,7 @@ class SDP(hardware_device):
 def main(args=None, **kwargs):
     """Main function of the SDP module."""
 
-    from util.lofar_logging import configure_logger
+    from devices.common.lofar_logging import configure_logger
     import logging
     configure_logger(logging.getLogger())
 
diff --git a/devices/devices/sdp/__init__.py b/devices/devices/sdp/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/devices/sdp_statistics/__init__.py b/devices/devices/sdp_statistics/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/Statistics.py b/devices/devices/sdp_statistics/sst.py
similarity index 91%
rename from devices/Statistics.py
rename to devices/devices/sdp_statistics/sst.py
index 856beffdee18b228d2cbadd433c6c4364a5d04be..28874a3d0556539f38d323d3a5b5dac1d0dd30fc 100644
--- a/devices/Statistics.py
+++ b/devices/devices/sdp_statistics/sst.py
@@ -14,15 +14,14 @@
 # PyTango imports
 from tango.server import run
 from tango.server import device_property
-from tango import AttrWriteType
 # Additional import
 
 from clients.sst_client import sst_client
 
-from util.attribute_wrapper import attribute_wrapper
-from util.hardware_device import hardware_device
+from devices.clients.attribute_wrapper import attribute_wrapper
+from devices.devices.hardware_device import hardware_device
 
-from util.lofar_logging import device_logging_to_python, log_exceptions
+from devices.common.lofar_logging import device_logging_to_python, log_exceptions
 
 import numpy
 
@@ -91,7 +90,7 @@ class SST(hardware_device):
 def main(args=None, **kwargs):
     """Main function of the Statistics Device module."""
 
-    from util.lofar_logging import configure_logger
+    from devices.common.lofar_logging import configure_logger
     import logging
     configure_logger(logging.getLogger())
 
diff --git a/devices/SDP_statistics.py b/devices/devices/sdp_statistics/statistics_packet.py
similarity index 100%
rename from devices/SDP_statistics.py
rename to devices/devices/sdp_statistics/statistics_packet.py
diff --git a/devices/examples/__init__.py b/devices/examples/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/examples/load_from_disk/__init__.py b/devices/examples/load_from_disk/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/clients/ini_client.py b/devices/examples/load_from_disk/ini_client.py
similarity index 100%
rename from devices/clients/ini_client.py
rename to devices/examples/load_from_disk/ini_client.py
diff --git a/devices/ini_device.py b/devices/examples/load_from_disk/ini_device.py
similarity index 97%
rename from devices/ini_device.py
rename to devices/examples/load_from_disk/ini_device.py
index dbc6e6159409449cfa7f5577e06eaa84e0620a06..c1c273171d268eb1ca6da587f7c616081e30dd0e 100644
--- a/devices/ini_device.py
+++ b/devices/examples/load_from_disk/ini_device.py
@@ -11,12 +11,10 @@
 
 # PyTango imports
 from tango.server import run
-from tango.server import device_property
 from tango import AttrWriteType
-from tango import DevState
 # Additional import
-from util.attribute_wrapper import attribute_wrapper
-from util.hardware_device import hardware_device
+from devices.clients.attribute_wrapper import attribute_wrapper
+from devices.devices.hardware_device import hardware_device
 
 
 import configparser
diff --git a/devices/examples/snmp/__init__.py b/devices/examples/snmp/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/SNMP.py b/devices/examples/snmp/snmp.py
similarity index 93%
rename from devices/SNMP.py
rename to devices/examples/snmp/snmp.py
index eb90b276896f5e07f16eceb43c1dbf810da1b2ae..7962d2fd738898fa084c6530336ab61f65f604cf 100644
--- a/devices/SNMP.py
+++ b/devices/examples/snmp/snmp.py
@@ -17,9 +17,9 @@ from tango.server import device_property
 from tango import AttrWriteType
 
 # Additional import
-from clients.SNMP_client import SNMP_client
-from util.attribute_wrapper import attribute_wrapper
-from util.hardware_device import hardware_device
+from devices.examples.snmp.snmp_client import SNMP_client
+from devices.clients.attribute_wrapper import attribute_wrapper
+from devices.devices.hardware_device import hardware_device
 
 import numpy
 
@@ -111,7 +111,7 @@ class SNMP(hardware_device):
 def main(args=None, **kwargs):
     """Main function of the PCC module."""
 
-    from util.lofar_logging import configure_logger
+    from devices.common.lofar_logging import configure_logger
     import logging
     configure_logger(logging.getLogger())
 
diff --git a/devices/clients/SNMP_client.py b/devices/examples/snmp/snmp_client.py
similarity index 100%
rename from devices/clients/SNMP_client.py
rename to devices/examples/snmp/snmp_client.py
diff --git a/devices/test/__init__.py b/devices/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/test/clients/__init__.py b/devices/test/clients/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/clients/test_client.py b/devices/test/clients/test_client.py
similarity index 100%
rename from devices/clients/test_client.py
rename to devices/test/clients/test_client.py
diff --git a/devices/test/devices/__init__.py b/devices/test/devices/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/RandomData.py b/devices/test/devices/random_data.py
similarity index 100%
rename from devices/RandomData.py
rename to devices/test/devices/random_data.py
diff --git a/devices/test_device.py b/devices/test/devices/test_device.py
similarity index 97%
rename from devices/test_device.py
rename to devices/test/devices/test_device.py
index 6a62907112ea1cf081436285aa0d21532ba24d0a..22fe3c2bb7e6e52e887e029e8d189f41e3bad2c4 100644
--- a/devices/test_device.py
+++ b/devices/test/devices/test_device.py
@@ -17,8 +17,8 @@ from tango import DevState
 # Additional import
 
 from clients.test_client import test_client
-from util.attribute_wrapper import *
-from util.hardware_device import *
+from devices.clients.attribute_wrapper import *
+from devices.devices.hardware_device import *
 
 __all__ = ["test_device", "main"]
 
diff --git a/devices/toolkit/__init__.py b/devices/toolkit/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/devices/util/archiver.py b/devices/toolkit/archiver.py
similarity index 94%
rename from devices/util/archiver.py
rename to devices/toolkit/archiver.py
index 70f43d88a02b3f40e7324aceb966913a74fca51a..3764a7b161b9f01bd0cdd8cf5c9e9ee4a171d90d 100644
--- a/devices/util/archiver.py
+++ b/devices/toolkit/archiver.py
@@ -1,6 +1,5 @@
 #! /usr/bin/env python3
 
-from .lofar2_config import configure_logging
 from tango import DeviceProxy
 
 
diff --git a/devices/util/get_internal_attribute_history.py b/devices/toolkit/get_internal_attribute_history.py
similarity index 100%
rename from devices/util/get_internal_attribute_history.py
rename to devices/toolkit/get_internal_attribute_history.py
diff --git a/devices/util/lofar2_config.py b/devices/toolkit/lofar2_config.py
similarity index 100%
rename from devices/util/lofar2_config.py
rename to devices/toolkit/lofar2_config.py
diff --git a/devices/util/lts_cold_start.py b/devices/toolkit/lts_cold_start.py
similarity index 98%
rename from devices/util/lts_cold_start.py
rename to devices/toolkit/lts_cold_start.py
index 18b2bbb01fdff1508a65beec5333a4572369000f..baaadade255a55a3e730336786cca8ca03e73eef 100644
--- a/devices/util/lts_cold_start.py
+++ b/devices/toolkit/lts_cold_start.py
@@ -1,8 +1,8 @@
 #! /usr/bin/env python3
 import logging
 from time import sleep
-from .startup import startup
-from .lofar2_config import configure_logging
+from devices.toolkit.startup import startup
+from devices.toolkit.lofar2_config import configure_logging
 
 
 def start_device(device: str):
diff --git a/devices/util/startup.py b/devices/toolkit/startup.py
similarity index 100%
rename from devices/util/startup.py
rename to devices/toolkit/startup.py
diff --git a/devices/udp_simulator.py b/devices/toolkit/udp_simulator.py
similarity index 100%
rename from devices/udp_simulator.py
rename to devices/toolkit/udp_simulator.py