diff --git a/tangostationcontrol/tangostationcontrol/devices/observation/__init__.py b/tangostationcontrol/tangostationcontrol/devices/observation/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation.py b/tangostationcontrol/tangostationcontrol/devices/observation/observation.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/observation.py
rename to tangostationcontrol/tangostationcontrol/devices/observation/observation.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_control.py b/tangostationcontrol/tangostationcontrol/devices/observation/observation_control.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/observation_control.py
rename to tangostationcontrol/tangostationcontrol/devices/observation/observation_control.py
index a432f6a60fc1963e654958fb16c9a907b3094958..1f51e7a77f8a3656610e98bfe6aafb88f59a35d5 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation_control.py
+++ b/tangostationcontrol/tangostationcontrol/devices/observation/observation_control.py
@@ -21,7 +21,7 @@ from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 from tangostationcontrol.devices.device_decorators import only_when_on, fault_on_error
 from tangostationcontrol.devices.lofar_device import lofar_device
-from tangostationcontrol.devices.observation import Observation
+from tangostationcontrol.devices.observation.observation import Observation
 
 logger = logging.getLogger()
 
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py
index 8de5be8175ea77078dce5122ffad8f6081197166..e6ff566dbcbd38b135634f1b363a4a11536bb313 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py
@@ -11,7 +11,7 @@ from tangostationcontrol.test.devices.test_observation_base import TestObservati
 from tangostationcontrol.integration_test import base
 from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 
-from tangostationcontrol.devices.observation_control import observationWrapper
+from tangostationcontrol.devices.observation.observation_control import observationWrapper
 
 from os import environ
 from json import loads