diff --git a/hosts/Earthmover/default.nix b/hosts/Earthmover/default.nix
index e814c60..fd6479d 100755
--- a/hosts/Earthmover/default.nix
+++ b/hosts/Earthmover/default.nix
@@ -9,8 +9,10 @@
     ../../modules/nixos/programs/desktop/niri
     ../../modules/nixos/programs/desktop/niri/niri/window-rules/dual-monitor.nix
     ../../modules/nixos/programs/desktop/niri/niri/workspaces/dual-monitor.nix
+    ../../modules/nixos/programs/gaming.nix
 
-    ../../modules/nixos/services
+    ../../modules/nixos/services/tailscale
+    ../../modules/nixos/services/mumble.nix
 
     ../../modules/nixos/system/colors.nix
     ../../modules/nixos/system/console-colors.nix
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100755
index 512b6bf..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ./programs
-    ./services
-    ./system
-  ];
-}
\ No newline at end of file
diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix
deleted file mode 100644
index a9225eb..0000000
--- a/modules/nixos/programs/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ./bash.nix
-    ./gaming.nix
-    ./git.nix
-  ];
-}
\ No newline at end of file
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix
deleted file mode 100644
index 33e9e5d..0000000
--- a/modules/nixos/services/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ./tailscale
-    ./mumble.nix
-  ];
-}
\ No newline at end of file
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
deleted file mode 100644
index 5b84704..0000000
--- a/modules/nixos/system/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ./colors.nix
-    ./console-colors.nix
-    ./desktop.nix
-    ./fonts.nix
-    ./home-manager.nix
-    ./laptop.nix
-    ./scx.nix
-    ./swap.nix
-    ./yubikey.nix
-    ./zswap.nix
-  ];
-}
\ No newline at end of file