diff --git a/check-disk-usage.sh b/metrics/disk-usage.sh
similarity index 90%
rename from check-disk-usage.sh
rename to metrics/disk-usage.sh
index f60f898..03cae4b 100644
--- a/check-disk-usage.sh
+++ b/metrics/disk-usage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-. "${SCRIPT_DIR}/logging.sh"
+. "${SCRIPT_DIR}/../share/logging.sh"
 
 LOGFILE=/var/log/disk_usage.log
 touch "$LOGFILE"
diff --git a/check-power-usage.sh b/metrics/power-usage.sh
similarity index 95%
rename from check-power-usage.sh
rename to metrics/power-usage.sh
index 4ba082c..103dbc9 100644
--- a/check-power-usage.sh
+++ b/metrics/power-usage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-. "${SCRIPT_DIR}/logging.sh"
+. "${SCRIPT_DIR}/../share/logging.sh"
 
 LOGFILE=/var/log/power_usage.log
 touch "$LOGFILE"
diff --git a/check-temperature.sh b/metrics/temperature.sh
similarity index 91%
rename from check-temperature.sh
rename to metrics/temperature.sh
index c0b9782..18b4ce7 100644
--- a/check-temperature.sh
+++ b/metrics/temperature.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-. "${SCRIPT_DIR}/logging.sh"
+. "${SCRIPT_DIR}/../share/logging.sh"
 
 LOGFILE=/var/log/temperature.log
 touch "$LOGFILE"
diff --git a/setup-crontab.sh b/orchestrator/setup-crontab.sh
similarity index 95%
rename from setup-crontab.sh
rename to orchestrator/setup-crontab.sh
index 31bc5c5..adef05e 100644
--- a/setup-crontab.sh
+++ b/orchestrator/setup-crontab.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-. "${SCRIPT_DIR}/logging.sh"
+. "${SCRIPT_DIR}/../share/logging.sh"
 
 SCRIPTS=(
-    "check-disk-usage.sh"
-    "check-power-usage.sh" 
-    "check-temperature.sh"
+    "../metrics/disk-usage.sh"
+    "../metrics/power-usage.sh" 
+    "../metrics/temperature.sh"
 )
 
 CheckScriptExists() {
diff --git a/logging.sh b/share/logging.sh
similarity index 100%
rename from logging.sh
rename to share/logging.sh