diff --git a/ManuSurface/ManuSurfaceSetup.md b/ManuSurface/ManuSurfaceSetup.md
deleted file mode 100644
index dcfe83e7..00000000
--- a/ManuSurface/ManuSurfaceSetup.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# ManuSurface Setup
-The steps described here allow the creation of a linux system on a Surface Book 2.
-
-  - Rename host
-  - Install Brave
-    - Using the [installer script](../scripts/PopOS/software/brave.sh)
-  - Install Bitwarden
-  - Install Xournal++
-  - Install Signal
-  - Install Steam
-  - Install Bottles
-  - Install codium
-    - Using [installer script](../scripts/PopOS/software/codium.sh)
-  - Generate SSH-key
-  - Install `linux-surface`  
-    See: <https://github.com/linux-surface/linux-surface/wiki/Installation-and-Setup>
-    - Using [installer script](../scripts/PopOS/linux-surface.sh)
-  - Enable Secure Boot  
-    As seen here: <https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot#Set_up_shim>
-    - Usiing [installer script](../scripts/PopOS/secure-boot.sh)
-  - Install `tea`
-    - Using [installer script](../scripts/PopOS/software/tea.sh)
-
-## Enhancement
-  - Install `Gnome Extension Manager`
-    - Install Extensions `Clipboard Indicator`
-  - Install rclone
-    - Using [installer script](../scripts/PopOS/software/rclone/install.sh)
-  - Sync NextCloud
-    - Using [script](../scripts/PopOS/cloud-sync/nextcloud.sh)
-  - Install `oh-my-posh`
-    - Using [installer script](../scripts/PopOS/software/oh-my-posh.sh)
-  - Install `logo-ls`
-    - Using [installer script](../scripts/PopOS/software/logo-ls.sh)
-  - Improve audio quality
-    - Using [installer script](../scripts/PopOS/equalizer/install.sh)
-
-  - Install python
-    - Using [installer script](../scripts/PopOS/software/python.sh)
-  - Install pyenv
-    - Using [installer script](../scripts/PopOS/software/pyenv.sh)
-
-## Post-Install
-  - Add SSH-key to GitHub/Gitea websites
-  - Add Caskaydia Cove Nerd Font Regular to /usr/share/font/opentype
-
-## Configuration
-  - Desktop
-    - Desktop Options
-      - Super Key Action: Applications
-  - Power
-    - Power Saving Options
-      - Disable "Automatic Screen Brightness"
-    - Suspend & Power Button
-      - Power Button Behavior: "Suspend"
-      - Enable "Show Battery Percentage"
-  - Mouse & Touchpad
-    - Touchpad Scroll & Zoom Options
-      - Enable "Natural Scrolling"
-  - Date & Time
-    - Time Format: 24-hour
-  - OS Upgrade & Recovery
-    - Update Recovery Partition
diff --git a/README.md b/README.md
index 37f63798..49802544 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@
 Provides both scripts and descriptive texts explaining how to set up my personal experience on my private devices
 
 So far, scripts and explanations for the following devices have been added:
-  - [My Surface Book 2](./ManuSurface/ManuSurfaceSetup.md)
+  - [My Surface Book 2](./devices/ManuSurface/ManuSurfaceSetup.md)
diff --git a/devices/ManuSurface/ManuSurfaceSetup.md b/devices/ManuSurface/ManuSurfaceSetup.md
new file mode 100644
index 00000000..5d30f113
--- /dev/null
+++ b/devices/ManuSurface/ManuSurfaceSetup.md
@@ -0,0 +1,26 @@
+# ManuSurface Setup
+The steps described here allow the creation of a linux system on a Surface Book 2.
+
+## Basic Installation
+  - Run install script [setup.sh](./setup.sh)
+
+## Post-Install
+  - Add SSH-key to GitHub/Gitea websites
+
+## Configuration
+  - Desktop
+    - Desktop Options
+      - Super Key Action: Applications
+  - Power
+    - Power Saving Options
+      - Disable "Automatic Screen Brightness"
+    - Suspend & Power Button
+      - Power Button Behavior: "Suspend"
+      - Enable "Show Battery Percentage"
+  - Mouse & Touchpad
+    - Touchpad Scroll & Zoom Options
+      - Enable "Natural Scrolling"
+  - Date & Time
+    - Time Format: 24-hour
+  - OS Upgrade & Recovery
+    - Update Recovery Partition
diff --git a/ManuSurface/setup.sh b/devices/ManuSurface/setup.sh
similarity index 100%
rename from ManuSurface/setup.sh
rename to devices/ManuSurface/setup.sh