diff --git a/tangostationcontrol/tangostationcontrol/devices/observation/observation.py b/tangostationcontrol/tangostationcontrol/devices/observation.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/devices/observation/observation.py
rename to tangostationcontrol/tangostationcontrol/devices/observation.py
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation/__init__.py b/tangostationcontrol/tangostationcontrol/devices/observation/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation/observation_control.py b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/devices/observation/observation_control.py
rename to tangostationcontrol/tangostationcontrol/devices/observation_control.py
index 83040f6c9113e1328847a425a1a89d6bd4410299..2b7b6690b33fe7e6eaa5df4937cbcd4a3e2b37c6 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation/observation_control.py
+++ b/tangostationcontrol/tangostationcontrol/devices/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.observation import Observation
+from tangostationcontrol.devices.observation import Observation
 
 logger = logging.getLogger()