diff --git a/doc/mux_2024_rev_0_0.py b/doc/mux_2024_rev_0_0.py
index 7845820fac43aac74faaaa157d1d4ac142371d11..0627326f418d7c509dd406153ec72971fdcf0b74 100644
--- a/doc/mux_2024_rev_0_0.py
+++ b/doc/mux_2024_rev_0_0.py
@@ -1,6 +1,6 @@
 from OhmPi.config import HARDWARE_CONFIG
 import os
-from OhmPi.hardware import MuxAbstract
+from OhmPi.hardware_components import MuxAbstract
 MUX_CONFIG = HARDWARE_CONFIG['mux']
 
 class Mux(MuxAbstract):
diff --git a/hardware/__init__.py b/hardware/__init__.py
deleted file mode 100644
index 471af3ccd3cfbeef87b3ce59c63e65730a84e469..0000000000000000000000000000000000000000
--- a/hardware/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .abstract_hardware import TxAbstract, RxAbstract, MuxAbstract, ControllerAbstract
\ No newline at end of file
diff --git a/hardware_components/__init__.py b/hardware_components/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..bdc78fd8e121c2a5888be2fca509a1aa749bf997
--- /dev/null
+++ b/hardware_components/__init__.py
@@ -0,0 +1 @@
+from .abstract_hardware_components import TxAbstract, RxAbstract, MuxAbstract, ControllerAbstract
\ No newline at end of file
diff --git a/hardware/abstract_hardware.py b/hardware_components/abstract_hardware_components.py
similarity index 100%
rename from hardware/abstract_hardware.py
rename to hardware_components/abstract_hardware_components.py
diff --git a/hardware/dummy_controller.py b/hardware_components/dummy_controller.py
similarity index 78%
rename from hardware/dummy_controller.py
rename to hardware_components/dummy_controller.py
index 7de5aefdacd3a5ce958ae09fbd38e68b92009557..829881f3fb3fde7b0730ebabccf4ffda96befb33 100644
--- a/hardware/dummy_controller.py
+++ b/hardware_components/dummy_controller.py
@@ -1,6 +1,6 @@
 from OhmPi.config import HARDWARE_CONFIG
 import os
-from OhmPi.hardware import ControllerAbstract
+from OhmPi.hardware_components import ControllerAbstract
 CONTROLLER_CONFIG = HARDWARE_CONFIG['controller']
 
 
diff --git a/hardware/dummy_mux.py b/hardware_components/dummy_mux.py
similarity index 83%
rename from hardware/dummy_mux.py
rename to hardware_components/dummy_mux.py
index 626faff981881d66bb1f847af58bde333da44933..eb07b97e18bfc8f11d3859d6bb6bc97a79a4fe04 100644
--- a/hardware/dummy_mux.py
+++ b/hardware_components/dummy_mux.py
@@ -1,6 +1,6 @@
 from OhmPi.config import HARDWARE_CONFIG
 import os
-from OhmPi.hardware import MuxAbstract
+from OhmPi.hardware_components import MuxAbstract
 MUX_CONFIG = HARDWARE_CONFIG['mux']
 
 class Mux(MuxAbstract):
diff --git a/hardware/dummy_rx.py b/hardware_components/dummy_rx.py
similarity index 95%
rename from hardware/dummy_rx.py
rename to hardware_components/dummy_rx.py
index 7e26c87f6cf23f87800da2dea76dd72b3e986a48..eb7dd13291a612ef3fb1882197d9b2ded997930a 100644
--- a/hardware/dummy_rx.py
+++ b/hardware_components/dummy_rx.py
@@ -1,7 +1,7 @@
 from OhmPi.config import HARDWARE_CONFIG
 import numpy as np
 import os
-from OhmPi.hardware import RxAbstract
+from OhmPi.hardware_components import RxAbstract
 RX_CONFIG = HARDWARE_CONFIG['rx']
 
 # hardware characteristics and limitations
diff --git a/hardware/dummy_tx.py b/hardware_components/dummy_tx.py
similarity index 98%
rename from hardware/dummy_tx.py
rename to hardware_components/dummy_tx.py
index 09a270a44a2d6bc1eb451b0af2ac6fadfaa22cbb..fcf00918a2629f65a2b5602738993a64f84cc458 100644
--- a/hardware/dummy_tx.py
+++ b/hardware_components/dummy_tx.py
@@ -2,7 +2,7 @@ from OhmPi.config import HARDWARE_CONFIG
 import time
 import os
 import numpy as np
-from OhmPi.hardware import TxAbstract
+from OhmPi.hardware_components import TxAbstract
 
 TX_CONFIG = HARDWARE_CONFIG['tx']
 
diff --git a/hardware/mb_2024_rev_0_0.py b/hardware_components/mb_2024_rev_0_0.py
similarity index 99%
rename from hardware/mb_2024_rev_0_0.py
rename to hardware_components/mb_2024_rev_0_0.py
index 790c7893bcfda5598dfd8b46e1bb45f2625a657a..d3bb269c0dc072807bc99d3f15fd9208b3377f05 100644
--- a/hardware/mb_2024_rev_0_0.py
+++ b/hardware_components/mb_2024_rev_0_0.py
@@ -8,7 +8,7 @@ import minimalmodbus  # noqa
 import time
 import numpy as np
 import os
