diff --git a/profiles/DerGeret/Arch/install.sh b/profiles/DerGeret/Arch/install.sh
deleted file mode 100755
index 372e8a4f..00000000
--- a/profiles/DerGeret/Arch/install.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -e
-function install() {
-    function installDrivers() {
-        . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-        . "../../../scripts/Arch/Software/nvidia-dkms/install.sh";
-        . "../../../scripts/Arch/Software/xone/install.sh";
-        . "../../../scripts/Arch/Software/bt-dualboot/install.sh";
-    }
-
-    function initializeConfig() {
-        . "../../../scripts/Unix/Devices/Logitech G903/install.sh";
-    }
-
-    pushd "$dir" > /dev/null;
-    . "../../../scripts/Arch/OS/install.sh";
-    popd > /dev/null;
-}
-
-install;
diff --git a/profiles/Generic/Windows/Install.ps1 b/profiles/Generic/Windows/Install.ps1
deleted file mode 100644
index 9df79e00..00000000
--- a/profiles/Generic/Windows/Install.ps1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/pwsh
-. "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/OS/Manage.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/Collections/Generic.ps1"
-
-function Restore-Apps {
-    param([Context] $context)
-    Restore-GenericApps $context;
-}
-
-[Context]$context = [Context]::new();
-Invoke-WindowsInstallation $context;
-Restart-Computer -Force;
diff --git a/profiles/ManuSurface/Arch/install.fish b/profiles/ManuSurface/Arch/install.fish
deleted file mode 100755
index 365b26ee..00000000
--- a/profiles/ManuSurface/Arch/install.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/env fish
-begin
-    set -l dir (status dirname)
-    source "$dir/../../../scripts/Arch/OS/install.fish"
-end
diff --git a/profiles/ManuSurface/Arch/install.sh b/profiles/ManuSurface/Arch/install.sh
deleted file mode 100755
index cdfb95dd..00000000
--- a/profiles/ManuSurface/Arch/install.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -e
-function install() {
-    function installDrivers() {
-        . "../../../scripts/Arch/Config/SecureBoot/install.sh";
-        . "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
-    }
-
-    function installSoftware() {
-        . "../../../scripts/Arch/Collections/school.sh";
-    }
-
-    function initializeConfig() {
-        . "../../../scripts/Common/Config/Steam/hidpi.sh";
-        . "../../../scripts/Unix/Devices/Surface Book 2/install.sh";
-        . "../../../scripts/Unix/Devices/Logitech G903/install.sh";
-
-        # Because, as it looks, Surface Books are fucking stupid.
-        . "../../../scripts/Common/Config/GRUB/verbose.sh";
-    }
-
-    pushd "${BASH_SOURCE%/*}" > /dev/null;
-    . "../../../scripts/Arch/OS/install.sh";
-    popd > /dev/null;
-}
-
-install;
diff --git a/profiles/ManuSurface/PopOS/setup.sh b/profiles/ManuSurface/PopOS/setup.sh
deleted file mode 100755
index f069c11f..00000000
--- a/profiles/ManuSurface/PopOS/setup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
-# Set Hostname
-sudo hostnamectl set-hostname ManuSurface;
-
-source "../../../scripts/PopOS/Scripts/preinstall.sh";
-source "../../../scripts/PopOS/OS/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";
-
-# Install equalizer
-source "../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
-
-source "../../../scripts/PopOS/Scripts/postinstall.sh";
-popd > /dev/null;
diff --git a/profiles/PopOSLive/setup.sh b/profiles/PopOSLive/setup.sh
deleted file mode 100755
index 2cb81791..00000000
--- a/profiles/PopOSLive/setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
-
-# Set Hostname
-sudo hostnamectl set-hostname ManuPopOSLive;
-source "../../scripts/PopOS/Scripts/prepare.sh";
-source "../../scripts/PopOS/OS/install.sh";
-source "../../scripts/PopOS/Software/Collections/personal.sh";
-INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../scripts/Common/Config/UserProfile/personal.sh";
-
-source "../../scripts/PopOS/Scripts/postinstall.sh";
-popd > /dev/null;
diff --git a/profiles/DerGeret/Arch/config.nix b/profiles/machines/manuel/DerGeret/Arch/config.nix
similarity index 100%
rename from profiles/DerGeret/Arch/config.nix
rename to profiles/machines/manuel/DerGeret/Arch/config.nix
diff --git a/profiles/DerGeret/Arch/install.fish b/profiles/machines/manuel/DerGeret/Arch/install.fish
similarity index 100%
rename from profiles/DerGeret/Arch/install.fish
rename to profiles/machines/manuel/DerGeret/Arch/install.fish
diff --git a/profiles/machines/manuel/DerGeret/Arch/install.sh b/profiles/machines/manuel/DerGeret/Arch/install.sh
new file mode 100755
index 00000000..e6a4e54a
--- /dev/null
+++ b/profiles/machines/manuel/DerGeret/Arch/install.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+function install() {
+    function installDrivers() {
+        . "../../../../../scripts/Arch/Config/SecureBoot/install.sh";
+        . "../../../../../scripts/Arch/Software/nvidia-dkms/install.sh";
+        . "../../../../../scripts/Arch/Software/xone/install.sh";
+        . "../../../../../scripts/Arch/Software/bt-dualboot/install.sh";
+    }
+
+    function initializeConfig() {
+        . "../../../../../scripts/Unix/Devices/Logitech G903/install.sh";
+    }
+
+    pushd "$dir" > /dev/null;
+    . "../../../../../scripts/Arch/OS/install.sh";
+    popd > /dev/null;
+}
+
+install;
diff --git a/profiles/DerGeret/Arch/setup.fish b/profiles/machines/manuel/DerGeret/Arch/setup.fish
similarity index 76%
rename from profiles/DerGeret/Arch/setup.fish
rename to profiles/machines/manuel/DerGeret/Arch/setup.fish
index 1b77aa66..5d041ea2 100755
--- a/profiles/DerGeret/Arch/setup.fish
+++ b/profiles/machines/manuel/DerGeret/Arch/setup.fish
@@ -9,5 +9,5 @@ begin
     CONFIG_MODULE="$dir/config.nix" \
     ARCH_HOSTNAME="der-geret" \
     USER_DISPLAYNAME="Manuel Thalmann" \
