diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a33db667831a41fbe32e110317ce4e7ae1f96ff..c5c76ac355545a2697924424c7d9903ee2edd6ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ pages:
   script:
   - apt-get update
   - apt-get install --assume-yes pandoc
-  - pip install numpy pandas termcolor paho-mqtt  # top import of Ohmpi.py
+  - pip install numpy pandas termcolor paho-mqtt zmq  # top import of Ohmpi.py
   - pip install sphinx numpydoc sphinx_rtd_theme pandoc recommonmark
   - cd doc
   - make html
diff --git a/PCB_boards/.gitkeep b/PCB_boards/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board.zip b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board.zip
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board.zip
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board.zip
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_contour.gm1 b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_contour.gm1
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_contour.gm1
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_contour.gm1
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperBottom.gbl b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperBottom.gbl
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperBottom.gbl
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperBottom.gbl
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperTop.gtl b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperTop.gtl
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperTop.gtl
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_copperTop.gtl
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_drill.txt b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_drill.txt
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_drill.txt
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_drill.txt
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskBottom.gbs b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskBottom.gbs
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskBottom.gbs
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskBottom.gbs
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskTop.gts b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskTop.gts
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskTop.gts
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_maskTop.gts
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_pnp.txt b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_pnp.txt
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_pnp.txt
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_pnp.txt
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkBottom.gbo b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkBottom.gbo
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkBottom.gbo
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkBottom.gbo
diff --git a/PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkTop.gto b/PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkTop.gto
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkTop.gto
rename to PCB_boards/MUX_board/Gerber_for _printing_MUX_board/ohmPi_MUX_64elec_I2C_silkTop.gto
diff --git a/PCB_file_measurement_card/MUX_board/ohmPi_MUX_64elec_I2C.fzz b/PCB_boards/MUX_board/ohmPi_MUX_64elec_I2C.fzz
similarity index 100%
rename from PCB_file_measurement_card/MUX_board/ohmPi_MUX_64elec_I2C.fzz
rename to PCB_boards/MUX_board/ohmPi_MUX_64elec_I2C.fzz
diff --git a/PCB_file_measurement_card/accessory/accessoire_ohmpi.fzz b/PCB_boards/accessory/accessoire_ohmpi.fzz
similarity index 100%
rename from PCB_file_measurement_card/accessory/accessoire_ohmpi.fzz
rename to PCB_boards/accessory/accessoire_ohmpi.fzz
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16.fzz b/PCB_boards/measurement_board/card_measure_raspberry_v3.16.fzz
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16.fzz
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16.fzz
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_contour.gm1 b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_contour.gm1
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_contour.gm1
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_contour.gm1
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperBottom.gbl b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperBottom.gbl
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperBottom.gbl
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperBottom.gbl
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperTop.gtl b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperTop.gtl
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperTop.gtl
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_copperTop.gtl
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_drill.txt b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_drill.txt
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_drill.txt
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_drill.txt
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskBottom.gbs b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskBottom.gbs
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskBottom.gbs
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskBottom.gbs
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskTop.gts b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskTop.gts
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskTop.gts
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_maskTop.gts
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_pnp.txt b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_pnp.txt
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_pnp.txt
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_pnp.txt
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkBottom.gbo b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkBottom.gbo
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkBottom.gbo
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkBottom.gbo
diff --git a/PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkTop.gto b/PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkTop.gto
similarity index 100%
rename from PCB_file_measurement_card/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkTop.gto
rename to PCB_boards/measurement_board/card_measure_raspberry_v3.16_gerber_export/card_measure_raspberry_v3.16_silkTop.gto
diff --git a/config.py b/config.py
index c7270e1add7fe45590599ade924f71d71368e709..375fd2ea8b4c3a5b1e3cb2f1b3a8092c49a443bf 100644
--- a/config.py
+++ b/config.py
@@ -1,7 +1,6 @@
-import logging
-
 from paho.mqtt.client import MQTTv31
 
+mqtt_broker = 'localhost'
 # OhmPi configuration
 OHMPI_CONFIG = {
     'id': '0001',  # Unique identifier of the OhmPi board (string)
@@ -58,7 +57,7 @@ SOH_LOGGING_CONFIG = {
 
 # MQTT logging configuration parameters
 MQTT_LOGGING_CONFIG = {
-    'hostname':'ohmpy.umons.ac.be',
+    'hostname': mqtt_broker,
     'port': 1883,
     'qos': 2,
     'retain': False,
@@ -76,7 +75,7 @@ MQTT_LOGGING_CONFIG = {
 
 # MQTT control configuration parameters
 MQTT_CONTROL_CONFIG = {
-    'hostname': 'ohmpy.umons.ac.be',
+    'hostname': mqtt_broker,
     'port': 1883,
     'qos': 2,
     'retain': False,
diff --git a/ohmpi.py b/ohmpi.py
index 8c76f038aa0143361cb257f75889de06b6e55482..229e9cee5f121373ac4c07fa4fa74ff86d0ea5d0 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -4,7 +4,7 @@ created on January 6, 2020.
 Updates May 2022, Oct 2022.
 Ohmpi.py is a program to control a low-cost and open hardware resistivity meter OhmPi that has been developed by
 Rémi CLEMENT (INRAE),Vivien DUBOIS (INRAE), Hélène GUYARD (IGE), Nicolas FORQUET (INRAE), Yannick FARGIER (IFSTTAR)
-Olivier KAUFMANN (UMONS) and Guillaume BLANCHY (ILVO).
+Olivier KAUFMANN (UMONS), Arnaud WATELET (UMONS) and Guillaume BLANCHY (ILVO).
 """
 
 import os
diff --git a/requirements.txt b/requirements.txt
index cc46537a1648b1d9858de8b1ae53e88bf50d3943..633c08af9bcc4ed68f0d15d98c8c0f965394f0b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ RPi.GPIO
 adafruit-blinka
 numpy
 paho-mqtt
-adafruit-circuitpython-ads1x15
+adafruit-circuitpython-adsgit 1x15
 adafruit-circuitpython-tca9548a
 adafruit-circuitpython-mcp230xx
 gpiozero