diff --git a/system/README.md b/system/README.md
index e91ba36..f066869 100644
--- a/system/README.md
+++ b/system/README.md
@@ -1,2 +1,4 @@
 # system
-This directory contains modules and configuration specific to my NixOS configuration. `default.nix` is the entrypoint to my module set; it can safely be loaded without making any configuration changes by default. 
+This directory contains modules and configuration specific to my NixOS
+configuration. `default.nix` is the entrypoint to my module set; it can
+safely be loaded without making any configuration changes by default. 
diff --git a/system/common/default.nix b/system/common/default.nix
new file mode 100644
index 0000000..84e16c5
--- /dev/null
+++ b/system/common/default.nix
@@ -0,0 +1,9 @@
+{...}:
+{
+  imports = [
+    ./desktop.nix
+    ./me.nix
+    ./remote.nix
+    ./wm.nix
+  ];
+}
diff --git a/system/desktop-common.nix b/system/common/desktop.nix
similarity index 100%
rename from system/desktop-common.nix
rename to system/common/desktop.nix
diff --git a/system/fragments/me.nix b/system/common/me.nix
similarity index 100%
rename from system/fragments/me.nix
rename to system/common/me.nix
diff --git a/system/remote.nix b/system/common/remote.nix
similarity index 100%
rename from system/remote.nix
rename to system/common/remote.nix
diff --git a/system/wm-common.nix b/system/common/wm.nix
similarity index 100%
rename from system/wm-common.nix
rename to system/common/wm.nix
diff --git a/system/new-fragments/README.md b/system/fragments/README.md
similarity index 100%
rename from system/new-fragments/README.md
rename to system/fragments/README.md
diff --git a/system/new-fragments/android.nix b/system/fragments/android.nix
similarity index 100%
rename from system/new-fragments/android.nix
rename to system/fragments/android.nix
diff --git a/system/new-fragments/debugging.nix b/system/fragments/debugging.nix
similarity index 100%
rename from system/new-fragments/debugging.nix
rename to system/fragments/debugging.nix
diff --git a/system/fragments/hardware/bluetooth.nix b/system/hardware/bluetooth.nix
similarity index 100%
rename from system/fragments/hardware/bluetooth.nix
rename to system/hardware/bluetooth.nix
diff --git a/system/hardware/default.nix b/system/hardware/default.nix
new file mode 100644
index 0000000..2b2c44c
--- /dev/null
+++ b/system/hardware/default.nix
@@ -0,0 +1,9 @@
+{...}:
+{
+  imports = [
+    ./bluetooth.nix
+    ./nvidia.nix
+    ./opengl.nix
+    ./sound.nix
+  ];
+}
diff --git a/system/fragments/hardware/nvidia-modeset.nix b/system/hardware/nvidia.nix
similarity index 100%
rename from system/fragments/hardware/nvidia-modeset.nix
rename to system/hardware/nvidia.nix
diff --git a/system/fragments/opengl.nix b/system/hardware/opengl.nix
similarity index 100%
rename from system/fragments/opengl.nix
rename to system/hardware/opengl.nix
diff --git a/system/fragments/sound.nix b/system/hardware/sound.nix
similarity index 100%
rename from system/fragments/sound.nix
rename to system/hardware/sound.nix
diff --git a/system/package-sets/default.nix b/system/package-sets/default.nix
new file mode 100644
index 0000000..ba7cdaf
--- /dev/null
+++ b/system/package-sets/default.nix
@@ -0,0 +1,7 @@
+{...}:
+{
+  imports = [
+    ./gaming.nix
+    ./multimedia.nix
+  ];
+}
diff --git a/system/gaming.nix b/system/package-sets/gaming.nix
similarity index 100%
rename from system/gaming.nix
rename to system/package-sets/gaming.nix
diff --git a/system/fragments/multimedia.nix b/system/package-sets/multimedia.nix
similarity index 100%
rename from system/fragments/multimedia.nix
rename to system/package-sets/multimedia.nix
diff --git a/system/base.nix b/system/profile/base.nix
similarity index 100%
rename from system/base.nix
rename to system/profile/base.nix
diff --git a/system/profile/default.nix b/system/profile/default.nix
new file mode 100644
index 0000000..8d83827
--- /dev/null
+++ b/system/profile/default.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./base.nix
+  ];
+}
diff --git a/system/programs/default.nix b/system/programs/default.nix
new file mode 100644
index 0000000..eb50170
--- /dev/null
+++ b/system/programs/default.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./syncthing.nix
+  ];
+}
diff --git a/system/fragments/software/syncthing.nix b/system/programs/syncthing.nix
similarity index 100%
rename from system/fragments/software/syncthing.nix
rename to system/programs/syncthing.nix
diff --git a/system/sessions/default.nix b/system/sessions/default.nix
new file mode 100644
index 0000000..d8474e3
--- /dev/null
+++ b/system/sessions/default.nix
@@ -0,0 +1,5 @@
+{...}:
+{ imports = [
+  ./hyprland.nix
+  ./plasma.nix
+];}
diff --git a/system/hyprland.nix b/system/sessions/hyprland.nix
similarity index 100%
rename from system/hyprland.nix
rename to system/sessions/hyprland.nix
diff --git a/system/plasma.nix b/system/sessions/plasma.nix
similarity index 100%
rename from system/plasma.nix
rename to system/sessions/plasma.nix