-from OhmPi.hardware import TxAbstract, RxAbstract
+from OhmPi.hardware_components import TxAbstract, RxAbstract
 controller_module = importlib.import_module(f'OhmPi.hardware.{HARDWARE_CONFIG["hardware"]["controller"]["model"]}')
 
 TX_CONFIG = HARDWARE_CONFIG['tx']
diff --git a/hardware/ohmpi_card_3_15.py b/hardware_components/ohmpi_card_3_15.py
similarity index 99%
rename from hardware/ohmpi_card_3_15.py
rename to hardware_components/ohmpi_card_3_15.py
index 1d7cafdf760a155343c1fb7fc714edbd3e94d729..4e099f620213e376f7b46c0d05d8633604db9be2 100644
--- a/hardware/ohmpi_card_3_15.py
+++ b/hardware_components/ohmpi_card_3_15.py
@@ -8,7 +8,7 @@ import minimalmodbus  # noqa
 import time
 import numpy as np
 import os
-from OhmPi.hardware import TxAbstract, RxAbstract
+from OhmPi.hardware_components import TxAbstract, RxAbstract
 controller_name = HARDWARE_CONFIG['controller'].pop('board_name', 'raspberry_pi')
 controller_module = importlib.import_module(f'OhmPi.hardware.{controller_name}')
 
diff --git a/hardware/raspberry_pi.py b/hardware_components/raspberry_pi.py
similarity index 85%
rename from hardware/raspberry_pi.py
rename to hardware_components/raspberry_pi.py
index c40e553c6d5c4b5d57c73e1f37a21d63d71807a1..dd3680e1686a895de51d14d6517cb45629c6b7a2 100644
--- a/hardware/raspberry_pi.py
+++ b/hardware_components/raspberry_pi.py
@@ -1,4 +1,4 @@
-from OhmPi.hardware import ControllerAbstract
+from OhmPi.hardware_components import ControllerAbstract
 import board  # noqa
 import busio  # noqa
 import os
diff --git a/measure.py b/hardware_system.py
similarity index 100%
rename from measure.py
rename to hardware_system.py
diff --git a/ohmpi.py b/ohmpi.py
index 8efdc605c77144153ec8ca1b631c99ba8988618f..6c38c1e257d3bf1c226f6b5fc4ee4509695fcaac 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -24,7 +24,7 @@ import threading
 from OhmPi.logging_setup import setup_loggers
 from OhmPi.config import MQTT_CONTROL_CONFIG, OHMPI_CONFIG, EXEC_LOGGING_CONFIG
 from logging import DEBUG
-from measure import OhmPiHardware
+from hardware_system import OhmPiHardware
 
 # finish import (done only when class is instantiated as some libs are only available on arm64 platform)
 try:
diff --git a/test_dummy.py b/test_dummy.py
index b1b3c0ca11a3c4dce31b9c015036aa8f66e7e8ca..0ba2e47497bc7788614d5da17687856cc6a824c2 100644
--- a/test_dummy.py
+++ b/test_dummy.py
@@ -1,7 +1,7 @@
 import sys
 sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi'])
-from OhmPi.hardware.dummy_tx import Tx
-from OhmPi.hardware.dummy_rx import Rx
+from OhmPi.hardware_components.dummy_tx import Tx
+from OhmPi.hardware_components.dummy_rx import Rx
 from OhmPi.logging_setup import create_stdout_logger
 
 exec_logger = create_stdout_logger(name='exec')
diff --git a/test_measure_with_ohmpi_card_3_15.py b/test_measure_with_ohmpi_card_3_15.py
index c676f2d0511cbc4196a5ba04a5f4302659ebf8c0..3c863dacdc86d9919b937117ebe823944a45eee4 100644
--- a/test_measure_with_ohmpi_card_3_15.py
+++ b/test_measure_with_ohmpi_card_3_15.py
@@ -3,7 +3,7 @@ import logging
 import matplotlib.pyplot as plt
 from utils import change_config
 change_config('config_ohmpi_card_3_15.py', verbose=False)
-from OhmPi.measure import OhmPiHardware
+from OhmPi.hardware_system import OhmPiHardware
 
 k = OhmPiHardware()
 k.exec_logger.setLevel(logging.INFO)
diff --git a/test_ohmpi_card_3_15.py b/test_ohmpi_card_3_15.py
index bbceaad4094cf853eaba6901a74641febce4a861..9ca144e7169d3933e197d661624079b31ebf0101 100644
--- a/test_ohmpi_card_3_15.py
+++ b/test_ohmpi_card_3_15.py
@@ -1,7 +1,7 @@
 # import sys
 # sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi'])
-from OhmPi.hardware.ohmpi_card_3_15 import Tx
-from OhmPi.hardware.ohmpi_card_3_15 import Rx
+from OhmPi.hardware_components.ohmpi_card_3_15 import Tx
+from OhmPi.hardware_components.ohmpi_card_3_15 import Rx
 from OhmPi.logging_setup import create_stdout_logger
 import numpy as np