diff --git a/default.nix b/default.nix
index cf763c3..7edb161 100644
--- a/default.nix
+++ b/default.nix
@@ -1,23 +1,23 @@
 {
   # General
-  common = import ./common;
-  desktop = import ./desktop;
-  server = import ./server.nix;
+  common = import ./nixos/common;
+  desktop = import ./nixos/desktop;
+  server = import ./nixos/server;
 
   # Hardware
-  hardware-amazon = import ./hardware/amazon;
-  hardware-hetzner-cloud = import ./hardware/hetzner-cloud;
-  hardware-hetzner-online-amd = import ./hardware/hetzner-online/amd.nix;
-  hardware-hetzner-online-intel = import ./hardware/hetzner-online/intel.nix;
+  hardware-amazon = import ./nixos/hardware/amazon;
+  hardware-hetzner-cloud = import ./nixos/hardware/hetzner-cloud;
+  hardware-hetzner-online-amd = import ./nixos/hardware/hetzner-online/amd.nix;
+  hardware-hetzner-online-intel = import ./nixos/hardware/hetzner-online/intel.nix;
 
   # Mixins
-  mixins-cloud-init = import ./mixins/cloud-init.nix;
-  mixins-nginx = import ./mixins/nginx.nix;
-  mixins-systemd-boot = import ./mixins/systemd-boot.nix;
-  mixins-telegraf = import ./mixins/telegraf.nix;
-  mixins-terminfo = import ./mixins/terminfo.nix;
-  mixins-trusted-nix-caches = import ./mixins/trusted-nix-caches.nix;
+  mixins-cloud-init = import ./nixos/mixins/cloud-init.nix;
+  mixins-nginx = import ./nixos/mixins/nginx.nix;
+  mixins-systemd-boot = import ./nixos/mixins/systemd-boot.nix;
+  mixins-telegraf = import ./nixos/mixins/telegraf.nix;
+  mixins-terminfo = import ./nixos/mixins/terminfo.nix;
+  mixins-trusted-nix-caches = import ./nixos/mixins/trusted-nix-caches.nix;
 
   # Roles
-  roles-github-actions-runner = import ./roles/github-actions-runner.nix;
+  roles-github-actions-runner = import ./nixos/roles/github-actions-runner.nix;
 }
