diff --git a/home/common/default.nix b/home/common/default.nix
new file mode 100644
index 0000000..bcc2249
--- /dev/null
+++ b/home/common/default.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./wm.nix
+  ];
+}
diff --git a/home/wm-common.nix b/home/common/wm.nix
similarity index 100%
rename from home/wm-common.nix
rename to home/common/wm.nix
diff --git a/home/package-sets/default.nix b/home/package-sets/default.nix
new file mode 100644
index 0000000..cbe4b9e
--- /dev/null
+++ b/home/package-sets/default.nix
@@ -0,0 +1,5 @@
+{...}:
+{
+  imports = [
+  ];
+}
diff --git a/home/common.nix b/home/profile/base.nix
similarity index 100%
rename from home/common.nix
rename to home/profile/base.nix
diff --git a/home/profile/default.nix b/home/profile/default.nix
new file mode 100644
index 0000000..8d83827
--- /dev/null
+++ b/home/profile/default.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./base.nix
+  ];
+}
diff --git a/home/comma.nix b/home/programs/comma.nix
similarity index 100%
rename from home/comma.nix
rename to home/programs/comma.nix
diff --git a/home/programs/default.nix b/home/programs/default.nix
new file mode 100644
index 0000000..73afff3
--- /dev/null
+++ b/home/programs/default.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./comma.nix
+  ];
+}
diff --git a/home/sessions/default.nix b/home/sessions/default.nix
new file mode 100644
index 0000000..65c089d
--- /dev/null
+++ b/home/sessions/default.nix
@@ -0,0 +1,6 @@
+{...}:
+{
+  imports = [
+    ./hyprland.nix
+  ];
+}
diff --git a/home/hyprland.nix b/home/sessions/hyprland.nix
similarity index 100%
rename from home/hyprland.nix
rename to home/sessions/hyprland.nix