diff --git a/hosts/aurum/services/default.nix b/hosts/aurum/services/default.nix
index 6a6703d..0961dd6 100644
--- a/hosts/aurum/services/default.nix
+++ b/hosts/aurum/services/default.nix
@@ -1,5 +1,5 @@
 {...}: {
   imports = [
-    ./greetd
+    ./greetd.nix
   ];
 }
diff --git a/hosts/aurum/services/greetd/default.nix b/hosts/aurum/services/greetd.nix
similarity index 100%
rename from hosts/aurum/services/greetd/default.nix
rename to hosts/aurum/services/greetd.nix
diff --git a/hosts/aurum/system/audio/default.nix b/hosts/aurum/system/audio.nix
similarity index 100%
rename from hosts/aurum/system/audio/default.nix
rename to hosts/aurum/system/audio.nix
diff --git a/hosts/aurum/system/boot/default.nix b/hosts/aurum/system/boot.nix
similarity index 89%
rename from hosts/aurum/system/boot/default.nix
rename to hosts/aurum/system/boot.nix
index fbe8a65..2025507 100644
--- a/hosts/aurum/system/boot/default.nix
+++ b/hosts/aurum/system/boot.nix
@@ -8,7 +8,7 @@
   boot.supportedFilesystems = ["ntfs"];
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # tmp, will be replaced by lanzaboot
+  # TODO: replace by lanzaboot
   boot.loader.systemd-boot.enable = true;
 
   # clean /tmp at each boot
@@ -20,10 +20,6 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  # imports = [
-  #   ./lanzaboot.nix
-  # ];
-
   boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
   boot.initrd.kernelModules = [""];
   boot.kernelModules = ["kvm-intel"];
diff --git a/hosts/aurum/system/default.nix b/hosts/aurum/system/default.nix
index 8f7a726..68316db 100644
--- a/hosts/aurum/system/default.nix
+++ b/hosts/aurum/system/default.nix
@@ -8,17 +8,19 @@
   system.stateVersion = "24.05"; # Did you read the comment?
 
   imports = [
-    ./audio
-    ./boot
-    # ./disko
-    ./docker
-    ./fonts
-    ./hardware
-    ./i18n
-    # ./impermanence
-    ./networking
-    ./nix
-    ./security
-    ./users
+    ./audio.nix
+    ./boot.nix
+    # ./disko.nix
+    ./docker.nix
+    ./fonts.nix
+    ./hardware.nix
+    ./i18n.nix
+    # ./impermanence.nix
+    # ./lanzaboot.nix
+    ./networking.nix
+    ./nix.nix
+    ./partitions.nix
+    ./security.nix
+    ./users.nix
   ];
 }
diff --git a/hosts/aurum/system/disko/default.nix b/hosts/aurum/system/disko.nix
similarity index 100%
rename from hosts/aurum/system/disko/default.nix
rename to hosts/aurum/system/disko.nix
diff --git a/hosts/aurum/system/docker/default.nix b/hosts/aurum/system/docker.nix
similarity index 100%
rename from hosts/aurum/system/docker/default.nix
rename to hosts/aurum/system/docker.nix
diff --git a/hosts/aurum/system/fonts/default.nix b/hosts/aurum/system/fonts.nix
similarity index 100%
rename from hosts/aurum/system/fonts/default.nix
rename to hosts/aurum/system/fonts.nix
diff --git a/hosts/aurum/system/hardware/default.nix b/hosts/aurum/system/hardware.nix
similarity index 92%
rename from hosts/aurum/system/hardware/default.nix
rename to hosts/aurum/system/hardware.nix
index 541faba..7b948a0 100644
--- a/hosts/aurum/system/hardware/default.nix
+++ b/hosts/aurum/system/hardware.nix
@@ -20,10 +20,6 @@
   # backlight intensity
   programs.light.enable = true;
 
-  imports = [
-    ./partitions.nix
-  ];
-
   # webcam
   # hardware.firmware = [
   #   pkgs.ivsc-firmware
diff --git a/hosts/aurum/system/i18n/default.nix b/hosts/aurum/system/i18n.nix
similarity index 100%
rename from hosts/aurum/system/i18n/default.nix
rename to hosts/aurum/system/i18n.nix
diff --git a/hosts/aurum/system/impermanence/default.nix b/hosts/aurum/system/impermanence.nix
similarity index 100%
rename from hosts/aurum/system/impermanence/default.nix
rename to hosts/aurum/system/impermanence.nix
diff --git a/hosts/aurum/system/boot/lanzaboot.nix b/hosts/aurum/system/lanzaboot.nix
similarity index 100%
rename from hosts/aurum/system/boot/lanzaboot.nix
rename to hosts/aurum/system/lanzaboot.nix
diff --git a/hosts/aurum/system/networking/default.nix b/hosts/aurum/system/networking.nix
similarity index 100%
rename from hosts/aurum/system/networking/default.nix
rename to hosts/aurum/system/networking.nix
diff --git a/hosts/aurum/system/nix/default.nix b/hosts/aurum/system/nix.nix
similarity index 100%
rename from hosts/aurum/system/nix/default.nix
rename to hosts/aurum/system/nix.nix
diff --git a/hosts/aurum/system/hardware/partitions.nix b/hosts/aurum/system/partitions.nix
similarity index 100%
rename from hosts/aurum/system/hardware/partitions.nix
rename to hosts/aurum/system/partitions.nix
diff --git a/hosts/aurum/system/security/default.nix b/hosts/aurum/system/security.nix
similarity index 100%
rename from hosts/aurum/system/security/default.nix
rename to hosts/aurum/system/security.nix
diff --git a/hosts/aurum/system/users/default.nix b/hosts/aurum/system/users.nix
similarity index 100%
rename from hosts/aurum/system/users/default.nix
rename to hosts/aurum/system/users.nix