diff --git a/profiles/ManuSurface/Arch/install.sh b/profiles/ManuSurface/Arch/install.sh
index 0af84fc19..46e1b0d5d 100755
--- a/profiles/ManuSurface/Arch/install.sh
+++ b/profiles/ManuSurface/Arch/install.sh
@@ -3,7 +3,7 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 function installDrivers() {
     . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-    . "../../../scripts/Arch/Devices/SurfaceBook2/install.sh";
+    . "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
 }
 
 function installSoftware() {
diff --git a/profiles/ManuSurface/PopOS/setup.sh b/profiles/ManuSurface/PopOS/setup.sh
index e85af289d..f069c11f7 100755
--- a/profiles/ManuSurface/PopOS/setup.sh
+++ b/profiles/ManuSurface/PopOS/setup.sh
@@ -5,7 +5,7 @@ sudo hostnamectl set-hostname ManuSurface;
 
 source "../../../scripts/PopOS/Scripts/preinstall.sh";
 source "../../../scripts/PopOS/OS/install.sh";
-source "../../../scripts/Debian/Devices/SurfaceBook2/Setup/install.sh";
+source "../../../scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh";
 source "../../../scripts/PopOS/Software/Collections/school.sh";
 INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../scripts/Common/Config/UserProfile/install.sh";
 
diff --git a/scripts/Arch/Devices/Surface/camera.sh b/scripts/Arch/Drivers/Surface/camera.sh
similarity index 100%
rename from scripts/Arch/Devices/Surface/camera.sh
rename to scripts/Arch/Drivers/Surface/camera.sh
diff --git a/scripts/Arch/Devices/Surface/install.sh b/scripts/Arch/Drivers/Surface/install.sh
similarity index 100%
rename from scripts/Arch/Devices/Surface/install.sh
rename to scripts/Arch/Drivers/Surface/install.sh
diff --git a/scripts/Arch/Devices/SurfaceBook2/install.sh b/scripts/Arch/Drivers/SurfaceBook2/install.sh
similarity index 100%
rename from scripts/Arch/Devices/SurfaceBook2/install.sh
rename to scripts/Arch/Drivers/SurfaceBook2/install.sh
diff --git a/scripts/Debian/Devices/Surface/LinuxSurface/install.sh b/scripts/Debian/Drivers/Surface/LinuxSurface/install.sh
similarity index 100%
rename from scripts/Debian/Devices/Surface/LinuxSurface/install.sh
rename to scripts/Debian/Drivers/Surface/LinuxSurface/install.sh
diff --git a/scripts/Debian/Devices/SurfaceBook2/Camera/install.sh b/scripts/Debian/Drivers/SurfaceBook2/Camera/install.sh
similarity index 100%
rename from scripts/Debian/Devices/SurfaceBook2/Camera/install.sh
rename to scripts/Debian/Drivers/SurfaceBook2/Camera/install.sh
diff --git a/scripts/Debian/Devices/SurfaceBook2/SecureBoot/install.sh b/scripts/Debian/Drivers/SurfaceBook2/SecureBoot/install.sh
similarity index 100%
rename from scripts/Debian/Devices/SurfaceBook2/SecureBoot/install.sh
rename to scripts/Debian/Drivers/SurfaceBook2/SecureBoot/install.sh
diff --git a/scripts/Debian/Devices/SurfaceBook2/SecureBoot/openssl.cnf b/scripts/Debian/Drivers/SurfaceBook2/SecureBoot/openssl.cnf
similarity index 100%
rename from scripts/Debian/Devices/SurfaceBook2/SecureBoot/openssl.cnf
rename to scripts/Debian/Drivers/SurfaceBook2/SecureBoot/openssl.cnf
diff --git a/scripts/Debian/Devices/SurfaceBook2/SecureBoot/sign-modules.sh b/scripts/Debian/Drivers/SurfaceBook2/SecureBoot/sign-modules.sh
similarity index 100%
rename from scripts/Debian/Devices/SurfaceBook2/SecureBoot/sign-modules.sh
rename to scripts/Debian/Drivers/SurfaceBook2/SecureBoot/sign-modules.sh
diff --git a/scripts/Debian/Devices/SurfaceBook2/Setup/install.sh b/scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh
similarity index 100%
rename from scripts/Debian/Devices/SurfaceBook2/Setup/install.sh
rename to scripts/Debian/Drivers/SurfaceBook2/Setup/install.sh