diff --git a/flake.nix b/flake.nix
index 8f545a1..e8855c6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,7 @@
       nixosConfigurations.gwyn = nixpkgs.lib.nixosSystem {
         inherit system pkgs;
         modules = [
-          ./hardware/precision/configuration.nix
+          ./systems/gwyn/configuration.nix
           nixos-hardware.nixosModules.dell-precision-5530
           nixos-hardware.nixosModules.common-gpu-nvidia
           home-manager.nixosModules.home-manager
diff --git a/hardware/bluetooth.nix b/hardware/bluetooth/default.nix
similarity index 100%
rename from hardware/bluetooth.nix
rename to hardware/bluetooth/default.nix
diff --git a/hardware/precision/nvidia.nix b/hardware/nvidia/default.nix
similarity index 96%
rename from hardware/precision/nvidia.nix
rename to hardware/nvidia/default.nix
index a23447c..fbad64d 100644
--- a/hardware/precision/nvidia.nix
+++ b/hardware/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   environment = {
     variables = {
diff --git a/hardware/precision/configuration.nix b/systems/gwyn/configuration.nix
similarity index 87%
rename from hardware/precision/configuration.nix
rename to systems/gwyn/configuration.nix
index 83fec08..3946367 100644
--- a/hardware/precision/configuration.nix
+++ b/systems/gwyn/configuration.nix
@@ -7,9 +7,8 @@
 {
   imports =
     [
-      # Include the results of the hardware scan.
       ../../common/desktop.nix
-      ../bluetooth.nix
+      ../../hardware/bluetooth
       ./hardware-configuration.nix
     ];
 
diff --git a/hardware/precision/hardware-configuration.nix b/systems/gwyn/hardware-configuration.nix
similarity index 97%
rename from hardware/precision/hardware-configuration.nix
rename to systems/gwyn/hardware-configuration.nix
index cd3ed80..586b653 100644
--- a/hardware/precision/hardware-configuration.nix
+++ b/systems/gwyn/hardware-configuration.nix
@@ -5,7 +5,7 @@
 
 {
   imports = [
-    ./nvidia.nix
+    ../../hardware/nvidia
   ];
 
   boot.initrd.availableKernelModules = [