diff --git a/delete.sh b/delete.sh
deleted file mode 100644
index 0862c98..0000000
--- a/delete.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-read -p "Script Löschen? - (y/n): " answer
-
-if [[ "$answer" == [Yy] ]]; then
-    return 0
-elif [[ "$answer" == [Nn] ]]; then
-    return 1
-else
-    return 1
-fi
\ No newline at end of file
diff --git a/RAM.sh b/lib/RAM.sh
similarity index 100%
rename from RAM.sh
rename to lib/RAM.sh
diff --git a/battery.sh b/lib/battery.sh
similarity index 100%
rename from battery.sh
rename to lib/battery.sh
diff --git a/camera.sh b/lib/camera.sh
similarity index 100%
rename from camera.sh
rename to lib/camera.sh
diff --git a/drives.sh b/lib/drives.sh
similarity index 100%
rename from drives.sh
rename to lib/drives.sh
diff --git a/lan.sh b/lib/lan.sh
similarity index 100%
rename from lan.sh
rename to lib/lan.sh
diff --git a/model.sh b/lib/model.sh
similarity index 100%
rename from model.sh
rename to lib/model.sh
diff --git a/screen.sh b/lib/screen.sh
similarity index 100%
rename from screen.sh
rename to lib/screen.sh
diff --git a/speaker.sh b/lib/speaker.sh
similarity index 100%
rename from speaker.sh
rename to lib/speaker.sh
diff --git a/wifi.sh b/lib/wifi.sh
similarity index 100%
rename from wifi.sh
rename to lib/wifi.sh
diff --git a/test.sh b/test.sh
index 40edf0e..a1d66bd 100755
--- a/test.sh
+++ b/test.sh
@@ -4,15 +4,12 @@
 DIR="${BASH_SOURCE%/*}"
 DESKTOP_PATH=$(xdg-user-dir DESKTOP)
 OUT="$DESKTOP_PATH/device_info.txt"
-source drives.sh
-source RAM.sh
-source camera.sh
-source speaker.sh
-source wifi.sh
-source lan.sh
-source screen.sh
-source battery.sh
-source model.sh
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+
+for file in "$SCRIPT_DIR"/lib/*.sh; do
+    source "$file"
+done
 
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi