diff --git a/temp-Modules/Applications/GUI-Apps/Browser/brave/brave.nix b/temp-Modules/Applications/GUI-Apps/Browser/brave/brave.nix
deleted file mode 100644
index 1b0af1b..0000000
--- a/temp-Modules/Applications/GUI-Apps/Browser/brave/brave.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.brave-and-extension;
-in {
-  options.brave-and-extension.enable = mkEnableOption "Enable Brave with extensions and flags";
-
-  config = mkIf cfg.enable {
-    programs.brave = {
-      package = pkgs.brave;
-      enable = true;
-      extensions = [
-        {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin
-        
-      ];
-
-      commandLineArgs = [
-        "--disable-features=AutofillSavePaymentMethods"
-        "--disable-features=PasswordManagerOnboarding"
-        "--disable-features=AutofillEnableAccountWalletStorage"
-      ];
-    };
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/krita.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/krita.nix
deleted file mode 100644
index cdf73c5..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/krita.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.krita;
-in {
-  options.krita.enable = mkEnableOption "Enable krita";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      pkgs.krita
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/obsidian.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/obsidian.nix
deleted file mode 100644
index 8d09ff9..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/obsidian.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
-  options.obsidian.enable = mkEnableOption "Enable Obsidian installation";
-
-  config = mkIf config.obsidian.enable {
-    home.packages = with pkgs; [
-      obsidian
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/office-apps.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/office-apps.nix
deleted file mode 100644
index 22d434d..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/office-apps.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config;
-
-  officeApps = with pkgs; [
-    libreoffice
-    thunderbird
-  ];
-in {
-  options.officeApps.enable = mkEnableOption ''
-    Enable office/document applications (e.g., LibreOffice, Thunderbird)
-  '';
-
-  config = {
-    home.packages =
-      optionals cfg.officeApps.enable officeApps;
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/signal-desktop.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/signal-desktop.nix
deleted file mode 100644
index e5c44f6..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/signal-desktop.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.signal;
-in {
-  options.signal.enable = mkEnableOption "Enable Signals Desktop Version";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      pkgs.signal-desktop
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/spotify.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/spotify.nix
deleted file mode 100644
index f135e2f..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/spotify.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
-  options.spotify.enable = mkEnableOption "Enable Spotify installation";
-
-  config = mkIf config.spotify.enable {
-    home.packages = with pkgs; [
-      spotify
-      cava
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/standard-apps.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/standard-apps.nix
deleted file mode 100644
index 526685e..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/standard-apps.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config;
-
-  standardApps = with pkgs; [
-    kdePackages.gwenview
-    kdePackages.okular
-  ];
-in {
-  options.standardApps.enable = mkEnableOption ''
-    Enable image and graphics applications (e.g., Gwenview, Okular)
-  '';
-
-  config = {
-    home.packages = optionals cfg.standardApps.enable standardApps;
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/vesktop.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/vesktop.nix
deleted file mode 100644
index a51c9af..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/vesktop.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.vesktop;
-in {
-  options.vesktop.enable = mkEnableOption "Enable Vesktop, the Custom Discord client, with extensions";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      pkgs.vesktop
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/vscodium.nix b/temp-Modules/Applications/GUI-Apps/Desktop-Apps/vscodium.nix
deleted file mode 100644
index d2820f6..0000000
--- a/temp-Modules/Applications/GUI-Apps/Desktop-Apps/vscodium.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.vscodium-and-extension;
-in {
-  options.vscodium-and-extension.enable = mkEnableOption "Enable VScodium with extensions";
-
-  config = mkIf cfg.enable {
-    programs.vscode = {
-      enable = true;
-      package = pkgs.vscodium;
-      profiles.default.extensions = with pkgs.vscode-extensions; [
-        catppuccin.catppuccin-vsc
-        jnoortheen.nix-ide
-        ms-python.python
-        ms-azuretools.vscode-docker
-      ];
-    };
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/Gaming/prismlauncher.nix b/temp-Modules/Applications/GUI-Apps/Gaming/prismlauncher.nix
deleted file mode 100644
index 3307b00..0000000
--- a/temp-Modules/Applications/GUI-Apps/Gaming/prismlauncher.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  options.prismlauncher.enable = lib.mkEnableOption "Enable PrismLauncher and dependencies";
-
-  config = lib.mkIf config.prismlauncher.enable {
-    home.packages = [
-      (pkgs.prismlauncher.override {
-        # Add binary required by some mod
-        additionalPrograms = [ pkgs.ffmpeg ];
-
-        # Set Java runtimes
-        jdks = [
-          pkgs.jdk8
-          pkgs.jdk17
-          pkgs.jdk21 or pkgs.jdk
-        ];
-      })
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/VPN/protonvpn.nix b/temp-Modules/Applications/GUI-Apps/VPN/protonvpn.nix
deleted file mode 100644
index d8d63c8..0000000
--- a/temp-Modules/Applications/GUI-Apps/VPN/protonvpn.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  options.protonvpn.enable = lib.mkEnableOption "Enable ProtonVPN and dependencies";
-
-  config = lib.mkIf config.protonvpn.enable {
-    home.packages = with pkgs; [
-      protonvpn-gui
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/GUI-Apps/default.nix b/temp-Modules/Applications/GUI-Apps/default.nix
deleted file mode 100644
index 379b6f7..0000000
--- a/temp-Modules/Applications/GUI-Apps/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# Import all modules so home.nix only needs to import this file
-{ config, pkgs, lib, inputs, ... }: {
-  imports = [
-
-    ################
-    # 🖥️ Desktop Apps #
-    ################
-    ./Desktop-Apps/krita.nix
-    ./Desktop-Apps/obsidian.nix
-    ./Desktop-Apps/office-apps.nix
-    ./Desktop-Apps/signal-desktop.nix
-    ./Desktop-Apps/spotify.nix
-    ./Desktop-Apps/standard-apps.nix
-    ./Desktop-Apps/vesktop.nix
-    ./Desktop-Apps/vscodium.nix
-
-    #############
-    # 🌐 Browser #
-    #############
-    ./Browser/brave/brave.nix
-
-    ############
-    # 🎮 Gaming #
-    ############
-    ./Gaming/prismlauncher.nix
-
-    ###########
-    # 🔐 VPNs #
-    ###########
-    ./VPN/protonvpn.nix
-  ];
-}
diff --git a/temp-Modules/Applications/Shell/cli-tools/default.nix b/temp-Modules/Applications/Shell/cli-tools/default.nix
deleted file mode 100644
index e1726c6..0000000
--- a/temp-Modules/Applications/Shell/cli-tools/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-{
-  options.cliTools.enable = lib.mkEnableOption "Enable CLI tools like fastfetch and hyfetch";
-
-  config = lib.mkIf config.cliTools.enable {
-    home.packages = with pkgs; [
-      fastfetch
-      hyfetch
-      bat
-      fzf
-      tree
-      lsd
-      tmux
-    ];
-  };
-}
diff --git a/temp-Modules/Applications/Shell/default.nix b/temp-Modules/Applications/Shell/default.nix
deleted file mode 100644
index 5e6b946..0000000
--- a/temp-Modules/Applications/Shell/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# Import all modules so home.nix only needs to import this file
-{ config, pkgs, lib, inputs, ... }: {
-  imports = [
-    ####################
-    # 🧰 CLI Tools      #
-    ####################
-    ./cli-tools/default.nix
-
-    ####################
-    # 🐚 Zsh Shell      #
-    ####################
-    ./zsh/default.nix
-  ];
-}
diff --git a/temp-Modules/Applications/Shell/zsh/default.nix b/temp-Modules/Applications/Shell/zsh/default.nix
deleted file mode 100644
index 704247a..0000000
--- a/temp-Modules/Applications/Shell/zsh/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; {
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-
-    plugins = [
-      {
-        name = "zsh-autosuggestions";
-        src = pkgs.zsh-autosuggestions;
-      }
-      {
-        name = "zsh-syntax-highlighting";
-        src = pkgs.zsh-syntax-highlighting;
-      }
-    ];
-
-    initContent = ''
-      hyfetch
-
-      alias ls='lsd'
-      alias l='ls -l'
-      alias la='ls -a'
-      alias lla='ls -la'
-      alias lt='ls --tree'
-
-      HISTFILE=~/.zsh_history;
-      HISTSIZE=10000;
-      SAVEHIST=10000;
-      setopt appendhistory;
-    '';
-  };
-
-  home.packages = with pkgs; [
-    zsh-autosuggestions
-    zsh-syntax-highlighting
-  ];
-}
diff --git a/temp-Modules/Applications/default.nix b/temp-Modules/Applications/default.nix
deleted file mode 100644
index 95e6bc1..0000000
--- a/temp-Modules/Applications/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# Import all modules so home.nix only needs to import this file
-{ config, pkgs, lib, inputs, ... }: {
-  imports = [
-    #################
-    # 🖥 GUI Software #
-    #################
-    ./GUI-Apps
-
-    #################
-    # 🐚 Shell Setup #
-    #################
-    ./Shell
-
-
-  ];
-}
diff --git a/temp-Modules/System/common.nix b/temp-Modules/System/common.nix
deleted file mode 100644
index c5c7661..0000000
--- a/temp-Modules/System/common.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  host,
-  ...
-}: {
-
-  # Enable Bluetooth
-  hardware.bluetooth.enable = true; # enables support for Bluetooth
-  hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
-
-
-  # Enable firmware (Intel AX200 needs firmware files from linux-firmware)
-  hardware.enableAllFirmware = true;
-  hardware.firmware = [ pkgs.linux-firmware ];
-
-
-  #error: The option `dconf' does not exist. Definition values:
-  programs.dconf.enable = true;
-
-  networking = {
-    networkmanager.enable = true;
-    hostName = host;
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  i18n.defaultLocale = "en_GB.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
-
-  nix.settings.experimental-features = ["nix-command" "flakes" "pipe-operators"];
-  nixpkgs.config.allowUnfree = true;
-
-  console.keyMap = "de";
-
-  services.printing.enable = true;
-
-  # Sound and pipewire
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-}
diff --git a/temp-Modules/System/default.nix b/temp-Modules/System/default.nix
deleted file mode 100644
index d6c3251..0000000
--- a/temp-Modules/System/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Import all modules so configuration.nix only needs to import this file
-{ config, pkgs, lib, inputs, username, ... }: {
-  imports = [
-    ##############
-    # ⚙️ Defaults #
-    ##############
-    ./common.nix
-
-  ];
-}