diff --git a/home-manager/home.nix b/home-manager/home.nix
index 1113d22..5d81453 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -2,13 +2,9 @@
   inputs, outputs, lib, config, pkgs, ...
 }: {
   imports = [
-	  ../packages/nvim/default.nix
-    # ../packages/zsh/default.nix
+	  ../modules/editor.nix
     ../modules/terminal.nix
-    ../packages/ags/default.nix
-    ../packages/hyprland/default.nix
-    ../packages/hyprpanel/default.nix
-    # /home/biscuit/Nixos/packages/hyprland/default.nix
+    ../modules/wayland.nix
   ];
 
   home = {
diff --git a/modules/editor.nix b/modules/editor.nix
new file mode 100644
index 0000000..461af02
--- /dev/null
+++ b/modules/editor.nix
@@ -0,0 +1,6 @@
+
+{ ... }: {
+  imports = [
+    ../packages/nvim/default.nix   
+  ];
+}
diff --git a/modules/wayland.nix b/modules/wayland.nix
new file mode 100644
index 0000000..686ed57
--- /dev/null
+++ b/modules/wayland.nix
@@ -0,0 +1,6 @@
+
+{ ... }: {
+  imports = [
+    ../packages/hyprland/default.nix
+  ];
+}