diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix
index 9f60ae9..bb2c56c 100644
--- a/hosts/dandelion/default.nix
+++ b/hosts/dandelion/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./../../modules/core/default.dandelion.nix
+    ./../../modules/core/default.server.nix
   ];
 
   networking.hostName = "dandelion";
diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix
index df62967..2d9b649 100644
--- a/hosts/violet/default.nix
+++ b/hosts/violet/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./../../modules/core/default.violet.nix
+    ./../../modules/core/default.server.nix
     ./../../modules/services/violet.nix
   ];
 
diff --git a/modules/core/default.server.nix b/modules/core/default.server.nix
new file mode 100644
index 0000000..118f8a3
--- /dev/null
+++ b/modules/core/default.server.nix
@@ -0,0 +1,12 @@
+{ ... }:
+{
+  imports =
+       [(import ./hardware.nix)]
+    ++ [(import ./network.nix)]
+    ++ [(import ./program.nix)]
+    ++ [(import ./sshd.nix)]
+    ++ [(import ./security.nix)]
+    ++ [(import ./services.nix)]
+    ++ [(import ./system.nix)]
+    ++ [(import ./user.nix)];
+}