diff --git a/flake.nix b/flake.nix
index f4df926..7d72084 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,13 +49,13 @@
           ./nixos/easyroam.nix
           ./nixos/configuration.nix
           ./nixos/nixvim/nixvim.nix
-          ./hw-configs/laptop.nix
+          ./nixos/hardware/laptop.nix
           nix-easyroam.nixosModules.nix-easyroam
           stylix.nixosModules.stylix
           nixvim.nixosModules.nixvim
           home-manager.nixosModules.home-manager
           {
-            home-manager.users.lucy = ./home/home.nix;
+            home-manager.users.lucy = ./home-manager/home.nix;
             home-manager.useUserPackages = true;
             home-manager.useGlobalPkgs = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
@@ -87,14 +87,14 @@
         modules = [
           ./nixos/configuration.nix
           ./nixos/nixvim/nixvim.nix
-          ./hw-configs/desktop.nix
+          ./nixos/hardware/desktop.nix
           lanzaboote.nixosModules.lanzaboote
           nix-easyroam.nixosModules.nix-easyroam
           stylix.nixosModules.stylix
           nixvim.nixosModules.nixvim
           home-manager.nixosModules.home-manager
           {
-            home-manager.users.lucy = ./home/home.nix;
+            home-manager.users.lucy = ./home-manager/home.nix;
             home-manager.useUserPackages = true;
             home-manager.useGlobalPkgs = true;
             home-manager.extraSpecialArgs = { inherit inputs; };
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 09e029c..eebe828 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -6,8 +6,7 @@
 {
   imports = [
     ./stylix.nix
-    ./fastfetch.nix
-    ./hyprland.nix
+    ./programs/fastfetch.nix
     ./programs/common.nix
     ./programs/foot.nix
     ./programs/git.nix
diff --git a/home-manager/hyprland/hyprland.nix b/home-manager/hyprland/hyprland.nix
index d400fce..d0cfd9a 100644
--- a/home-manager/hyprland/hyprland.nix
+++ b/home-manager/hyprland/hyprland.nix
@@ -14,7 +14,7 @@
     portalPackage = pkgs.xdg-desktop-portal-hyprland;
   };
   xdg.configFile."hypr/main.lua".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/home/hyprland/hyprland.lua";
+    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/home-manager/hyprland/hyprland.lua";
   xdg.portal.config = {
     common = {
       default = [ "gtk" ];
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 760d8c3..b5d0c29 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -4,14 +4,12 @@
 }:
 {
   imports = [
-    ./stylix.nix
     ./nixvim/nixvim.nix
     ./programs/common.nix
     ./programs/steam.nix
     ./programs/system-packages.nix
     ./programs/xppen.nix
     ./programs/zsh.nix
-    ./hardware/common.nix
     ./hardware/bluetooth.nix
     ./services/common.nix
     ./services/pipewire.nix
diff --git a/nixos/hardware/common.nix b/nixos/hardware/common.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/nixos/programs/fonts.nix b/nixos/programs/fonts.nix
index 4ff17f3..e8d7db6 100644
--- a/nixos/programs/fonts.nix
+++ b/nixos/programs/fonts.nix
@@ -1,4 +1,4 @@
-{ pkgs }: {
+{ pkgs, ... }: {
 
   fonts.packages = with pkgs; [
     noto-fonts
diff --git a/nixos/programs/system-packages.nix b/nixos/programs/system-packages.nix
index 6c059d2..45d3380 100644
--- a/nixos/programs/system-packages.nix
+++ b/nixos/programs/system-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs }: {
+{ pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     wl-clipboard
     btop
diff --git a/nixos/programs/xppen.nix b/nixos/programs/xppen.nix
index 5f48934..f878fe7 100644
--- a/nixos/programs/xppen.nix
+++ b/nixos/programs/xppen.nix
@@ -1,4 +1,4 @@
-{ pkgs }: {
+{ pkgs, ... }: {
 
   programs.xppen = {
     enable = true;