diff --git a/common/default.nix b/nixos/common/default.nix
similarity index 100%
rename from common/default.nix
rename to nixos/common/default.nix
diff --git a/common/flake.nix b/nixos/common/flake.nix
similarity index 100%
rename from common/flake.nix
rename to nixos/common/flake.nix
diff --git a/common/mdmonitor-fix.nix b/nixos/common/mdmonitor-fix.nix
similarity index 100%
rename from common/mdmonitor-fix.nix
rename to nixos/common/mdmonitor-fix.nix
diff --git a/common/networking.nix b/nixos/common/networking.nix
similarity index 100%
rename from common/networking.nix
rename to nixos/common/networking.nix
diff --git a/common/nix.nix b/nixos/common/nix.nix
similarity index 100%
rename from common/nix.nix
rename to nixos/common/nix.nix
diff --git a/common/openssh.nix b/nixos/common/openssh.nix
similarity index 100%
rename from common/openssh.nix
rename to nixos/common/openssh.nix
diff --git a/common/serial.nix b/nixos/common/serial.nix
similarity index 100%
rename from common/serial.nix
rename to nixos/common/serial.nix
diff --git a/common/upgrade-diff.nix b/nixos/common/upgrade-diff.nix
similarity index 100%
rename from common/upgrade-diff.nix
rename to nixos/common/upgrade-diff.nix
diff --git a/common/well-known-hosts.nix b/nixos/common/well-known-hosts.nix
similarity index 100%
rename from common/well-known-hosts.nix
rename to nixos/common/well-known-hosts.nix
diff --git a/common/zfs.nix b/nixos/common/zfs.nix
similarity index 100%
rename from common/zfs.nix
rename to nixos/common/zfs.nix
diff --git a/desktop/default.nix b/nixos/desktop/default.nix
similarity index 100%
rename from desktop/default.nix
rename to nixos/desktop/default.nix
diff --git a/desktop/pipewire.nix b/nixos/desktop/pipewire.nix
similarity index 100%
rename from desktop/pipewire.nix
rename to nixos/desktop/pipewire.nix
diff --git a/hardware/amazon/default.nix b/nixos/hardware/amazon/default.nix
similarity index 100%
rename from hardware/amazon/default.nix
rename to nixos/hardware/amazon/default.nix
diff --git a/hardware/hetzner-cloud/default.nix b/nixos/hardware/hetzner-cloud/default.nix
similarity index 100%
rename from hardware/hetzner-cloud/default.nix
rename to nixos/hardware/hetzner-cloud/default.nix
diff --git a/hardware/hetzner-online/amd.nix b/nixos/hardware/hetzner-online/amd.nix
similarity index 100%
rename from hardware/hetzner-online/amd.nix
rename to nixos/hardware/hetzner-online/amd.nix
diff --git a/hardware/hetzner-online/default.nix b/nixos/hardware/hetzner-online/default.nix
similarity index 100%
rename from hardware/hetzner-online/default.nix
rename to nixos/hardware/hetzner-online/default.nix
diff --git a/hardware/hetzner-online/intel.nix b/nixos/hardware/hetzner-online/intel.nix
similarity index 100%
rename from hardware/hetzner-online/intel.nix
rename to nixos/hardware/hetzner-online/intel.nix
diff --git a/hosts/mymachine/configuration.nix b/nixos/hosts/mymachine/configuration.nix
similarity index 100%
rename from hosts/mymachine/configuration.nix
rename to nixos/hosts/mymachine/configuration.nix
diff --git a/mixins/cloud-init.nix b/nixos/mixins/cloud-init.nix
similarity index 100%
rename from mixins/cloud-init.nix
rename to nixos/mixins/cloud-init.nix
diff --git a/mixins/nginx.nix b/nixos/mixins/nginx.nix
similarity index 100%
rename from mixins/nginx.nix
rename to nixos/mixins/nginx.nix
diff --git a/mixins/systemd-boot.nix b/nixos/mixins/systemd-boot.nix
similarity index 100%
rename from mixins/systemd-boot.nix
rename to nixos/mixins/systemd-boot.nix
diff --git a/mixins/telegraf.nix b/nixos/mixins/telegraf.nix
similarity index 100%
rename from mixins/telegraf.nix
rename to nixos/mixins/telegraf.nix
diff --git a/mixins/terminfo.nix b/nixos/mixins/terminfo.nix
similarity index 100%
rename from mixins/terminfo.nix
rename to nixos/mixins/terminfo.nix
diff --git a/mixins/tracing.nix b/nixos/mixins/tracing.nix
similarity index 100%
rename from mixins/tracing.nix
rename to nixos/mixins/tracing.nix
diff --git a/mixins/trusted-nix-caches.nix b/nixos/mixins/trusted-nix-caches.nix
similarity index 100%
rename from mixins/trusted-nix-caches.nix
rename to nixos/mixins/trusted-nix-caches.nix
diff --git a/modules/github-runners/app_token.sh b/nixos/modules/github-runners/app_token.sh
similarity index 100%
rename from modules/github-runners/app_token.sh
rename to nixos/modules/github-runners/app_token.sh
diff --git a/modules/github-runners/default.nix b/nixos/modules/github-runners/default.nix
similarity index 100%
rename from modules/github-runners/default.nix
rename to nixos/modules/github-runners/default.nix
diff --git a/modules/github-runners/options.nix b/nixos/modules/github-runners/options.nix
similarity index 100%
rename from modules/github-runners/options.nix
rename to nixos/modules/github-runners/options.nix
diff --git a/modules/github-runners/service.nix b/nixos/modules/github-runners/service.nix
similarity index 100%
rename from modules/github-runners/service.nix
rename to nixos/modules/github-runners/service.nix
diff --git a/modules/github-runners/token.sh b/nixos/modules/github-runners/token.sh
similarity index 100%
rename from modules/github-runners/token.sh
rename to nixos/modules/github-runners/token.sh
diff --git a/roles/github-actions-runner.nix b/nixos/roles/github-actions-runner.nix
similarity index 100%
rename from roles/github-actions-runner.nix
rename to nixos/roles/github-actions-runner.nix
diff --git a/server.nix b/nixos/server/default.nix
similarity index 98%
rename from server.nix
rename to nixos/server/default.nix
index 837fd6e..2c61197 100644
--- a/server.nix
+++ b/nixos/server/default.nix
@@ -2,9 +2,9 @@
 # Common configuration accross *all* the machines
 { config, pkgs, lib, ... }:
 {
-  _file = ./server.nix;
+  _file = ./default.nix;
   imports = [
-    ./common
+    ../common
   ];
 
   # List packages installed in system profile.