-        source "$(status dirname)/../../../scripts/Arch/OS/setup.fish"
+        source "$(status dirname)/../../../../../scripts/Arch/OS/setup.fish"
 end
diff --git a/profiles/DerGeret/Arch/setup.sh b/profiles/machines/manuel/DerGeret/Arch/setup.sh
similarity index 77%
rename from profiles/DerGeret/Arch/setup.sh
rename to profiles/machines/manuel/DerGeret/Arch/setup.sh
index 716dbc23..9d201db7 100755
--- a/profiles/DerGeret/Arch/setup.sh
+++ b/profiles/machines/manuel/DerGeret/Arch/setup.sh
@@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 CONFIG_MODULE="./config.nix" \
 ARCH_HOSTNAME="der-geret" \
 USER_DISPLAYNAME="Manuel Thalmann" \
-    . "../../../scripts/Arch/OS/setup.sh";
+    . "../../../../../scripts/Arch/OS/setup.sh";
 
 popd > /dev/null;
diff --git a/profiles/DerGeret/Windows/Backup.ps1 b/profiles/machines/manuel/DerGeret/Windows/Backup.ps1
similarity index 64%
rename from profiles/DerGeret/Windows/Backup.ps1
rename to profiles/machines/manuel/DerGeret/Windows/Backup.ps1
index 2419dca9..03e2bc68 100644
--- a/profiles/DerGeret/Windows/Backup.ps1
+++ b/profiles/machines/manuel/DerGeret/Windows/Backup.ps1
@@ -1,7 +1,7 @@
 #!/bin/pwsh
 $null = New-Module {
-    . "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
-    . "$PSScriptRoot/../../../scripts/Windows/OS/Legacy.ps1";
+    . "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
+    . "$PSScriptRoot/../../../../../scripts/Windows/OS/Legacy.ps1";
 
     Write-Host "Starting Backup of Windows";
     $context = [Context]::new();
diff --git a/profiles/DerGeret/Windows/Drivers.ps1 b/profiles/machines/manuel/DerGeret/Windows/Drivers.ps1
similarity index 86%
rename from profiles/DerGeret/Windows/Drivers.ps1
rename to profiles/machines/manuel/DerGeret/Windows/Drivers.ps1
index 0ef24d23..f9bb853c 100644
--- a/profiles/DerGeret/Windows/Drivers.ps1
+++ b/profiles/machines/manuel/DerGeret/Windows/Drivers.ps1
@@ -1,12 +1,12 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
 
 function Install-PortValhallaDrivers {
     param(
         [Context] $context
     )
 
-    $winPath = "$PSScriptRoot/../../../scripts/Windows";
+    $winPath = "$PSScriptRoot/../../../../../scripts/Windows";
     $driverPath = "$winPath/Drivers";
     $mbDriverPath = "$driverPath/ROG Zenith Extreme Alpha";
     $context.RegisterReboot();
@@ -38,7 +38,7 @@ function Install-PersonalDrivers {
         [Context] $context
     )
 
-    $softwarePath = "$PSScriptRoot/../../../scripts/Windows/Software";
+    $softwarePath = "$PSScriptRoot/../../../../../scripts/Windows/Software";
     . "$softwarePath/TobiiGhost/Install.ps1" $context;
     . "$softwarePath/TobiiGameHub/Install.ps1" $context;
 }
diff --git a/profiles/DerGeret/Windows/Notes.md b/profiles/machines/manuel/DerGeret/Windows/Notes.md
similarity index 100%
rename from profiles/DerGeret/Windows/Notes.md
rename to profiles/machines/manuel/DerGeret/Windows/Notes.md
diff --git a/profiles/DerGeret/Windows/Restore.ps1 b/profiles/machines/manuel/DerGeret/Windows/Restore.ps1
similarity index 77%
rename from profiles/DerGeret/Windows/Restore.ps1
rename to profiles/machines/manuel/DerGeret/Windows/Restore.ps1
index 94395440..d0bf1b45 100644
--- a/profiles/DerGeret/Windows/Restore.ps1
+++ b/profiles/machines/manuel/DerGeret/Windows/Restore.ps1
@@ -1,8 +1,8 @@
 #!/bin/pwsh
 . "$PSScriptRoot/Drivers.ps1";
-. "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/Collections/Personal.ps1"
-. "$PSScriptRoot/../../../scripts/Windows/OS/Manage.ps1";
+. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/Collections/Personal.ps1"
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Manage.ps1";
 
 function Initialize-Configuration {
     # Fix synchronization between Linux and Windows clock
diff --git a/profiles/DerGeret/Windows/Setup.ps1 b/profiles/machines/manuel/DerGeret/Windows/Setup.ps1
similarity index 71%
rename from profiles/DerGeret/Windows/Setup.ps1
rename to profiles/machines/manuel/DerGeret/Windows/Setup.ps1
index e7d5d62b..bd4ab8e9 100644
--- a/profiles/DerGeret/Windows/Setup.ps1
+++ b/profiles/machines/manuel/DerGeret/Windows/Setup.ps1
@@ -3,4 +3,4 @@ $env:WIN_COMPUTER_NAME = "DerGeret";
 $env:SETUP_SCRIPT_NAME = "$PSScriptRoot/Restore.ps1";
 $env:CONFIG_MODULE = "$PSScriptRoot/../config.nix";
 
-. "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Setup.ps1";
diff --git a/profiles/DerGeret/config.nix b/profiles/machines/manuel/DerGeret/config.nix
similarity index 95%
rename from profiles/DerGeret/config.nix
rename to profiles/machines/manuel/DerGeret/config.nix
index 8d98f47b..1c62f266 100644
--- a/profiles/DerGeret/config.nix
+++ b/profiles/machines/manuel/DerGeret/config.nix
@@ -1,9 +1,9 @@
 { ... }: {
   imports = [
-    ../Generic/config.nix
+    ../defaults.nix
   ];
 
-  config =  {
+  config = {
     valhalla = {
       windows = {
         dualboot = {
diff --git a/profiles/Generic/Arch/config.nix b/profiles/machines/manuel/Generic/Arch/config.nix
similarity index 100%
rename from profiles/Generic/Arch/config.nix
rename to profiles/machines/manuel/Generic/Arch/config.nix
diff --git a/profiles/Generic/Arch/install.sh b/profiles/machines/manuel/Generic/Arch/install.sh
similarity index 52%
rename from profiles/Generic/Arch/install.sh
rename to profiles/machines/manuel/Generic/Arch/install.sh
index 8248e6e6..d4f5f90a 100755
--- a/profiles/Generic/Arch/install.sh
+++ b/profiles/machines/manuel/Generic/Arch/install.sh
@@ -3,11 +3,11 @@ function install() {
     local dir="$(realpath "${BASH_SOURCE%/*}")";
 
     function installDrivers() {
-        . "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
+        . "$dir/../../../../../scripts/Arch/Config/SecureBoot/install.sh";
     }
 
 
-    . "../../../scripts/Arch/OS/install.sh";
+    . "../../../../../scripts/Arch/OS/install.sh";
 }
 
 install;
diff --git a/profiles/Generic/Arch/setup.sh b/profiles/machines/manuel/Generic/Arch/setup.sh
similarity index 76%
rename from profiles/Generic/Arch/setup.sh
rename to profiles/machines/manuel/Generic/Arch/setup.sh
index cd355f51..e1a37b4c 100755
--- a/profiles/Generic/Arch/setup.sh
+++ b/profiles/machines/manuel/Generic/Arch/setup.sh
@@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 ARCH_MOUNT_ROOT="/mnt" \
 ARCH_HOSTNAME="archlinux" \
 USER_DISPLAYNAME="Manuel Thalmann" \
-    . "../../../scripts/Arch/OS/setup.sh";
+    . "../../../../../scripts/Arch/OS/setup.sh";
 
 popd > /dev/null;
diff --git a/profiles/machines/manuel/Generic/Windows/Install.ps1 b/profiles/machines/manuel/Generic/Windows/Install.ps1
new file mode 100644
index 00000000..b4d0557e
--- /dev/null
+++ b/profiles/machines/manuel/Generic/Windows/Install.ps1
@@ -0,0 +1,13 @@
+#!/bin/pwsh
+. "$PSScriptRoot/../../../../../scripts/Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Manage.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/Collections/Generic.ps1"
+
+function Restore-Apps {
+    param([Context] $context)
+    Restore-GenericApps $context;
+}
+
+[Context]$context = [Context]::new();
+Invoke-WindowsInstallation $context;
+Restart-Computer -Force;
diff --git a/profiles/Generic/Windows/Setup.ps1 b/profiles/machines/manuel/Generic/Windows/Setup.ps1
similarity index 71%
rename from profiles/Generic/Windows/Setup.ps1
rename to profiles/machines/manuel/Generic/Windows/Setup.ps1
index 258e57e6..4ac74507 100644
--- a/profiles/Generic/Windows/Setup.ps1
+++ b/profiles/machines/manuel/Generic/Windows/Setup.ps1
@@ -3,4 +3,4 @@ $env:WIN_COMPUTER_NAME ??= "win11";
 $env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
 $env:CONFIG_MODULE ??= "$PSScriptRoot/../config.nix";
 
-. "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1";
+. "$PSScriptRoot/../../../../../scripts/Windows/OS/Setup.ps1";
diff --git a/profiles/Generic/config.nix b/profiles/machines/manuel/Generic/config.nix
similarity index 96%
rename from profiles/Generic/config.nix
rename to profiles/machines/manuel/Generic/config.nix
index dbe8555c..e43767d3 100644
--- a/profiles/Generic/config.nix
+++ b/profiles/machines/manuel/Generic/config.nix
@@ -1,10 +1,9 @@
 { lib, config, ... }:
   let
-    fs = import ../../lib/modules/partition/fs.nix;
+    fs = import ../../../../lib/modules/partition/fs.nix;
   in {
     imports = [
-      ../manuel/config.nix
-      ../../lib/modules/valhalla.nix
+      ../defaults.nix
     ];
 
     config = {
diff --git a/profiles/KVM/Windows/Install.ps1 b/profiles/machines/manuel/KVM/Windows/Install.ps1
similarity index 87%
rename from profiles/KVM/Windows/Install.ps1
rename to profiles/machines/manuel/KVM/Windows/Install.ps1
index 5124993e..1277f112 100644
--- a/profiles/KVM/Windows/Install.ps1
+++ b/profiles/machines/manuel/KVM/Windows/Install.ps1
@@ -14,4 +14,4 @@ function Install-PortValhallaDrivers {
     choco install -y spice-agent;
 }
 
-. "$PSScriptRoot/../../Generic/Windows/Install.ps1";
+. "$PSScriptRoot/../../../../Generic/Windows/Install.ps1";
diff --git a/profiles/KVM/Windows/Setup.ps1 b/profiles/machines/manuel/KVM/Windows/Setup.ps1
similarity index 54%
rename from profiles/KVM/Windows/Setup.ps1
rename to profiles/machines/manuel/KVM/Windows/Setup.ps1
index 6566ae50..0dc49f6f 100644
--- a/profiles/KVM/Windows/Setup.ps1
+++ b/profiles/machines/manuel/KVM/Windows/Setup.ps1
@@ -1,4 +1,4 @@
 #!/bin/pwsh
 $env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1";
 
-. "$PSScriptRoot/../../Generic/Windows/Setup.ps1";
+. "$PSScriptRoot/../../../../Generic/Windows/Setup.ps1";
diff --git a/profiles/ManuSurface/Arch/config.nix b/profiles/machines/manuel/ManuSurface/Arch/config.nix
similarity index 100%
rename from profiles/ManuSurface/Arch/config.nix
rename to profiles/machines/manuel/ManuSurface/Arch/config.nix
diff --git a/profiles/machines/manuel/ManuSurface/Arch/install.fish b/profiles/machines/manuel/ManuSurface/Arch/install.fish
new file mode 100755
index 00000000..287a21af
--- /dev/null
+++ b/profiles/machines/manuel/ManuSurface/Arch/install.fish
@@ -0,0 +1,5 @@
+#!/bin/env fish
+begin
+    set -l dir (status dirname)
+    source "$dir/../../../../../scripts/Arch/OS/install.fish"
+end
diff --git a/profiles/machines/manuel/ManuSurface/Arch/install.sh b/profiles/machines/manuel/ManuSurface/Arch/install.sh
new file mode 100755
index 00000000..ca043e3b
--- /dev/null
+++ b/profiles/machines/manuel/ManuSurface/Arch/install.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -e
+function install() {
+    function installDrivers() {
+        . "../../../../../scripts/Arch/Config/SecureBoot/install.sh";
+        . "../../../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
+    }
+
+    function installSoftware() {
+        . "../../../../../scripts/Arch/Collections/school.sh";
+    }
+
+    function initializeConfig() {
+        . "../../../../../scripts/Common/Config/Steam/hidpi.sh";
+        . "../../../../../scripts/Unix/Devices/Surface Book 2/install.sh";
+        . "../../../../../scripts/Unix/Devices/Logitech G903/install.sh";
+
+        # Because, as it looks, Surface Books are fucking stupid.
+        . "../../../../../scripts/Common/Config/GRUB/verbose.sh";
+    }
+
+    pushd "${BASH_SOURCE%/*}" > /dev/null;
+    . "../../../../../scripts/Arch/OS/install.sh";
+    popd > /dev/null;
+}
+
+install;
diff --git a/profiles/ManuSurface/Arch/setup.fish b/profiles/machines/manuel/ManuSurface/Arch/setup.fish
similarity index 72%
rename from profiles/ManuSurface/Arch/setup.fish
rename to profiles/machines/manuel/ManuSurface/Arch/setup.fish
index 5f5d201d..b613bc04 100755
--- a/profiles/ManuSurface/Arch/setup.fish
+++ b/profiles/machines/manuel/ManuSurface/Arch/setup.fish
@@ -3,7 +3,7 @@ begin
     set -l dir (status dirname)
 
     function installDrivers -V dir -S
-        source "$dir/../../../scripts/Common/Scripts/config.fish"
+        source "$dir/../../../../../scripts/Common/Scripts/config.fish"
         pacstrap -K (getConfig valhalla.partition.rootDir) linux-firmware-marvell;
     end
 
@@ -14,5 +14,5 @@ begin
     CONFIG_MODULE="$(status dirname)/config.nix" \
     ARCH_HOSTNAME="manu-surface" \
     USER_DISPLAYNAME="Manuel Thalmann" \
-        source "$(status dirname)/../../../scripts/Arch/OS/setup.fish";
+        source "$(status dirname)/../../../../../scripts/Arch/OS/setup.fish";
 end
diff --git a/profiles/ManuSurface/ManuSurfaceSetup.md b/profiles/machines/manuel/ManuSurface/ManuSurfaceSetup.md
similarity index 100%
rename from profiles/ManuSurface/ManuSurfaceSetup.md
rename to profiles/machines/manuel/ManuSurface/ManuSurfaceSetup.md
diff --git a/profiles/machines/manuel/ManuSurface/PopOS/setup.sh b/profiles/machines/manuel/ManuSurface/PopOS/setup.sh
new file mode 100755
index 00000000..4016c23f
--- /dev/null
+++ b/profiles/machines/manuel/ManuSurface/PopOS/setup.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+pushd "${BASH_SOURCE%/*}" > /dev/null;
+# Set Hostname
+sudo hostnamectl set-hostname ManuSurface;
+
+source "../../../../../scripts/PopOS/Scripts/preinstall.sh";
+source "../../../../../scripts/PopOS/OS/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";
+
+# Install equalizer
+source "../../../../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
+
+source "../../../../../scripts/PopOS/Scripts/postinstall.sh";
+popd > /dev/null;
diff --git a/profiles/ManuSurface/config.nix b/profiles/machines/manuel/ManuSurface/config.nix
similarity index 100%
rename from profiles/ManuSurface/config.nix
rename to profiles/machines/manuel/ManuSurface/config.nix
diff --git a/profiles/machines/manuel/PopOSLive/setup.sh b/profiles/machines/manuel/PopOSLive/setup.sh
new file mode 100755
index 00000000..7b941c59
--- /dev/null
+++ b/profiles/machines/manuel/PopOSLive/setup.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+pushd "${BASH_SOURCE%/*}" > /dev/null;
+
+# Set Hostname
+sudo hostnamectl set-hostname ManuPopOSLive;
+source "../../../../scripts/PopOS/Scripts/prepare.sh";
+source "../../../../scripts/PopOS/OS/install.sh";
+source "../../../../scripts/PopOS/Software/Collections/personal.sh";
+INSTALL_FONTS=1 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" source "../../../../scripts/Common/Config/UserProfile/personal.sh";
+
+source "../../../../scripts/PopOS/Scripts/postinstall.sh";
+popd > /dev/null;
diff --git a/profiles/machines/manuel/defaults.nix b/profiles/machines/manuel/defaults.nix
new file mode 100644
index 00000000..f1a04723
--- /dev/null
+++ b/profiles/machines/manuel/defaults.nix
@@ -0,0 +1,6 @@
+{ ... }: {
+  imports = [
+    ../../users/manuel/config.nix
+    ../../../lib/modules/valhalla.nix
+  ];
+}
diff --git a/profiles/manuel/config.nix b/profiles/users/manuel/config.nix
similarity index 88%
rename from profiles/manuel/config.nix
rename to profiles/users/manuel/config.nix
index 15e3feff..10d6c856 100644
--- a/profiles/manuel/config.nix
+++ b/profiles/users/manuel/config.nix
@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    ../../lib/modules/valhalla.nix
+    ../../../lib/modules/valhalla.nix
   ];
 
   config = {
diff --git a/profiles/manuel/manuel.omp.json b/profiles/users/manuel/manuel.omp.json
similarity index 100%
rename from profiles/manuel/manuel.omp.json
rename to profiles/users/manuel/manuel.omp.json