diff --git a/hosts/common/cifs-client.nix b/common/cifs-client.nix
similarity index 100%
rename from hosts/common/cifs-client.nix
rename to common/cifs-client.nix
diff --git a/hosts/common/compute-node.nix b/common/compute-node.nix
similarity index 100%
rename from hosts/common/compute-node.nix
rename to common/compute-node.nix
diff --git a/hosts/common/consul.nix b/common/consul.nix
similarity index 100%
rename from hosts/common/consul.nix
rename to common/consul.nix
diff --git a/hosts/common/global/cpufreq.nix b/common/global/cpufreq.nix
similarity index 100%
rename from hosts/common/global/cpufreq.nix
rename to common/global/cpufreq.nix
diff --git a/hosts/common/global/default.nix b/common/global/default.nix
similarity index 100%
rename from hosts/common/global/default.nix
rename to common/global/default.nix
diff --git a/hosts/common/global/flakes.nix b/common/global/flakes.nix
similarity index 100%
rename from hosts/common/global/flakes.nix
rename to common/global/flakes.nix
diff --git a/hosts/common/global/locale.nix b/common/global/locale.nix
similarity index 100%
rename from hosts/common/global/locale.nix
rename to common/global/locale.nix
diff --git a/hosts/common/global/network.nix b/common/global/network.nix
similarity index 100%
rename from hosts/common/global/network.nix
rename to common/global/network.nix
diff --git a/hosts/common/global/nix.nix b/common/global/nix.nix
similarity index 100%
rename from hosts/common/global/nix.nix
rename to common/global/nix.nix
diff --git a/hosts/common/global/packages.nix b/common/global/packages.nix
similarity index 100%
rename from hosts/common/global/packages.nix
rename to common/global/packages.nix
diff --git a/hosts/common/global/sudo.nix b/common/global/sudo.nix
similarity index 100%
rename from hosts/common/global/sudo.nix
rename to common/global/sudo.nix
diff --git a/hosts/common/global/tailscale.nix b/common/global/tailscale.nix
similarity index 100%
rename from hosts/common/global/tailscale.nix
rename to common/global/tailscale.nix
diff --git a/hosts/common/global/tailscale_lib.nix b/common/global/tailscale_lib.nix
similarity index 100%
rename from hosts/common/global/tailscale_lib.nix
rename to common/global/tailscale_lib.nix
diff --git a/hosts/common/glusterfs-client.nix b/common/glusterfs-client.nix
similarity index 100%
rename from hosts/common/glusterfs-client.nix
rename to common/glusterfs-client.nix
diff --git a/hosts/common/glusterfs.nix b/common/glusterfs.nix
similarity index 100%
rename from hosts/common/glusterfs.nix
rename to common/glusterfs.nix
diff --git a/hosts/common/impermanence.nix b/common/impermanence.nix
similarity index 100%
rename from hosts/common/impermanence.nix
rename to common/impermanence.nix
diff --git a/hosts/common/nomad.nix b/common/nomad.nix
similarity index 100%
rename from hosts/common/nomad.nix
rename to common/nomad.nix
diff --git a/hosts/common/sshd.nix b/common/sshd.nix
similarity index 100%
rename from hosts/common/sshd.nix
rename to common/sshd.nix
diff --git a/hosts/common/systemd-boot.nix b/common/systemd-boot.nix
similarity index 100%
rename from hosts/common/systemd-boot.nix
rename to common/systemd-boot.nix
diff --git a/hosts/common/unattended-encryption.nix b/common/unattended-encryption.nix
similarity index 100%
rename from hosts/common/unattended-encryption.nix
rename to common/unattended-encryption.nix
diff --git a/hosts/common/user-node.nix b/common/user-node.nix
similarity index 100%
rename from hosts/common/user-node.nix
rename to common/user-node.nix
diff --git a/hosts/common/user-ppetru.nix b/common/user-ppetru.nix
similarity index 100%
rename from hosts/common/user-ppetru.nix
rename to common/user-ppetru.nix
diff --git a/hosts/c1/default.nix b/hosts/c1/default.nix
index 76113f1..d06868f 100644
--- a/hosts/c1/default.nix
+++ b/hosts/c1/default.nix
@@ -1,8 +1,8 @@
 { pkgs, inputs, ... }:
 {
   imports = [ 
-    ../common/global
-    ../common/compute-node.nix
+    ../../common/global
+    ../../common/compute-node.nix
     ./hardware.nix
   ];
 
diff --git a/hosts/c2/default.nix b/hosts/c2/default.nix
index df4c9e4..ab795cf 100644
--- a/hosts/c2/default.nix
+++ b/hosts/c2/default.nix
@@ -1,8 +1,8 @@
 { pkgs, inputs, ... }:
 {
   imports = [ 
-    ../common/global
-    ../common/compute-node.nix
+    ../../common/global
+    ../../common/compute-node.nix
     ./hardware.nix
   ];
 
diff --git a/hosts/c3/default.nix b/hosts/c3/default.nix
index 86756e7..2c0f4c2 100644
--- a/hosts/c3/default.nix
+++ b/hosts/c3/default.nix
@@ -1,8 +1,8 @@
 { pkgs, inputs, ... }:
 {
   imports = [ 
-    ../common/global
-    ../common/compute-node.nix
+    ../../common/global
+    ../../common/compute-node.nix
     ./hardware.nix
   ];
 
diff --git a/hosts/nix-dev/default.nix b/hosts/nix-dev/default.nix
index df4735e..90dc167 100644
--- a/hosts/nix-dev/default.nix
+++ b/hosts/nix-dev/default.nix
@@ -1,8 +1,8 @@
 { pkgs, inputs, ... }:
 {
   imports = [
-    ../common/global
-    ../common/user-node.nix
+    ../../common/global
+    ../../common/user-node.nix
     ./hardware.nix
   ];