diff --git a/common/default.nix b/common/default.nix
new file mode 100644
index 0000000..31657ff
--- /dev/null
+++ b/common/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./users
+    ./environment.nix
+    ./nginx.nix
+    ./openssh.nix
+    ./security.nix
+  ];
+}
\ No newline at end of file
diff --git a/common/utilities.nix b/common/environment.nix
similarity index 100%
rename from common/utilities.nix
rename to common/environment.nix
diff --git a/common/ssh.nix b/common/openssh.nix
similarity index 100%
rename from common/ssh.nix
rename to common/openssh.nix
diff --git a/common/sudo.nix b/common/security.nix
similarity index 100%
rename from common/sudo.nix
rename to common/security.nix
diff --git a/hive.nix b/hive.nix
index e930b29..33432d7 100644
--- a/hive.nix
+++ b/hive.nix
@@ -24,11 +24,7 @@ in {
       (import "${sources.home-manager}/nixos")
       (import "${sources.agenix}/modules/age.nix")
       ./pinning.nix
-      ./common/nginx.nix
-      ./common/ssh.nix
-      ./common/sudo.nix
-      ./common/utilities.nix
-      ./common/users
+      ./common
     ];
   };
 
diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 47e8232..3e7dbed 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -5,8 +5,8 @@
     [
       ./hardware-configuration.nix
       ./home.nix
-      ../../common/fonts.nix
-      ../../common/steam.nix
+      ../../services/fonts.nix
+      ../../services/steam.nix
       ./syncthing.nix
     ];
 
diff --git a/common/fonts.nix b/services/fonts.nix
similarity index 100%
rename from common/fonts.nix
rename to services/fonts.nix
diff --git a/common/steam.nix b/services/steam.nix
similarity index 100%
rename from common/steam.nix
rename to services/steam.nix