diff --git a/flake.nix b/flake.nix
index 977ddf7..e796428 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,8 +114,7 @@
       # We define a NixOS configuration for a PC workstation.
       nixosConfigurations.cyclone = nixpkgs.lib.nixosSystem {
         modules = [
-          ./hosts/cyclone/configuration.nix
-          ./hosts/cyclone/hardware-configuration.nix
+          ./hosts/linux/cyclone/configuration.nix
 
           vscode-server.nixosModules.default
           home-manager.nixosModules.home-manager
diff --git a/hosts/cyclone/README.md b/hosts/linux/cyclone/README.md
similarity index 100%
rename from hosts/cyclone/README.md
rename to hosts/linux/cyclone/README.md
diff --git a/hosts/cyclone/configuration.nix b/hosts/linux/cyclone/configuration.nix
similarity index 98%
rename from hosts/cyclone/configuration.nix
rename to hosts/linux/cyclone/configuration.nix
index e5ee700..7be0f2d 100644
--- a/hosts/cyclone/configuration.nix
+++ b/hosts/linux/cyclone/configuration.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
+  imports = [
+    ./hardware-configuration.nix
+  ]
+
   networking = {
     hostName = "cyclone";
     domain = "host.fox-int.cloud";
diff --git a/hosts/cyclone/hardware-configuration.nix b/hosts/linux/cyclone/hardware-configuration.nix
similarity index 100%
rename from hosts/cyclone/hardware-configuration.nix
rename to hosts/linux/cyclone/hardware-configuration.nix