diff --git a/modules/features/authentik.nix b/modules/features/authentik.nix
index c7819da..9fe12fa 100644
--- a/modules/features/authentik.nix
+++ b/modules/features/authentik.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: let
+    flake.nixosModules.authentik = { config, lib, pkgs, ... }: let
 
     hostPort = 9005;
 
diff --git a/modules/features/avahi.nix b/modules/features/avahi.nix
index db0c182..6a47263 100644
--- a/modules/features/avahi.nix
+++ b/modules/features/avahi.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.avahi = { config, lib, ... }: {
 
         options = {
             sysconfig.services.avahi.enable = lib.options.mkOption {
diff --git a/modules/features/code-server.nix b/modules/features/code-server.nix
index d45bb04..da626bc 100644
--- a/modules/features/code-server.nix
+++ b/modules/features/code-server.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.code-server = { config, lib, ... }: {
 
         options.sysconfig.containers.code-server.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/docker.nix b/modules/features/docker.nix
index 49bafe4..f8c1783 100644
--- a/modules/features/docker.nix
+++ b/modules/features/docker.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.docker = { config, lib, pkgs, ... }: {
 
         options.sysconfig.docker = {
             enable = with lib; mkOption {
diff --git a/modules/features/dynamicDNS.nix b/modules/features/dynamicDNS.nix
index a9df512..622fa53 100644
--- a/modules/features/dynamicDNS.nix
+++ b/modules/features/dynamicDNS.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.dynamicDNS = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.dynamicDNS.enable = with lib; mkOption {
 
diff --git a/modules/features/gitea.nix b/modules/features/gitea.nix
index 0fcdf93..18f9b4d 100644
--- a/modules/features/gitea.nix
+++ b/modules/features/gitea.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.gitea = { config, lib, ... }: {
 
         options.sysconfig.containers.gitea.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/home-assistant/home-assistant.nix b/modules/features/home-assistant/home-assistant.nix
index 14692fe..0b21054 100644
--- a/modules/features/home-assistant/home-assistant.nix
+++ b/modules/features/home-assistant/home-assistant.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: let
+    flake.nixosModules.home-assistant = { config, lib, ... }: let
 
     subdomain = "hass";
 
diff --git a/modules/features/hyprland.nix b/modules/features/hyprland.nix
index f3f2a04..6323816 100644
--- a/modules/features/hyprland.nix
+++ b/modules/features/hyprland.nix
@@ -1,6 +1,6 @@
 { inputs, ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.hyprland = { config, lib, pkgs, ... }: {
 
         options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/jellyfin.nix b/modules/features/jellyfin.nix
index 28976dd..bf768fe 100644
--- a/modules/features/jellyfin.nix
+++ b/modules/features/jellyfin.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: let
+    flake.nixosModules.jellyfin = { config, lib, pkgs, ... }: let
 
     subdomain = "watch";
 
diff --git a/modules/features/kdePlasma6.nix b/modules/features/kdePlasma6.nix
index 754ed7f..52cba0a 100644
--- a/modules/features/kdePlasma6.nix
+++ b/modules/features/kdePlasma6.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.kdePlasma6 = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.kdePlasma6.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/n8n.nix b/modules/features/n8n.nix
index b6650b0..dfd400e 100644
--- a/modules/features/n8n.nix
+++ b/modules/features/n8n.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: let
+    flake.nixosModules.n8n = { config, lib, pkgs, ... }: let
 
     subdomain = "n8n";
 
diff --git a/modules/features/netbird/netbird.nix b/modules/features/netbird/netbird.nix
index 22b9bed..e55357f 100644
--- a/modules/features/netbird/netbird.nix
+++ b/modules/features/netbird/netbird.nix
@@ -1,7 +1,7 @@
 { inputs, ... }: {
 
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.netbird = { config, lib, pkgs, ... }: {
 
         options.sysconfig = {
 
diff --git a/modules/features/nextcloud.nix b/modules/features/nextcloud.nix
index 219205d..c11b94e 100644
--- a/modules/features/nextcloud.nix
+++ b/modules/features/nextcloud.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: let
+    flake.nixosModules.nextcloud = { config, lib, pkgs, ... }: let
 
     subdomain = "cloud";
 
diff --git a/modules/features/nginx.nix b/modules/features/nginx.nix
index 53fb43d..412ead2 100644
--- a/modules/features/nginx.nix
+++ b/modules/features/nginx.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.nginx = { config, lib, ... }: {
 
         options.sysconfig.containers."esotericbytes.com".enable = lib.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/novnc.nix b/modules/features/novnc.nix
index 21c16a6..73c2012 100644
--- a/modules/features/novnc.nix
+++ b/modules/features/novnc.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.novnc = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.novnc.enable = lib.mkOption {
             type = lib.types.bool;
@@ -31,7 +31,7 @@
         };
     };
 
-    flake.nixosModules.ntfy-container = { config, lib, pkgs, ... }: {
+    flake.nixosModules.novnc-container = { config, lib, pkgs, ... }: {
 
         options.sysconfig.containers.novnc.enable = lib.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/ntfy.nix b/modules/features/ntfy.nix
index 7ae67bd..f525819 100644
--- a/modules/features/ntfy.nix
+++ b/modules/features/ntfy.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.ntfy = { config, lib, ... }: {
 
         options.sysconfig.containers.ntfy.enable = lib.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/ollama.nix b/modules/features/ollama.nix
index 2e5398c..3f3add5 100644
--- a/modules/features/ollama.nix
+++ b/modules/features/ollama.nix
@@ -1,6 +1,6 @@
 { inputs, ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.ollama = { config, lib, ... }: {
 
         options = {
             sysconfig.services.ollama.enable = lib.options.mkOption {
diff --git a/modules/features/openssh.nix b/modules/features/openssh.nix
index 6945529..087930b 100644
--- a/modules/features/openssh.nix
+++ b/modules/features/openssh.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.openssh = { config, lib, ... }: {
 
         options = {
             sysconfig.services.openssh.enable = lib.options.mkOption {
diff --git a/modules/features/openwebui.nix b/modules/features/openwebui.nix
index 3d87d1f..8017051 100644
--- a/modules/features/openwebui.nix
+++ b/modules/features/openwebui.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: let
+    flake.nixosModules.openwebui = { config, lib, pkgs, ... }: let
 
     subdomain = "ai";
 
diff --git a/modules/features/pihole.nix b/modules/features/pihole.nix
index 7ea0cfa..a89e03a 100644
--- a/modules/features/pihole.nix
+++ b/modules/features/pihole.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: let
+    flake.nixosModules.pihole = { config, lib, ... }: let
 
     hostPort = 9001;
 
diff --git a/modules/features/pipewire.nix b/modules/features/pipewire.nix
index f0c5c6e..2e1aa70 100644
--- a/modules/features/pipewire.nix
+++ b/modules/features/pipewire.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.pipewire = { config, lib, pkgs, ... }: {
 
         options = {
             sysconfig.services.pipewire.enable = lib.options.mkOption {
diff --git a/modules/features/portainer.nix b/modules/features/portainer.nix
index 51b17c5..08dd469 100644
--- a/modules/features/portainer.nix
+++ b/modules/features/portainer.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: let
+    flake.nixosModules.portainer = { config, lib, ... }: let
 
     hostPort = 9000;
 
diff --git a/modules/features/sandbox.nix b/modules/features/sandbox.nix
index c5679a0..d7921d7 100644
--- a/modules/features/sandbox.nix
+++ b/modules/features/sandbox.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, self, ... }: {
+    flake.nixosModules.sandbox = { config, lib, self, ... }: {
 
         options.sysconfig.containers.sandbox.enable = lib.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/sddm.nix b/modules/features/sddm.nix
index 3b72d64..e5503b8 100644
--- a/modules/features/sddm.nix
+++ b/modules/features/sddm.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.sddm = { config, lib, pkgs, ... }: {
 
         options.sysconfig.services.sddm.enable = lib.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/searxng/searxng.nix b/modules/features/searxng/searxng.nix
index 24752da..0b499b4 100644
--- a/modules/features/searxng/searxng.nix
+++ b/modules/features/searxng/searxng.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: let
+    flake.nixosModules.searxng = { config, lib, ... }: let
 
     subdomain = "searxng";
 
diff --git a/modules/features/steam.nix b/modules/features/steam.nix
index 0473cbe..23d2025 100644
--- a/modules/features/steam.nix
+++ b/modules/features/steam.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.steam = { config, lib, ... }: {
 
         options.sysconfig.programs.steam.enable = lib.options.mkOption {
             type = lib.types.bool;
diff --git a/modules/features/traefik/traefik.nix b/modules/features/traefik/traefik.nix
index 286d78d..a28d5f4 100644
--- a/modules/features/traefik/traefik.nix
+++ b/modules/features/traefik/traefik.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, ... }: {
+    flake.nixosModules.traefik = { config, lib, ... }: {
 
         options.sysconfig.docker.traefik.enable = with lib; mkOption {
             type = with types; bool;
diff --git a/modules/features/virtual-machines.nix b/modules/features/virtual-machines.nix
index 06e6e87..374dd6d 100644
--- a/modules/features/virtual-machines.nix
+++ b/modules/features/virtual-machines.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.nixosModules.default = { config, lib, pkgs, ... }: {
+    flake.nixosModules.virtual-machines = { config, lib, pkgs, ... }: {
 
         options.sysconfig.virtual-machines.enable = with lib; mkOption {
             type = with types; bool;
diff --git a/modules/users/nathan/home-manager/default.nix b/modules/users/nathan/home-manager/default.nix
index 3188aca..eb1278d 100644
--- a/modules/users/nathan/home-manager/default.nix
+++ b/modules/users/nathan/home-manager/default.nix
@@ -108,6 +108,12 @@
                 };
             };
 
+            home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
+                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
+            ];
+
+            home.sessionVariables.EDITOR = "nvim";
+
         };
     };
 }
diff --git a/modules/users/nathan/home-manager/programs/aurora/default.nix b/modules/users/nathan/home-manager/features/aurora.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/aurora/default.nix
rename to modules/users/nathan/home-manager/features/aurora.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/bash/default.nix b/modules/users/nathan/home-manager/features/bash.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/bash/default.nix
rename to modules/users/nathan/home-manager/features/bash.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/bat/default.nix b/modules/users/nathan/home-manager/features/bat.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/bat/default.nix
rename to modules/users/nathan/home-manager/features/bat.nix
diff --git a/modules/users/nathan/home-manager/programs/calcurse/default.nix b/modules/users/nathan/home-manager/features/calcurse.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/calcurse/default.nix
rename to modules/users/nathan/home-manager/features/calcurse.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/eza/default.nix b/modules/users/nathan/home-manager/features/eza.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/eza/default.nix
rename to modules/users/nathan/home-manager/features/eza.nix
diff --git a/modules/users/nathan/home-manager/programs/firefox/default.nix b/modules/users/nathan/home-manager/features/firefox.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/firefox/default.nix
rename to modules/users/nathan/home-manager/features/firefox.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/fzf/default.nix b/modules/users/nathan/home-manager/features/fzf.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/fzf/default.nix
rename to modules/users/nathan/home-manager/features/fzf.nix
diff --git a/modules/users/nathan/home-manager/programs/git/default.nix b/modules/users/nathan/home-manager/features/git.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/git/default.nix
rename to modules/users/nathan/home-manager/features/git.nix
diff --git a/modules/users/nathan/home-manager/programs/hypridle/default.nix b/modules/users/nathan/home-manager/features/hypridle.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/hypridle/default.nix
rename to modules/users/nathan/home-manager/features/hypridle.nix
diff --git a/modules/users/nathan/home-manager/programs/hyprland/default.nix b/modules/users/nathan/home-manager/features/hyprland.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/hyprland/default.nix
rename to modules/users/nathan/home-manager/features/hyprland.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/kitty/default.nix b/modules/users/nathan/home-manager/features/kitty.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/kitty/default.nix
rename to modules/users/nathan/home-manager/features/kitty.nix
diff --git a/modules/users/nathan/home-manager/services/mpd/default.nix b/modules/users/nathan/home-manager/features/mpd.nix
similarity index 100%
rename from modules/users/nathan/home-manager/services/mpd/default.nix
rename to modules/users/nathan/home-manager/features/mpd.nix
diff --git a/modules/users/nathan/home-manager/programs/nh/default.nix b/modules/users/nathan/home-manager/features/nh.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/nh/default.nix
rename to modules/users/nathan/home-manager/features/nh.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix b/modules/users/nathan/home-manager/features/ohmyposh.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix
rename to modules/users/nathan/home-manager/features/ohmyposh.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/opencode/default.nix b/modules/users/nathan/home-manager/features/opencode.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/opencode/default.nix
rename to modules/users/nathan/home-manager/features/opencode.nix
diff --git a/modules/users/nathan/home-manager/packages/default.nix b/modules/users/nathan/home-manager/features/packages.nix
similarity index 100%
rename from modules/users/nathan/home-manager/packages/default.nix
rename to modules/users/nathan/home-manager/features/packages.nix
diff --git a/modules/users/nathan/home-manager/programs/pywal/default.nix b/modules/users/nathan/home-manager/features/pywal.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/pywal/default.nix
rename to modules/users/nathan/home-manager/features/pywal.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/ripgrep/default.nix b/modules/users/nathan/home-manager/features/ripgrep.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/ripgrep/default.nix
rename to modules/users/nathan/home-manager/features/ripgrep.nix
diff --git a/modules/users/nathan/home-manager/programs/rofi/default.nix b/modules/users/nathan/home-manager/features/rofi.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/rofi/default.nix
rename to modules/users/nathan/home-manager/features/rofi.nix
diff --git a/modules/users/nathan/home-manager/packages/scripts/default.nix b/modules/users/nathan/home-manager/features/scripts.nix
similarity index 100%
rename from modules/users/nathan/home-manager/packages/scripts/default.nix
rename to modules/users/nathan/home-manager/features/scripts.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/ssh/default.nix b/modules/users/nathan/home-manager/features/ssh.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/ssh/default.nix
rename to modules/users/nathan/home-manager/features/ssh.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/tmux/default.nix b/modules/users/nathan/home-manager/features/tmux.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/tmux/default.nix
rename to modules/users/nathan/home-manager/features/tmux.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/yazi/default.nix b/modules/users/nathan/home-manager/features/yazi.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/yazi/default.nix
rename to modules/users/nathan/home-manager/features/yazi.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/zoxide/default.nix b/modules/users/nathan/home-manager/features/zoxide.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/zoxide/default.nix
rename to modules/users/nathan/home-manager/features/zoxide.nix
diff --git a/modules/users/nathan/home-manager/programs/terminal/zsh/default.nix b/modules/users/nathan/home-manager/features/zsh.nix
similarity index 100%
rename from modules/users/nathan/home-manager/programs/terminal/zsh/default.nix
rename to modules/users/nathan/home-manager/features/zsh.nix
diff --git a/modules/users/nathan/home-manager/programs/default.nix b/modules/users/nathan/home-manager/programs/default.nix
deleted file mode 100644
index 6a65120..0000000
--- a/modules/users/nathan/home-manager/programs/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ inputs, ... }: {
-
-    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
-
-        config = {
-
-            home.packages = lib.mkIf (!config.homeconfig.wal.enable) [
-                inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
-            ];
-
-            home.sessionVariables.EDITOR = "nvim";
-        };
-    };
-}
diff --git a/modules/users/nathan/home-manager/services/custom/default.nix b/modules/users/nathan/home-manager/services/custom/default.nix
deleted file mode 100644
index c157af7..0000000
--- a/modules/users/nathan/home-manager/services/custom/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ ... }: {}
diff --git a/modules/users/nathan/default.nix b/modules/users/nathan/nathan.nix
similarity index 100%
rename from modules/users/nathan/default.nix
rename to modules/users/nathan/nathan.nix