diff --git a/hosts/default.nix b/hosts/default.nix
index 257e16b..6ef58aa 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -11,7 +11,7 @@
     };
 
   base = [
-    ../shared/nixosModules
+    ../modules
     "${self}/config/nixos"
     "${self}/config/nixos/core/home-manager.nix"
 
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..aa9aa72
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./style
+    ./options
+  ];
+}
diff --git a/shared/nixosModules/default.nix b/modules/options/default.nix
similarity index 79%
rename from shared/nixosModules/default.nix
rename to modules/options/default.nix
index 8286746..816a12e 100644
--- a/shared/nixosModules/default.nix
+++ b/modules/options/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
-    ./systemVars.nix
     ./homeVars.nix
-    ./style
+    ./style.nix
+    ./systemVars.nix
   ];
 }
diff --git a/shared/nixosModules/homeVars.nix b/modules/options/homeVars.nix
similarity index 100%
rename from shared/nixosModules/homeVars.nix
rename to modules/options/homeVars.nix
diff --git a/shared/nixosModules/style/options.nix b/modules/options/style.nix
similarity index 98%
rename from shared/nixosModules/style/options.nix
rename to modules/options/style.nix
index 5160be3..63a9a09 100644
--- a/shared/nixosModules/style/options.nix
+++ b/modules/options/style.nix
@@ -67,7 +67,7 @@ in {
       description = ''
         Path to an avatar image (used for hyprlock).
       '';
-      default = ../../../assets/avatar.png; # TODO silly, change this
+      default = ../../assets/avatar.png; # TODO silly, change this
     };
 
     gtk = {
diff --git a/shared/nixosModules/systemVars.nix b/modules/options/systemVars.nix
similarity index 100%
rename from shared/nixosModules/systemVars.nix
rename to modules/options/systemVars.nix
diff --git a/modules/style/default.nix b/modules/style/default.nix
new file mode 100644
index 0000000..bce44b0
--- /dev/null
+++ b/modules/style/default.nix
@@ -0,0 +1,29 @@
+{
+  inputs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = config.local.style;
+in {
+  imports =
+    [
+      inputs.niri.nixosModules.niri
+      inputs.hyprland.nixosModules.default
+    ]
+    ++ lib.filesystem.listFilesRecursive ./modules;
+
+  config = mkIf cfg.enable {
+    home-manager.sharedModules = [
+      {
+        home.pointerCursor = {
+          inherit (cfg.cursorTheme) name package size;
+          x11.enable = true;
+          gtk.enable = true;
+        };
+      }
+    ];
+  };
+}
diff --git a/shared/nixosModules/style/modules/discord.nix b/modules/style/modules/discord.nix
similarity index 100%
rename from shared/nixosModules/style/modules/discord.nix
rename to modules/style/modules/discord.nix
diff --git a/shared/nixosModules/style/modules/fish.nix b/modules/style/modules/fish.nix
similarity index 100%
rename from shared/nixosModules/style/modules/fish.nix
rename to modules/style/modules/fish.nix
diff --git a/shared/nixosModules/style/modules/foot.nix b/modules/style/modules/foot.nix
similarity index 100%
rename from shared/nixosModules/style/modules/foot.nix
rename to modules/style/modules/foot.nix
diff --git a/shared/nixosModules/style/modules/fuzzel.nix b/modules/style/modules/fuzzel.nix
similarity index 100%
rename from shared/nixosModules/style/modules/fuzzel.nix
rename to modules/style/modules/fuzzel.nix
diff --git a/shared/nixosModules/style/modules/gtk.nix b/modules/style/modules/gtk.nix
similarity index 100%
rename from shared/nixosModules/style/modules/gtk.nix
rename to modules/style/modules/gtk.nix
diff --git a/shared/nixosModules/style/modules/hyprland.nix b/modules/style/modules/hyprland.nix
similarity index 100%
rename from shared/nixosModules/style/modules/hyprland.nix
rename to modules/style/modules/hyprland.nix
diff --git a/shared/nixosModules/style/modules/hyprlock.nix b/modules/style/modules/hyprlock.nix
similarity index 100%
rename from shared/nixosModules/style/modules/hyprlock.nix
rename to modules/style/modules/hyprlock.nix
diff --git a/shared/nixosModules/style/modules/niri.nix b/modules/style/modules/niri.nix
similarity index 100%
rename from shared/nixosModules/style/modules/niri.nix
rename to modules/style/modules/niri.nix
diff --git a/shared/nixosModules/style/modules/nvf.nix b/modules/style/modules/nvf.nix
similarity index 100%
rename from shared/nixosModules/style/modules/nvf.nix
rename to modules/style/modules/nvf.nix
diff --git a/shared/nixosModules/style/modules/regreet.nix b/modules/style/modules/regreet.nix
similarity index 100%
rename from shared/nixosModules/style/modules/regreet.nix
rename to modules/style/modules/regreet.nix
diff --git a/shared/nixosModules/style/modules/starship.nix b/modules/style/modules/starship.nix
similarity index 100%
rename from shared/nixosModules/style/modules/starship.nix
rename to modules/style/modules/starship.nix
diff --git a/shared/nixosModules/style/modules/swaylock.nix b/modules/style/modules/swaylock.nix
similarity index 100%
rename from shared/nixosModules/style/modules/swaylock.nix
rename to modules/style/modules/swaylock.nix
diff --git a/shared/nixosModules/style/modules/swaync.nix b/modules/style/modules/swaync.nix
similarity index 100%
rename from shared/nixosModules/style/modules/swaync.nix
rename to modules/style/modules/swaync.nix
diff --git a/shared/nixosModules/style/modules/tidal-hifi.nix b/modules/style/modules/tidal-hifi.nix
similarity index 100%
rename from shared/nixosModules/style/modules/tidal-hifi.nix
rename to modules/style/modules/tidal-hifi.nix
diff --git a/shared/nixosModules/style/modules/walker.nix b/modules/style/modules/walker.nix
similarity index 100%
rename from shared/nixosModules/style/modules/walker.nix
rename to modules/style/modules/walker.nix
diff --git a/shared/nixosModules/style/modules/waybar.nix b/modules/style/modules/waybar.nix
similarity index 100%
rename from shared/nixosModules/style/modules/waybar.nix
rename to modules/style/modules/waybar.nix
diff --git a/shared/nixosModules/style/modules/zathura.nix b/modules/style/modules/zathura.nix
similarity index 100%
rename from shared/nixosModules/style/modules/zathura.nix
rename to modules/style/modules/zathura.nix
diff --git a/shared/nixosModules/style/default.nix b/shared/nixosModules/style/default.nix
deleted file mode 100644
index b45a5a2..0000000
--- a/shared/nixosModules/style/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf;
-
-  cfg = config.local.style;
-in {
-  imports =
-    [
-      inputs.niri.nixosModules.niri
-      inputs.hyprland.nixosModules.default
-
-      ./options.nix
-    ]
-    ++ lib.filesystem.listFilesRecursive ./modules;
-
-  config =
-    mkIf
-    cfg.enable
-    {
-      home-manager.sharedModules = [
-        {
-          home.pointerCursor = {
-            inherit (cfg.cursorTheme) name package size;
-            x11.enable = true;
-            gtk.enable = true;
-          };
-        }
-      ];
-    };
-}