diff --git a/flake.nix b/flake.nix
index afe871f..fc82176 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,7 +89,7 @@
         )
         inputs.plasma-manager.homeManagerModules.plasma-manager
         inputs.sops-nix.homeManagerModules.sops
-        ./home/jonas/home.nix
+        ./home/jonas.nix
       ];
 
       # Optionally use extraSpecialArgs
diff --git a/home/jonas/home.nix b/home/jonas.nix
similarity index 85%
rename from home/jonas/home.nix
rename to home/jonas.nix
index 06ac32a..bbcebe3 100644
--- a/home/jonas/home.nix
+++ b/home/jonas.nix
@@ -4,21 +4,21 @@
   ...
 }: rec {
   imports = [
-    ./borg.nix
-    ./doom.nix
-    ./dunst
-    ./firefox.nix
-    ./hyprland
-    ./kitty
-    ./ranger
-    ./ssh.nix
-    ./themes/gtk
-    ./themes/qt
-    ./waybar
-    ./wlogout
-    ./wofi
-    ./yubikey.nix
-    ./zsh.nix
+    ../modules/home/borg.nix
+    ../modules/home/doom
+    ../modules/home/dunst
+    ../modules/home/firefox.nix
+    ../modules/home/hyprland
+    ../modules/home/kitty
+    ../modules/home/ranger
+    ../modules/home/ssh.nix
+    ../modules/home/themes/gtk
+    ../modules/home/themes/qt
+    ../modules/home/waybar
+    ../modules/home/wlogout
+    ../modules/home/wofi
+    ../modules/home/yubikey.nix
+    ../modules/home/zsh
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
diff --git a/hosts/wsl/configuration.nix b/hosts/wsl/configuration.nix
new file mode 100644
index 0000000..e69de29
diff --git a/home/jonas/borg.nix b/modules/home/borg.nix
similarity index 100%
rename from home/jonas/borg.nix
rename to modules/home/borg.nix
diff --git a/modules/home/doom/default.nix b/modules/home/doom/default.nix
new file mode 100644
index 0000000..1b689b6
--- /dev/null
+++ b/modules/home/doom/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./doom.nix
+  ];
+}
diff --git a/home/jonas/doom.nix b/modules/home/doom/doom.nix
similarity index 93%
rename from home/jonas/doom.nix
rename to modules/home/doom/doom.nix
index b051314..94bc6be 100644
--- a/home/jonas/doom.nix
+++ b/modules/home/doom/doom.nix
@@ -111,17 +111,17 @@ in {
     enable = true;
     configFile = {
       "doom-config/splash.png" = {
-        source = ./static/doom-config/splash.png;
+        source = ./static/splash.png;
       };
       "doom-config/config.el" = {
-        source = ./static/doom-config/config.el;
+        source = ./static/config.el;
       };
       "doom-config/init.el" = {
-        source = ./static/doom-config/init.el;
+        source = ./static/init.el;
         onChange = "${doom-setup} sync --force -e";
       };
       "doom-config/packages.el" = {
-        source = ./static/doom-config/packages.el;
+        source = ./static/packages.el;
         onChange = "${doom-setup} sync --force -u -e";
       };
       "doom-emacs" = {
@@ -136,7 +136,7 @@ in {
       emacs = {
         name = "Doom Emacs";
         genericName = "Text Editor";
-        icon = ./static/doom-config/icon.png;
+        icon = ./static/icon.png;
         exec = "${wrapped-emacs}/bin/emacs %F";
         terminal = false;
         categories = ["Application" "Development" "TextEditor"];
@@ -148,7 +148,7 @@ in {
       emacsclient = {
         name = "Doom Emacs (Client)";
         genericName = "Text Editor";
-        icon = ./static/doom-config/icon.png;
+        icon = ./static/icon.png;
         exec = ''
           sh -c "if [ -n \\"\\$*\\" ]; then exec ${wrapped-emacs}/bin/emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" \\"\\$@\\"; else exec emacsclient --alternate-editor= --create-frame; fi" sh %F
         '';
diff --git a/home/jonas/static/doom-config/config.el b/modules/home/doom/static/config.el
similarity index 100%
rename from home/jonas/static/doom-config/config.el
rename to modules/home/doom/static/config.el
diff --git a/home/jonas/static/doom-config/icon.png b/modules/home/doom/static/icon.png
similarity index 100%
rename from home/jonas/static/doom-config/icon.png
rename to modules/home/doom/static/icon.png
diff --git a/home/jonas/static/doom-config/init.el b/modules/home/doom/static/init.el
similarity index 100%
rename from home/jonas/static/doom-config/init.el
rename to modules/home/doom/static/init.el
diff --git a/home/jonas/static/doom-config/packages.el b/modules/home/doom/static/packages.el
similarity index 100%
rename from home/jonas/static/doom-config/packages.el
rename to modules/home/doom/static/packages.el
diff --git a/home/jonas/static/doom-config/splash.png b/modules/home/doom/static/splash.png
similarity index 100%
rename from home/jonas/static/doom-config/splash.png
rename to modules/home/doom/static/splash.png
diff --git a/home/jonas/dunst/config.nix b/modules/home/dunst/config.nix
similarity index 100%
rename from home/jonas/dunst/config.nix
rename to modules/home/dunst/config.nix
diff --git a/home/jonas/dunst/default.nix b/modules/home/dunst/default.nix
similarity index 100%
rename from home/jonas/dunst/default.nix
rename to modules/home/dunst/default.nix
diff --git a/home/jonas/dunst/dunst.nix b/modules/home/dunst/dunst.nix
similarity index 100%
rename from home/jonas/dunst/dunst.nix
rename to modules/home/dunst/dunst.nix
diff --git a/home/jonas/firefox.nix b/modules/home/firefox.nix
similarity index 100%
rename from home/jonas/firefox.nix
rename to modules/home/firefox.nix
diff --git a/home/jonas/hyprland/config.nix b/modules/home/hyprland/config.nix
similarity index 100%
rename from home/jonas/hyprland/config.nix
rename to modules/home/hyprland/config.nix
diff --git a/home/jonas/hyprland/default.nix b/modules/home/hyprland/default.nix
similarity index 100%
rename from home/jonas/hyprland/default.nix
rename to modules/home/hyprland/default.nix
diff --git a/home/jonas/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix
similarity index 84%
rename from home/jonas/hyprland/hyprland.nix
rename to modules/home/hyprland/hyprland.nix
index 9ff2cdb..d3e3030 100644
--- a/home/jonas/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }: {
@@ -17,7 +16,7 @@
     enable = true;
     settings = {
       default = {
-        path = ../static/wallpaper/stones.jpg;
+        path = ../../../static/wallpaper/stones.jpg;
       };
     };
   };
diff --git a/home/jonas/kitty/config.nix b/modules/home/kitty/config.nix
similarity index 97%
rename from home/jonas/kitty/config.nix
rename to modules/home/kitty/config.nix
index 4bc583a..09d7ae1 100644
--- a/home/jonas/kitty/config.nix
+++ b/modules/home/kitty/config.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }: {
diff --git a/home/jonas/kitty/default.nix b/modules/home/kitty/default.nix
similarity index 100%
rename from home/jonas/kitty/default.nix
rename to modules/home/kitty/default.nix
diff --git a/home/jonas/kitty/kitty.nix b/modules/home/kitty/kitty.nix
similarity index 72%
rename from home/jonas/kitty/kitty.nix
rename to modules/home/kitty/kitty.nix
index e68353c..2a12133 100644
--- a/home/jonas/kitty/kitty.nix
+++ b/modules/home/kitty/kitty.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  pkgs,
   ...
 }: {
   programs.kitty.enable = true;
diff --git a/home/jonas/mqtt-explorer/default.nix b/modules/home/mqtt-explorer/default.nix
similarity index 100%
rename from home/jonas/mqtt-explorer/default.nix
rename to modules/home/mqtt-explorer/default.nix
diff --git a/home/jonas/mqtt-explorer/mqtt-explorer.nix b/modules/home/mqtt-explorer/mqtt-explorer.nix
similarity index 100%
rename from home/jonas/mqtt-explorer/mqtt-explorer.nix
rename to modules/home/mqtt-explorer/mqtt-explorer.nix
diff --git a/home/jonas/plasma.nix b/modules/home/plasma.nix
similarity index 100%
rename from home/jonas/plasma.nix
rename to modules/home/plasma.nix
diff --git a/home/jonas/ranger/config.nix b/modules/home/ranger/config.nix
similarity index 100%
rename from home/jonas/ranger/config.nix
rename to modules/home/ranger/config.nix
diff --git a/home/jonas/ranger/default.nix b/modules/home/ranger/default.nix
similarity index 100%
rename from home/jonas/ranger/default.nix
rename to modules/home/ranger/default.nix
diff --git a/home/jonas/ranger/ranger.nix b/modules/home/ranger/ranger.nix
similarity index 100%
rename from home/jonas/ranger/ranger.nix
rename to modules/home/ranger/ranger.nix
diff --git a/home/jonas/rofi/config.nix b/modules/home/rofi/config.nix
similarity index 100%
rename from home/jonas/rofi/config.nix
rename to modules/home/rofi/config.nix
diff --git a/home/jonas/rofi/default.nix b/modules/home/rofi/default.nix
similarity index 100%
rename from home/jonas/rofi/default.nix
rename to modules/home/rofi/default.nix
diff --git a/home/jonas/rofi/rofi.nix b/modules/home/rofi/rofi.nix
similarity index 100%
rename from home/jonas/rofi/rofi.nix
rename to modules/home/rofi/rofi.nix
diff --git a/home/jonas/ssh.nix b/modules/home/ssh.nix
similarity index 98%
rename from home/jonas/ssh.nix
rename to modules/home/ssh.nix
index 423f855..66dd692 100644
--- a/home/jonas/ssh.nix
+++ b/modules/home/ssh.nix
@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   ...
 }: let
   sshKeys = name: {
diff --git a/home/jonas/themes/gtk/config.nix b/modules/home/themes/gtk/config.nix
similarity index 100%
rename from home/jonas/themes/gtk/config.nix
rename to modules/home/themes/gtk/config.nix
diff --git a/home/jonas/themes/gtk/default.nix b/modules/home/themes/gtk/default.nix
similarity index 100%
rename from home/jonas/themes/gtk/default.nix
rename to modules/home/themes/gtk/default.nix
diff --git a/home/jonas/themes/gtk/gtk.nix b/modules/home/themes/gtk/gtk.nix
similarity index 100%
rename from home/jonas/themes/gtk/gtk.nix
rename to modules/home/themes/gtk/gtk.nix
diff --git a/home/jonas/themes/qt/config.nix b/modules/home/themes/qt/config.nix
similarity index 100%
rename from home/jonas/themes/qt/config.nix
rename to modules/home/themes/qt/config.nix
diff --git a/home/jonas/themes/qt/default.nix b/modules/home/themes/qt/default.nix
similarity index 100%
rename from home/jonas/themes/qt/default.nix
rename to modules/home/themes/qt/default.nix
diff --git a/home/jonas/themes/qt/qt.nix b/modules/home/themes/qt/qt.nix
similarity index 100%
rename from home/jonas/themes/qt/qt.nix
rename to modules/home/themes/qt/qt.nix
diff --git a/home/jonas/waybar/config.nix b/modules/home/waybar/config.nix
similarity index 100%
rename from home/jonas/waybar/config.nix
rename to modules/home/waybar/config.nix
diff --git a/home/jonas/waybar/default.nix b/modules/home/waybar/default.nix
similarity index 100%
rename from home/jonas/waybar/default.nix
rename to modules/home/waybar/default.nix
diff --git a/home/jonas/waybar/waybar.nix b/modules/home/waybar/waybar.nix
similarity index 100%
rename from home/jonas/waybar/waybar.nix
rename to modules/home/waybar/waybar.nix
diff --git a/home/jonas/wlogout/default.nix b/modules/home/wlogout/default.nix
similarity index 100%
rename from home/jonas/wlogout/default.nix
rename to modules/home/wlogout/default.nix
diff --git a/home/jonas/wlogout/wlogout.nix b/modules/home/wlogout/wlogout.nix
similarity index 100%
rename from home/jonas/wlogout/wlogout.nix
rename to modules/home/wlogout/wlogout.nix
diff --git a/home/jonas/wofi/config.nix b/modules/home/wofi/config.nix
similarity index 100%
rename from home/jonas/wofi/config.nix
rename to modules/home/wofi/config.nix
diff --git a/home/jonas/wofi/default.nix b/modules/home/wofi/default.nix
similarity index 100%
rename from home/jonas/wofi/default.nix
rename to modules/home/wofi/default.nix
diff --git a/home/jonas/wofi/wofi.nix b/modules/home/wofi/wofi.nix
similarity index 100%
rename from home/jonas/wofi/wofi.nix
rename to modules/home/wofi/wofi.nix
diff --git a/home/jonas/yubikey.nix b/modules/home/yubikey.nix
similarity index 91%
rename from home/jonas/yubikey.nix
rename to modules/home/yubikey.nix
index fa6a40d..7d6ad86 100644
--- a/home/jonas/yubikey.nix
+++ b/modules/home/yubikey.nix
@@ -9,7 +9,7 @@
     mutableTrust = false;
     publicKeys = [
       {
-        source = ./static/keys/my_pub.asc;
+        source = ../../static/keys/my_pub.asc;
         trust = "ultimate";
       }
     ];
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
new file mode 100644
index 0000000..4ca7d3e
--- /dev/null
+++ b/modules/home/zsh/default.nix
@@ -0,0 +1,7 @@
+{
+  ...
+}: {
+  imports = [
+    ./zsh.nix
+  ];
+}
diff --git a/home/jonas/static/omz_custom/themes/my_bureau.zsh-theme b/modules/home/zsh/static/omz_custom/themes/my_bureau.zsh-theme
similarity index 100%
rename from home/jonas/static/omz_custom/themes/my_bureau.zsh-theme
rename to modules/home/zsh/static/omz_custom/themes/my_bureau.zsh-theme
diff --git a/home/jonas/zsh.nix b/modules/home/zsh/zsh.nix
similarity index 99%
rename from home/jonas/zsh.nix
rename to modules/home/zsh/zsh.nix
index 85e2bd3..66e407f 100644
--- a/home/jonas/zsh.nix
+++ b/modules/home/zsh/zsh.nix
@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   ...
 }: let
   omz_custom = "${config.home.homeDirectory}/.config/omz_custom";
diff --git a/home/jonas/static/keys/my_pub.asc b/static/keys/my_pub.asc
similarity index 100%
rename from home/jonas/static/keys/my_pub.asc
rename to static/keys/my_pub.asc
diff --git a/home/jonas/static/wallpaper/nord.png b/static/wallpaper/nord.png
similarity index 100%
rename from home/jonas/static/wallpaper/nord.png
rename to static/wallpaper/nord.png
diff --git a/home/jonas/static/wallpaper/stones.jpg b/static/wallpaper/stones.jpg
similarity index 100%
rename from home/jonas/static/wallpaper/stones.jpg
rename to static/wallpaper/stones.jpg