diff --git a/docs/manual/contributing/news.md b/docs/manual/contributing/news.md
index e00635494..f036b36ce 100644
--- a/docs/manual/contributing/news.md
+++ b/docs/manual/contributing/news.md
@@ -16,7 +16,7 @@ or during a stable-release upgrade. See
 that affect stable-release upgrades.
 
 If you do have a change worthy of a news entry then please add one in
-[`news.nix`](https://github.com/nix-community/home-manager/blob/master/modules/misc/news.nix)
+[`news`](https://github.com/nix-community/home-manager/blob/master/modules/misc/news)
 but you should follow some basic guidelines:
 
 -   Use the included news entry generator to create a news entry file:
diff --git a/modules/misc/gtk.nix b/modules/misc/gtk/default.nix
similarity index 94%
rename from modules/misc/gtk.nix
rename to modules/misc/gtk/default.nix
index 99e0bfddf..598093591 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk/default.nix
@@ -13,7 +13,7 @@ let
   cfg3 = config.gtk.gtk3;
   cfg4 = config.gtk.gtk4;
 
-  gtkLib = import ./gtk/lib.nix { inherit lib; };
+  gtkLib = import ./lib.nix { inherit lib; };
 
   themeType = gtkLib.mkThemeType {
     typeName = "theme";
@@ -41,9 +41,9 @@ in
   ];
 
   imports = [
-    ./gtk/gtk2.nix
-    ./gtk/gtk3.nix
-    ./gtk/gtk4.nix
+    ./gtk2.nix
+    ./gtk3.nix
+    ./gtk4.nix
   ];
 
   options.gtk = {
diff --git a/modules/misc/news.nix b/modules/misc/news/default.nix
similarity index 90%
rename from modules/misc/news.nix
rename to modules/misc/news/default.nix
index 8f97ad698..83a063e16 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news/default.nix
@@ -52,26 +52,26 @@ let
     }
   );
 
-  isNixFile = n: v: v == "regular" && lib.hasSuffix ".nix" n;
+  isNewsFile = n: v: v == "regular" && lib.hasSuffix ".nix" n && n != "default.nix";
   isDirectory = _n: v: v == "directory";
 
-  # Recursively collect all .nix files from a directory
-  collectNixFiles =
+  # Recursively collect all news .nix files from a directory
+  collectNewsFiles =
     dir:
     let
       contents = builtins.readDir dir;
-      files = lib.filterAttrs isNixFile contents;
+      files = lib.filterAttrs isNewsFile contents;
       fileList = map (file: dir + "/${file}") (builtins.attrNames files);
 
       # Process subdirectories
       subdirs = lib.filterAttrs isDirectory contents;
-      subdirFiles = lib.concatMap (subdir: collectNixFiles (dir + "/${subdir}")) (
+      subdirFiles = lib.concatMap (subdir: collectNewsFiles (dir + "/${subdir}")) (
         builtins.attrNames subdirs
       );
     in
     fileList ++ subdirFiles;
 
-  newsFiles = collectNixFiles ./news;
+  newsFiles = collectNewsFiles ./.;
   newsEntries = map (
     newsFile:
     let
diff --git a/modules/misc/nix.nix b/modules/misc/nix/default.nix
similarity index 99%
rename from modules/misc/nix.nix
rename to modules/misc/nix/default.nix
index 596c471b1..9c4b43aff 100644
--- a/modules/misc/nix.nix
+++ b/modules/misc/nix/default.nix
@@ -151,6 +151,8 @@ in
 {
   meta.maintainers = [ ];
 
+  imports = [ ./remote-build.nix ];
+
   options.nix = {
     enable =
       mkEnableOption ''
diff --git a/modules/misc/nix-remote-build.nix b/modules/misc/nix/remote-build.nix
similarity index 100%
rename from modules/misc/nix-remote-build.nix
rename to modules/misc/nix/remote-build.nix
diff --git a/modules/misc/qt.nix b/modules/misc/qt/default.nix
similarity index 99%
rename from modules/misc/qt.nix
rename to modules/misc/qt/default.nix
index 24aa9e830..82bece6e7 100644
--- a/modules/misc/qt.nix
+++ b/modules/misc/qt/default.nix
@@ -95,6 +95,9 @@ in
   ];
 
   imports = [
+    ./kconfig.nix
+    ./kvantum.nix
+
     (lib.mkChangedOptionModule [ "qt" "useGtkTheme" ] [ "qt" "platformTheme" ] (
       config: if lib.getAttrFromPath [ "qt" "useGtkTheme" ] config then "gtk" else null
     ))
diff --git a/modules/misc/xdg-autostart.nix b/modules/misc/xdg/autostart.nix
similarity index 100%
rename from modules/misc/xdg-autostart.nix
rename to modules/misc/xdg/autostart.nix
diff --git a/modules/misc/xdg.nix b/modules/misc/xdg/default.nix
similarity index 96%
rename from modules/misc/xdg.nix
rename to modules/misc/xdg/default.nix
index a8b49dd3b..4727cfe94 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg/default.nix
@@ -18,7 +18,7 @@ let
 
   inherit
     (
-      (import ../lib/file-type.nix {
+      (import ../../lib/file-type.nix {
         inherit (config.home) homeDirectory;
         inherit lib pkgs;
       })
@@ -41,6 +41,17 @@ let
 
 in
 {
+  imports = [
+    ./autostart.nix
+    ./desktop-entries.nix
+    ./mime.nix
+    ./mime-apps.nix
+    ./portal.nix
+    ./system-dirs.nix
+    ./terminal-exec.nix
+    ./user-dirs.nix
+  ];
+
   options.xdg = {
     enable = lib.mkEnableOption "management of XDG base directories";
 
diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg/desktop-entries.nix
similarity index 100%
rename from modules/misc/xdg-desktop-entries.nix
rename to modules/misc/xdg/desktop-entries.nix
diff --git a/modules/misc/xdg-mime-apps.nix b/modules/misc/xdg/mime-apps.nix
similarity index 100%
rename from modules/misc/xdg-mime-apps.nix
rename to modules/misc/xdg/mime-apps.nix
diff --git a/modules/misc/xdg-mime.nix b/modules/misc/xdg/mime.nix
similarity index 100%
rename from modules/misc/xdg-mime.nix
rename to modules/misc/xdg/mime.nix
diff --git a/modules/misc/xdg-portal.nix b/modules/misc/xdg/portal.nix
similarity index 100%
rename from modules/misc/xdg-portal.nix
rename to modules/misc/xdg/portal.nix
diff --git a/modules/misc/xdg-system-dirs.nix b/modules/misc/xdg/system-dirs.nix
similarity index 100%
rename from modules/misc/xdg-system-dirs.nix
rename to modules/misc/xdg/system-dirs.nix
diff --git a/modules/misc/xdg-terminal-exec.nix b/modules/misc/xdg/terminal-exec.nix
similarity index 100%
rename from modules/misc/xdg-terminal-exec.nix
rename to modules/misc/xdg/terminal-exec.nix
diff --git a/modules/misc/xdg-user-dirs.nix b/modules/misc/xdg/user-dirs.nix
similarity index 100%
rename from modules/misc/xdg-user-dirs.nix
rename to modules/misc/xdg/user-dirs.nix
diff --git a/modules/modules.nix b/modules/modules.nix
index e233252ed..86aad1483 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -35,17 +35,14 @@ let
       ./misc/debug.nix
       ./misc/editorconfig.nix
       ./misc/fontconfig.nix
-      ./misc/gtk.nix
+      ./misc/gtk
       ./misc/lib.nix
       ./misc/mozilla-messaging-hosts.nix
-      ./misc/news.nix
-      ./misc/nix-remote-build.nix
-      ./misc/nix.nix
+      ./misc/news
+      ./misc/nix
       ./misc/numlock.nix
       ./misc/pam.nix
-      ./misc/qt.nix
-      ./misc/qt/kconfig.nix
-      ./misc/qt/kvantum.nix
+      ./misc/qt
       ./misc/shell.nix
       ./misc/specialisation.nix
       ./misc/ssh-auth-sock.nix
@@ -54,15 +51,7 @@ let
       ./misc/uninstall.nix
       ./misc/version.nix
       ./misc/vte.nix
-      ./misc/xdg-autostart.nix
-      ./misc/xdg-desktop-entries.nix
-      ./misc/xdg-mime-apps.nix
-      ./misc/xdg-mime.nix
-      ./misc/xdg-portal.nix
-      ./misc/xdg-system-dirs.nix
-      ./misc/xdg-terminal-exec.nix
-      ./misc/xdg-user-dirs.nix
-      ./misc/xdg.nix
+      ./misc/xdg
       ./misc/xfconf.nix
       ./services-modular
       ./systemd.nix
diff --git a/tests/default.nix b/tests/default.nix
index 0a8569e0f..27cb1f075 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -187,7 +187,6 @@ import nmtSrc {
           ./modules/misc/manual
           ./modules/misc/news
           ./modules/misc/nix
-          ./modules/misc/nix-remote-build
           ./modules/misc/nixpkgs-disabled
           ./modules/misc/specialisation
           ./modules/misc/ssh-auth-sock/default.nix
diff --git a/tests/modules/misc/nix-remote-build/default.nix b/tests/modules/misc/nix-remote-build/default.nix
deleted file mode 100644
index 7eb59cd45..000000000
--- a/tests/modules/misc/nix-remote-build/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  nix-remote-build-empty = ./empty-settings.nix;
-  nix-remote-build-example = ./example-settings.nix;
-}
diff --git a/tests/modules/misc/nix/default.nix b/tests/modules/misc/nix/default.nix
index 50a8b1e36..8d3ee5026 100644
--- a/tests/modules/misc/nix/default.nix
+++ b/tests/modules/misc/nix/default.nix
@@ -6,4 +6,8 @@
   nix-example-channels = ./example-channels.nix;
   nix-example-channels-xdg = ./example-channels-xdg.nix;
   nix-use-xdg = ./use-xdg.nix;
+
+  # remote-build
+  nix-remote-build-empty = ./remote-build/empty-settings.nix;
+  nix-remote-build-example = ./remote-build/example-settings.nix;
 }
diff --git a/tests/modules/misc/nix-remote-build/empty-settings.nix b/tests/modules/misc/nix/remote-build/empty-settings.nix
similarity index 100%
rename from tests/modules/misc/nix-remote-build/empty-settings.nix
rename to tests/modules/misc/nix/remote-build/empty-settings.nix
diff --git a/tests/modules/misc/nix-remote-build/example-settings-expected b/tests/modules/misc/nix/remote-build/example-settings-expected
similarity index 100%
rename from tests/modules/misc/nix-remote-build/example-settings-expected
rename to tests/modules/misc/nix/remote-build/example-settings-expected
diff --git a/tests/modules/misc/nix-remote-build/example-settings.nix b/tests/modules/misc/nix/remote-build/example-settings.nix
similarity index 100%
rename from tests/modules/misc/nix-remote-build/example-settings.nix
rename to tests/modules/misc/nix/remote-build/example-settings.nix