diff --git a/flake.nix b/flake.nix
index ca99aa2..ac746eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            users.fabian = import ./hosts/computer/modules/home/home.nix;
+            users.fabian = import ./hosts/default/home/home.nix;
           };
         }
       ];
@@ -40,7 +40,7 @@
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            users.fabian = import ./hosts/laptop/modules/home/home.nix;
+            users.fabian = import ./hosts/default/home/home.nix;
           };
         }
       ];
diff --git a/hosts/computer/modules/home/nix/alacritty.nix b/hosts/computer/modules/home/nix/alacritty.nix
deleted file mode 100644
index 3f86646..0000000
--- a/hosts/computer/modules/home/nix/alacritty.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs.alacritty = {
-  enable = true;
-  settings = {
-    window.dimensions = {
-      lines = 4;
-      columns = 200;
-    };
-    font = {
-      size = 17;
-      normal = {
-        family = "TerminessNerdFont";
-        style = "Regular";
-      };
-    };
-    terminal = {
-      shell = "tmux";
-    };
-    colors = {
-      primary = {
-        foreground = "#f2f4f8";
-        background = "#121212";
-      };
-      normal = {
-        black   = "#121212";
-        red     = "#ee5396";
-        green   = "#25be6a";
-        yellow  = "#08bdba";
-        blue    = "#78a9ff";
-        magenta = "#be95ff";
-        cyan    = "#33b1ff";
-        white   = "#dfdfe0";
-      };
-      bright = {
-        black   = "#525252";
-        red     = "#ff7eb6";
-        green   = "#42be65";
-        yellow  = "#3ddbd9";
-        blue    = "#82cfff";
-        magenta = "#df99ff";
-        cyan    = "#6ea6ff";
-        white   = "#ffffff";
-      };
-    };
-  };
-};
-
-}
diff --git a/hosts/computer/modules/home/nix/default.nix b/hosts/computer/modules/home/nix/default.nix
deleted file mode 100644
index 113c7a4..0000000
--- a/hosts/computer/modules/home/nix/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    ../../../../default/windowManager/sway/default.nix
-    ./alacritty.nix
-    ./shell.nix
-    ./git.nix
-    ./tmux.nix
-    ./mpd.nix
-  ];
-}
diff --git a/hosts/computer/modules/home/nix/shell.nix b/hosts/computer/modules/home/nix/shell.nix
deleted file mode 100644
index 3bf2198..0000000
--- a/hosts/computer/modules/home/nix/shell.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    grc
-  ];
-  programs = {
-    fish = {
-      enable = true;
-      generateCompletions = true;
-      interactiveShellInit = ''
-        set -gx DEVKITPRO "/opt/devkitpro";
-        set -gx DEVKITPPC "/opt/devkitpro/devkitPPC";
-        set -gx DEVKITA64 "/opt/devkitpro/devkitA64";
-        set -gx DEVKITARM "/opt/devkitpro/devkitARM";
-        set -gx PATH "/opt/devkitpro/tools/bin:$PATH";
-      '';
-      shellAliases = {
-        g = "git";
-        gc = "git commit";
-        ga = "git add -A";
-        http = "python3 -m http.server";
-        ls = "${pkgs.eza}/bin/eza -l --icons";
-        tree = "${pkgs.eza}/bin/eza --tree --icons";
-        cp = "cp -rv";
-        mv = "mv -v";
-        mkdir = "mkdir -pv";
-        update = "sudo nixos-rebuild switch --flake /etc/nixos#poggers --impure";
-      };
-      plugins = [
-        {
-          name = "z";
-          src = pkgs.fishPlugins.z.src;
-        }
-        {
-          name = "pisces";
-          src = pkgs.fishPlugins.pisces.src;
-        }
-        {
-          name = "fzf-fish";
-          src = pkgs.fishPlugins.fzf-fish.src;
-        }
-        {
-          name = "hydro";
-          src = pkgs.fishPlugins.hydro.src;
-        }
-        {
-          name = "grc";
-          src = pkgs.fishPlugins.grc.src;
-        }
-        {
-          name = "git-abbr";
-          src = pkgs.fishPlugins.git-abbr.src;
-        }
-        {
-          name = "forgit";
-          src = pkgs.fishPlugins.forgit.src;
-        }
-        {
-          name = "colored-man-pages";
-          src = pkgs.fishPlugins.colored-man-pages.src;
-        }
-        {
-          name = "bobthefisher";
-          src = pkgs.fishPlugins.bobthefisher.src;
-        }
-      ];
-    };
-
-    bash = {
-      enable = false;
-      enableCompletion = true;
-      sessionVariables = {
-        DEVKITPRO = "/opt/devkitpro";
-        DEVKITPPC = "/opt/devkitpro/devkitPPC";
-        DEVKITA64 = "/opt/devkitpro/devkitA64";
-        DEVKITARM = "/opt/devkitpro/devkitARM";
-        PATH = "/opt/devkitpro/tools/bin:$PATH";
-      };
-      shellAliases = {
-        http = "python3 -m http.server";
-        rm = "rm $@ -v -I";
-        ls = "${pkgs.eza}/bin/eza -l --icons";
-        cp = "cp -rv";
-        mv = "mv -v";
-        mkdir = "mkdir -pv";
-        update = "doas nixos-rebuild switch";
-      };
-      shellOptions = [
-        "histappend"
-        "checkwinsize"
-        "extglob"
-        "globstar"
-        "checkjobs"
-      ];
-      initExtra = ''
-        PS1="(\u) % "
-
-        eval "$(fzf --bash)"
-        complete -cf doas 
-      '';
-    };
-  };
-}
diff --git a/hosts/computer/modules/home/home.nix b/hosts/default/home/home.nix
similarity index 100%
rename from hosts/computer/modules/home/home.nix
rename to hosts/default/home/home.nix
diff --git a/hosts/laptop/modules/home/nix/alacritty.nix b/hosts/default/home/nix/alacritty.nix
similarity index 100%
rename from hosts/laptop/modules/home/nix/alacritty.nix
rename to hosts/default/home/nix/alacritty.nix
diff --git a/hosts/laptop/modules/home/nix/default.nix b/hosts/default/home/nix/default.nix
similarity index 69%
rename from hosts/laptop/modules/home/nix/default.nix
rename to hosts/default/home/nix/default.nix
index 113c7a4..90b50bf 100644
--- a/hosts/laptop/modules/home/nix/default.nix
+++ b/hosts/default/home/nix/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ../../../../default/windowManager/sway/default.nix
+    ../../windowManager/sway/default.nix
     ./alacritty.nix
     ./shell.nix
     ./git.nix
