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