diff --git a/flake.nix b/flake.nix
index b4f9fe7..27c13a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,8 @@
 
       imports = [
         ./flake/hosts.nix
-        ./flake/devShells.nix
+        ./flake/modules.nix
+        ./flake/dev-shells.nix
         ./flake/formatter.nix
       ];
     };
diff --git a/flake/devShells.nix b/flake/dev-shells.nix
similarity index 95%
rename from flake/devShells.nix
rename to flake/dev-shells.nix
index d78f79b..14c1fca 100644
--- a/flake/devShells.nix
+++ b/flake/dev-shells.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   perSystem =
     { pkgs, ... }:
diff --git a/flake/modules.nix b/flake/modules.nix
new file mode 100644
index 0000000..2a39f89
--- /dev/null
+++ b/flake/modules.nix
@@ -0,0 +1,10 @@
+{ self, ... }:
+let
+  modulesOf = dir: map (name: "${dir}/${name}") (builtins.attrNames (builtins.readDir dir));
+in
+{
+  flake.nixosModules = {
+    nixos.imports = modulesOf "${self}/modules/nixos";
+    home-manager.imports = modulesOf "${self}/modules/home-manager";
+  };
+}
diff --git a/hosts/common.nix b/hosts/common.nix
index be88cd1..cf0c3dd 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 {
   imports = [
-    ../modules/nixos
+    self.nixosModules.nixos
     ../wrappers
   ];
 
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
deleted file mode 100644
index 538fbee..0000000
--- a/modules/home-manager/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./hyprland
-    ./theme.nix
-    ./vscode.nix
-    ./shell
-    ./git.nix
-    ./equalizer
-    ./sops.nix
-    ./night-light.nix
-    ./virtualisation.nix
-    ./flatpak.nix
-  ];
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index ae45ac6..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  imports = [
-    ./flatpak.nix
-    ./virtualisation.nix
-    ./wlan.nix
-    ./comma.nix
-    ./sops.nix
-    ./bluetooth.nix
-    ./de.nix
-    ./dm.nix
-    ./sound.nix
-    ./boot.nix
-    ./printing.nix
-    ./syncthing.nix
-    ./nix-helper.nix
-    ./auto-gc.nix
-    ./geoclue.nix
-    ./tailscale.nix
-  ];
-}
diff --git a/users/common.nix b/users/common.nix
index ecd977c..2334cb5 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -11,7 +11,7 @@
   };
 
   home-manager.sharedModules = [
-    ../modules/home-manager
+    self.nixosModules.home-manager
     ../wrappers
 
     {