diff --git a/hosts/computer/modules/home/nix/git.nix b/hosts/default/home/nix/git.nix
similarity index 100%
rename from hosts/computer/modules/home/nix/git.nix
rename to hosts/default/home/nix/git.nix
diff --git a/hosts/computer/modules/home/nix/mpd.nix b/hosts/default/home/nix/mpd.nix
similarity index 100%
rename from hosts/computer/modules/home/nix/mpd.nix
rename to hosts/default/home/nix/mpd.nix
diff --git a/hosts/laptop/modules/home/nix/shell.nix b/hosts/default/home/nix/shell.nix
similarity index 100%
rename from hosts/laptop/modules/home/nix/shell.nix
rename to hosts/default/home/nix/shell.nix
diff --git a/hosts/computer/modules/home/nix/tmux.nix b/hosts/default/home/nix/tmux.nix
similarity index 100%
rename from hosts/computer/modules/home/nix/tmux.nix
rename to hosts/default/home/nix/tmux.nix
diff --git a/hosts/computer/modules/home/raw/wp/GABE_Windows.png b/hosts/default/home/raw/wp/GABE_Windows.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/GABE_Windows.png
rename to hosts/default/home/raw/wp/GABE_Windows.png
diff --git a/hosts/computer/modules/home/raw/wp/anime_blue.png b/hosts/default/home/raw/wp/anime_blue.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/anime_blue.png
rename to hosts/default/home/raw/wp/anime_blue.png
diff --git a/hosts/computer/modules/home/raw/wp/bg.png b/hosts/default/home/raw/wp/bg.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/bg.png
rename to hosts/default/home/raw/wp/bg.png
diff --git a/hosts/computer/modules/home/raw/wp/fuji.png b/hosts/default/home/raw/wp/fuji.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/fuji.png
rename to hosts/default/home/raw/wp/fuji.png
diff --git a/hosts/computer/modules/home/raw/wp/gruvbox-dark-blue.png b/hosts/default/home/raw/wp/gruvbox-dark-blue.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/gruvbox-dark-blue.png
rename to hosts/default/home/raw/wp/gruvbox-dark-blue.png
diff --git a/hosts/computer/modules/home/raw/wp/hollow_knight.png b/hosts/default/home/raw/wp/hollow_knight.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/hollow_knight.png
rename to hosts/default/home/raw/wp/hollow_knight.png
diff --git a/hosts/computer/modules/home/raw/wp/ios.png b/hosts/default/home/raw/wp/ios.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/ios.png
rename to hosts/default/home/raw/wp/ios.png
diff --git a/hosts/computer/modules/home/raw/wp/manga.png b/hosts/default/home/raw/wp/manga.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/manga.png
rename to hosts/default/home/raw/wp/manga.png
diff --git a/hosts/computer/modules/home/raw/wp/nixos_dark.png b/hosts/default/home/raw/wp/nixos_dark.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/nixos_dark.png
rename to hosts/default/home/raw/wp/nixos_dark.png
diff --git a/hosts/computer/modules/home/raw/wp/orbit.png b/hosts/default/home/raw/wp/orbit.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/orbit.png
rename to hosts/default/home/raw/wp/orbit.png
diff --git a/hosts/computer/modules/home/raw/wp/skull_purple.png b/hosts/default/home/raw/wp/skull_purple.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/skull_purple.png
rename to hosts/default/home/raw/wp/skull_purple.png
diff --git a/hosts/computer/modules/home/raw/wp/skulls.png b/hosts/default/home/raw/wp/skulls.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/skulls.png
rename to hosts/default/home/raw/wp/skulls.png
diff --git a/hosts/computer/modules/home/raw/wp/soyuz.png b/hosts/default/home/raw/wp/soyuz.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/soyuz.png
rename to hosts/default/home/raw/wp/soyuz.png
diff --git a/hosts/computer/modules/home/raw/wp/temple.png b/hosts/default/home/raw/wp/temple.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/temple.png
rename to hosts/default/home/raw/wp/temple.png
diff --git a/hosts/computer/modules/home/raw/wp/wolf.png b/hosts/default/home/raw/wp/wolf.png
similarity index 100%
rename from hosts/computer/modules/home/raw/wp/wolf.png
rename to hosts/default/home/raw/wp/wolf.png
diff --git a/hosts/laptop/modules/home/home.nix b/hosts/laptop/modules/home/home.nix
deleted file mode 100644
index dda3199..0000000
--- a/hosts/laptop/modules/home/home.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./nix
-  ];
-  home = {
-    enableNixpkgsReleaseCheck = false;
-    stateVersion = "24.11";
-    file = {
-      ".wp/temple.png".source = ./raw/wp/temple.png;
-      ".wp/skull_purple.png".source = ./raw/wp/skull_purple.png;
-      ".wp/gruvbox-dark-blue.png".source = ./raw/wp/gruvbox-dark-blue.png;
-      ".wp/anime_blue.png".source = ./raw/wp/anime_blue.png;
-      ".wp/fuji.png".source = ./raw/wp/fuji.png;
-      ".wp/orbit.png".source = ./raw/wp/orbit.png;
-      ".wp/hollow_knight.png".source = ./raw/wp/hollow_knight.png;
-      ".wp/ios.png".source = ./raw/wp/ios.png;
-      ".wp/manga.png".source = ./raw/wp/manga.png;
-      ".wp/bg.png".source = ./raw/wp/bg.png;
-      ".wp/wolf.png".source = ./raw/wp/wolf.png;
-      ".wp/nixos_dark.png".source = ./raw/wp/nixos_dark.png;
-      ".wp/GABE_Windows.png".source = ./raw/wp/GABE_Windows.png;
-      ".wp/skulls.png".source = ./raw/wp/skulls.png;
-      ".wp/soyuz.png".source = ./raw/wp/soyuz.png;
-    };
-  };
-}
diff --git a/hosts/laptop/modules/home/nix/git.nix b/hosts/laptop/modules/home/nix/git.nix
deleted file mode 100644
index 70b11f5..0000000
--- a/hosts/laptop/modules/home/nix/git.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs = {
-    git = {
-      enable = true;
-      userName = "Sojus07";
-      userEmail = "Sojus07";
-    };
-  };
-}
diff --git a/hosts/laptop/modules/home/nix/mpd.nix b/hosts/laptop/modules/home/nix/mpd.nix
deleted file mode 100644
index 65ff2b5..0000000
--- a/hosts/laptop/modules/home/nix/mpd.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    mpc
-    mpd-discord-rpc
-    mpv
-  ];
-  services = {
-    mpd = {
-      enable = true;
-      musicDirectory = "/home/fabian/.music";
-      extraConfig = ''
-        audio_output {
-          type "pipewire"
-          name "Pipewire Output"
-        }
-
-        audio_output {
-          type            "fifo"
-          name            "Visualizer feed"
-          path            "/tmp/mpd.fifo"
-          format          "44100:16:2"
-        }
-
-      '';
-    };
-  };
-
-  programs = {
-    ncmpcpp = {
-      enable = true;
-      mpdMusicDir = "/home/fabian/.music";
-      bindings = [
-      ];
-      settings = {
-        ncmpcpp_directory = "~/.ncmpcpp";
-        mpd_host = "localhost";
-        mpd_port = 6600;
-        header_window_color = "cyan";
-        progressbar_look = "━━━";
-        visualizer_color = "cyan";
-        visualizer_look = "┃│";
-        now_playing_prefix = "󰮯 ";
-        visualizer_type = "wave";
-        song_status_format = " $2%a $4⟫$3⟫ $8%t $4⟫$3⟫ $5%b ";
-        autocenter_mode = "yes";
-        centered_cursor = "yes";
-        display_bitrate = "no";
-        enable_window_title = "no";
-        follow_now_playing_lyrics = "yes";
-        ignore_leading_the = "yes";
-        empty_tag_marker = "";
-        visualizer_data_source = "/tmp/mpd.fifo";
-        visualizer_output_name = "my_fifo";
-        header_visibility = false;
-        statusbar_visibility = true;
-        titles_visibility = true;
-      };
-    };
-  };
-}
diff --git a/hosts/laptop/modules/home/nix/tmux.nix b/hosts/laptop/modules/home/nix/tmux.nix
deleted file mode 100644
index 39932aa..0000000
--- a/hosts/laptop/modules/home/nix/tmux.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs = {
-    tmux = {
-      enable = true;
-      plugins = with pkgs; [
-        tmuxPlugins.net-speed
-        tmuxPlugins.cpu
-        tmuxPlugins.battery
-        tmuxPlugins.gruvbox
-      ];
-      disableConfirmationPrompt = true;
-      mouse = true;
-      keyMode = "vi";
-      extraConfig = ''
-        unbind C-b
-        set-option -g prefix C-a
-        bind-key C-a send-prefix 
-        bind \\ split-window -h
-        bind - split-window -v
-        unbind '"'
-        unbind %
-
-        bind t new-window
-        bind -n M-w previous-window
-        bind -n M-e next-window
-        bind r source-file ~/.config/tmux/tmux.conf
-        bind -n M-Left select-pane -L
-        bind -n M-Right select-pane -R
-        bind -n M-Up select-pane -U
-        bind -n M-Down select-pane -D
-
-        #setw -g window-status-current-format "[ #W ]"  
-        #setw -g window-status-format "#W"  
-
-        set-option -s status-interval 1
-        set -g status-right-length 100
-        set -g @net_speed_interfaces "wg0-mullvad"
-        set -g @download_speed_format "%1s"
-        set -g @upload_speed_format "%1s"
-        set -g @net_speed_format "D:%1s U:%1s"
-
-        set -g status-right '#{battery_icon} #{battery_percentage} [󰈀  #{net_speed}] [   #{cpu_percentage}] [  %H:%M] '
-
-        run-shell ${pkgs.tmuxPlugins.net-speed}/share/tmux-plugins/net-speed/net_speed.tmux 
-        run-shell ${pkgs.tmuxPlugins.cpu}/share/tmux-plugins/cpu/cpu.tmux
-        run-shell ${pkgs.tmuxPlugins.battery}/share/tmux-plugins/battery/battery.tmux
-
-        set -g status-position top
-        #set-option -g status-style bg=default
-      '';
-    };
-  };
-}
diff --git a/hosts/laptop/modules/home/raw/wp/GABE_Windows.png b/hosts/laptop/modules/home/raw/wp/GABE_Windows.png
deleted file mode 100644
index babfabd..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/GABE_Windows.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/anime_blue.png b/hosts/laptop/modules/home/raw/wp/anime_blue.png
deleted file mode 100644
index 6bb7229..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/anime_blue.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/bg.png b/hosts/laptop/modules/home/raw/wp/bg.png
deleted file mode 100755
index 78436a9..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/bg.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/fuji.png b/hosts/laptop/modules/home/raw/wp/fuji.png
deleted file mode 100644
index 3c4f212..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/fuji.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/gruvbox-dark-blue.png b/hosts/laptop/modules/home/raw/wp/gruvbox-dark-blue.png
deleted file mode 100644
index fcb1f8a..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/gruvbox-dark-blue.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/hollow_knight.png b/hosts/laptop/modules/home/raw/wp/hollow_knight.png
deleted file mode 100644
index 2ee2c56..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/hollow_knight.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/ios.png b/hosts/laptop/modules/home/raw/wp/ios.png
deleted file mode 100755
index 9bd609b..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/ios.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/manga.png b/hosts/laptop/modules/home/raw/wp/manga.png
deleted file mode 100755
index 0e78feb..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/manga.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/nixos_dark.png b/hosts/laptop/modules/home/raw/wp/nixos_dark.png
deleted file mode 100644
index 879b65a..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/nixos_dark.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/orbit.png b/hosts/laptop/modules/home/raw/wp/orbit.png
deleted file mode 100644
index 8530671..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/orbit.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/skull_purple.png b/hosts/laptop/modules/home/raw/wp/skull_purple.png
deleted file mode 100644
index 284a53c..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/skull_purple.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/skulls.png b/hosts/laptop/modules/home/raw/wp/skulls.png
deleted file mode 100644
index 7d0233d..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/skulls.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/soyuz.png b/hosts/laptop/modules/home/raw/wp/soyuz.png
deleted file mode 100644
index ed594e8..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/soyuz.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/temple.png b/hosts/laptop/modules/home/raw/wp/temple.png
deleted file mode 100644
index 46da4a8..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/temple.png and /dev/null differ
diff --git a/hosts/laptop/modules/home/raw/wp/wolf.png b/hosts/laptop/modules/home/raw/wp/wolf.png
deleted file mode 100755
index cdaf39a..0000000
Binary files a/hosts/laptop/modules/home/raw/wp/wolf.png and /dev/null differ