diff --git a/flake.nix b/flake.nix
index cb4c6e9..9330709 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
         };
 
         defaults = { lib, config, name, ... }: {
-          imports = [ ./hosts/${name}/configuration.nix ./modules/nixos/common.nix (import "${home-manager}/nixos") ];
+          imports = [ ./hosts/${name} ./hosts/common (import "${home-manager}/nixos") ];
 
           deployment = {
             targetUser = "sammy";
@@ -53,6 +53,8 @@
             inherit inputs outputs;
             pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
           };
+
+          cherrykitten.hostname = name;
         };
 
         bengal = { };
@@ -63,7 +65,7 @@
         test = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = { inherit inputs outputs; };
-          modules = [ ./modules/nixos/common.nix ./hosts/test-vm/configuration.nix (import "${home-manager}/nixos") ];
+          modules = [ ./hosts/test-vm ./hosts/common (import "${home-manager}/nixos") ];
         };
       } // colmenaHive.nodes;
 
@@ -73,7 +75,7 @@
           mkHome = { user ? "sammy", hostname ? null }:
             lib.homeManagerConfiguration {
               inherit pkgs;
-              modules = [ ./modules/home/users/${user}.nix ] ++ lib.optional (!isNull hostname) ./modules/home/hosts/${hostname}.nix;
+              modules = [ ./users/${user}.nix ] ++ lib.optional (!isNull hostname) (./. + "/users/${user}@${hostname}.nix");
               extraSpecialArgs = {
                 inherit inputs outputs;
                 pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
diff --git a/hosts/bengal/configuration.nix b/hosts/bengal/default.nix
similarity index 100%
rename from hosts/bengal/configuration.nix
rename to hosts/bengal/default.nix
diff --git a/modules/nixos/common.nix b/hosts/common/default.nix
similarity index 87%
rename from modules/nixos/common.nix
rename to hosts/common/default.nix
index 311a948..f87a032 100644
--- a/modules/nixos/common.nix
+++ b/hosts/common/default.nix
@@ -1,5 +1,10 @@
 { lib, pkgs, ... }: {
-  options.cherrykitten.common = {
+  options.cherrykitten = {
+    hostname = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+      description = "the hostname, this is already set for every host by the flake config";
+    };
     test = lib.mkOption {
       type = lib.types.str;
       default = "nya";
diff --git a/modules/nixos/graphical.nix b/hosts/common/graphical.nix
similarity index 100%
rename from modules/nixos/graphical.nix
rename to hosts/common/graphical.nix
diff --git a/modules/nixos/security.nix b/hosts/common/security.nix
similarity index 100%
rename from modules/nixos/security.nix
rename to hosts/common/security.nix
diff --git a/modules/nixos/users.nix b/hosts/common/users.nix
similarity index 76%
rename from modules/nixos/users.nix
rename to hosts/common/users.nix
index 912da2c..630e798 100644
--- a/modules/nixos/users.nix
+++ b/hosts/common/users.nix
@@ -1,6 +1,7 @@
 { pkgs, config, lib, ... }:
 let
   cfg = config.cherrykitten.users;
+  hostname = config.cherrykitten.hostname;
 in
 {
   options.cherrykitten.users = {
@@ -16,6 +17,7 @@ in
       openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZyQSZw+pExsx2RXB+yxbaJGB9mtvudbQ/BP7E1yKvr openpgp:0x6068FEBB" ];
     };
 
-    home-manager.users.sammy = lib.mkIf cfg.sammy.enable (import ../home/users/sammy.nix);
+    home-manager.users.sammy = lib.mkIf cfg.sammy.enable (import ../../users/sammy.nix)
+      // lib.mkIf (lib.pathExists (../../users + "/sammy@${hostname}.nix")) (import ../../users + "sammy@${hostname}.nix");
   };
 }
diff --git a/modules/nixos/virtualization.nix b/hosts/common/virtualization.nix
similarity index 100%
rename from modules/nixos/virtualization.nix
rename to hosts/common/virtualization.nix
diff --git a/modules/nixos/yubikey.nix b/hosts/common/yubikey.nix
similarity index 100%
rename from modules/nixos/yubikey.nix
rename to hosts/common/yubikey.nix
diff --git a/hosts/maine-coon/configuration.nix b/hosts/maine-coon/default.nix
similarity index 100%
rename from hosts/maine-coon/configuration.nix
rename to hosts/maine-coon/default.nix
diff --git a/hosts/test-vm/configuration.nix b/hosts/test-vm/default.nix
similarity index 100%
rename from hosts/test-vm/configuration.nix
rename to hosts/test-vm/default.nix
diff --git a/modules/home/default.nix b/users/common/default.nix
similarity index 100%
rename from modules/home/default.nix
rename to users/common/default.nix
diff --git a/modules/home/fish/default.nix b/users/common/fish/default.nix
similarity index 100%
rename from modules/home/fish/default.nix
rename to users/common/fish/default.nix
diff --git a/modules/home/foot.nix b/users/common/foot.nix
similarity index 100%
rename from modules/home/foot.nix
rename to users/common/foot.nix
diff --git a/modules/home/git.nix b/users/common/git.nix
similarity index 100%
rename from modules/home/git.nix
rename to users/common/git.nix
diff --git a/modules/home/nvim/default.nix b/users/common/nvim/default.nix
similarity index 100%
rename from modules/home/nvim/default.nix
rename to users/common/nvim/default.nix
diff --git a/modules/home/nvim/lua/config/autocmds.lua b/users/common/nvim/lua/config/autocmds.lua
similarity index 100%
rename from modules/home/nvim/lua/config/autocmds.lua
rename to users/common/nvim/lua/config/autocmds.lua
diff --git a/modules/home/nvim/lua/config/keymaps.lua b/users/common/nvim/lua/config/keymaps.lua
similarity index 100%
rename from modules/home/nvim/lua/config/keymaps.lua
rename to users/common/nvim/lua/config/keymaps.lua
diff --git a/modules/home/nvim/lua/config/lazy.lua b/users/common/nvim/lua/config/lazy.lua
similarity index 100%
rename from modules/home/nvim/lua/config/lazy.lua
rename to users/common/nvim/lua/config/lazy.lua
diff --git a/modules/home/nvim/lua/config/options.lua b/users/common/nvim/lua/config/options.lua
similarity index 100%
rename from modules/home/nvim/lua/config/options.lua
rename to users/common/nvim/lua/config/options.lua
diff --git a/modules/home/nvim/lua/plugins/ansible.lua b/users/common/nvim/lua/plugins/ansible.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/ansible.lua
rename to users/common/nvim/lua/plugins/ansible.lua
diff --git a/modules/home/nvim/lua/plugins/dashboard.lua b/users/common/nvim/lua/plugins/dashboard.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/dashboard.lua
rename to users/common/nvim/lua/plugins/dashboard.lua
diff --git a/modules/home/nvim/lua/plugins/example.lua b/users/common/nvim/lua/plugins/example.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/example.lua
rename to users/common/nvim/lua/plugins/example.lua
diff --git a/modules/home/nvim/lua/plugins/lsp.lua b/users/common/nvim/lua/plugins/lsp.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/lsp.lua
rename to users/common/nvim/lua/plugins/lsp.lua
diff --git a/modules/home/ssh.nix b/users/common/ssh.nix
similarity index 100%
rename from modules/home/ssh.nix
rename to users/common/ssh.nix
diff --git a/modules/home/starship.nix b/users/common/starship.nix
similarity index 100%
rename from modules/home/starship.nix
rename to users/common/starship.nix
diff --git a/modules/home/tmux.nix b/users/common/tmux.nix
similarity index 100%
rename from modules/home/tmux.nix
rename to users/common/tmux.nix
diff --git a/modules/home/users/sammy.nix b/users/sammy.nix
similarity index 92%
rename from modules/home/users/sammy.nix
rename to users/sammy.nix
index 6864e93..186699c 100644
--- a/modules/home/users/sammy.nix
+++ b/users/sammy.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  imports = [ ../default.nix ];
+  imports = [ ./common ];
 
   programs.git = {
     userName = "CherryKitten";
diff --git a/modules/home/hosts/chansey.nix b/users/sammy@chansey.nix
similarity index 100%
rename from modules/home/hosts/chansey.nix
rename to users/sammy@chansey.nix