diff --git a/.gitignore b/.gitignore
index 577b0a0..40c7108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-hardware-configuration.nix
+configuration.nix
diff --git a/homemanager-modules/default.nix b/homemanager-modules/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/configuration.nix b/hosts/keith/configuration.nix
similarity index 96%
rename from configuration.nix
rename to hosts/keith/configuration.nix
index 328fc84..f908d09 100644
--- a/configuration.nix
+++ b/hosts/keith/configuration.nix
@@ -8,8 +8,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./dev-tools.nix
-      ./desktop.nix
+      ./../../nixos-modules/devtools.nix
+      ./../../nixos-modules/desktop.nix
     ];
 
   # Bootloader.
@@ -52,7 +52,6 @@
     isNormalUser = true;
     description = "Weckyy702";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
   };
 
   nix.settings.experimental-features = [
@@ -66,6 +65,7 @@
   environment.systemPackages = with pkgs; [
     vim
     wget
+    kitty
   ];
 
 
diff --git a/hosts/keith/hardware-configuration.nix b/hosts/keith/hardware-configuration.nix
new file mode 100644
index 0000000..1bc4ae3
--- /dev/null
+++ b/hosts/keith/hardware-configuration.nix
@@ -0,0 +1,27 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/0869e843-348d-47e3-b6a1-79ad814ff62b";
+      fsType = "ext4";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/40b22e5b-839d-4189-93e7-246407cc76c7"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/nixos-modules/apps.nix b/nixos-modules/apps.nix
new file mode 100644
index 0000000..6215a5c
--- /dev/null
+++ b/nixos-modules/apps.nix
@@ -0,0 +1,6 @@
+{config, pkgs, ... }: {
+	users.users.weckyy702.packages = with pkgs; [
+		firefox
+		bitwarden-desktop
+	];
+}
diff --git a/desktop.nix b/nixos-modules/desktop.nix
similarity index 100%
rename from desktop.nix
rename to nixos-modules/desktop.nix
diff --git a/dev-tools.nix b/nixos-modules/devtools.nix
similarity index 100%
rename from dev-tools.nix
rename to nixos-modules/devtools.nix