diff --git a/hosts/machine/ena/configuration.nix b/hosts/machine/ena/configuration.nix
index d74a4af..1d060cf 100644
--- a/hosts/machine/ena/configuration.nix
+++ b/hosts/machine/ena/configuration.nix
@@ -9,21 +9,21 @@
     ./hardware-configuration.nix
 
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
     "${inputs.self}/modules/nixos/features/fonts.nix"
     "${inputs.self}/modules/nixos/features/plasma.nix"
-    "${inputs.self}/modules/nixos/features/sound.nix"
+    "${inputs.self}/modules/nixos/features/system/sound.nix"
     "${inputs.self}/modules/nixos/features/packages.nix"
     "${inputs.self}/modules/nixos/features/catppuccin.nix"
     "${inputs.self}/modules/nixos/features/figma-agent.nix"
-    "${inputs.self}/modules/nixos/features/sbctl.nix"
-    "${inputs.self}/modules/nixos/features/grub-standalone.nix"
-    "${inputs.self}/modules/nixos/features/virtualisation.nix"
-    "${inputs.self}/modules/nixos/features/cockpit.nix"
-    "${inputs.self}/modules/nixos/features/bluetooth.nix"
-    "${inputs.self}/modules/nixos/features/graphics.nix"
+    "${inputs.self}/modules/nixos/features/system/sbctl.nix"
+    "${inputs.self}/modules/nixos/features/system/grub-standalone.nix"
+    "${inputs.self}/modules/nixos/features/system/virtualisation.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/system/bluetooth.nix"
+    "${inputs.self}/modules/nixos/features/system/graphics.nix"
     "${inputs.self}/modules/nixos/features/steam.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
   ];
 
   networking = {
diff --git a/hosts/machine/ena/home/default.nix b/hosts/machine/ena/home/default.nix
index 1374c9c..5aaa397 100644
--- a/hosts/machine/ena/home/default.nix
+++ b/hosts/machine/ena/home/default.nix
@@ -32,14 +32,14 @@
   };
 
   imports = [
-    "${inputs.self}/modules/home/git.nix"
-    # "${inputs.self}/modules/home/firefox.nix
-    "${inputs.self}/modules/home/neovim.nix"
+    "${inputs.self}/modules/home/devtool/git.nix"
+    "${inputs.self}/modules/home/devtool/neovim.nix"
     "${inputs.self}/modules/home/spicetify.nix"
-    "${inputs.self}/modules/home/ghostty.nix"
-    "${inputs.self}/modules/home/zed.nix"
+    "${inputs.self}/modules/home/devtool/ghostty.nix"
+    "${inputs.self}/modules/home/devtool/zed.nix"
     "${inputs.self}/modules/home/discord/linux.nix"
-    "${inputs.self}/modules/home/vscode.nix"
+    "${inputs.self}/modules/home/devtool/vscode.nix"
+    "${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
     ./config/shell.nix
     ./config/plasma.nix
   ];
diff --git a/hosts/machine/ena/home/packages.nix b/hosts/machine/ena/home/packages.nix
index ba89c7f..97c67f9 100644
--- a/hosts/machine/ena/home/packages.nix
+++ b/hosts/machine/ena/home/packages.nix
@@ -1,16 +1,4 @@
 { pkgs, inputs }:
-let
-  system = pkgs.stdenv.hostPlatform.system;
-  pkgsPacketTracer8 = import inputs.nixpkgs-2511 {
-    inherit system;
-    config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "ciscoPacketTracer8-8.2.2"
-      ];
-    };
-  };
-in
 with pkgs;
 (import ../../../../modules/home/packages.nix { inherit pkgs inputs; })
 ++ [
@@ -21,7 +9,5 @@ with pkgs;
   # inputs.waterfox.packages.${pkgs.system}.waterfox
   gnome-network-displays
   element-desktop
-  cisco-packet-tracer_9
-  pkgsPacketTracer8.ciscoPacketTracer8
   # hoffice
 ]
diff --git a/hosts/machine/kanade/home/default.nix b/hosts/machine/kanade/home/default.nix
index 60c601c..c57cb0d 100644
--- a/hosts/machine/kanade/home/default.nix
+++ b/hosts/machine/kanade/home/default.nix
@@ -18,9 +18,9 @@
   };
 
   imports = [
-    "${inputs.self}/modules/home/neovim.nix"
-    "${inputs.self}/modules/home/ghostty.nix"
-    "${inputs.self}/modules/home/zed.nix"
+    "${inputs.self}/modules/home/devtool/neovim.nix"
+    "${inputs.self}/modules/home/devtool/ghostty.nix"
+    "${inputs.self}/modules/home/devtool/zed.nix"
     ./config/git.nix
     ./config/shell.nix
   ];
diff --git a/hosts/machine/mafuyu/home/default.nix b/hosts/machine/mafuyu/home/default.nix
index 2e69a57..adc822c 100644
--- a/hosts/machine/mafuyu/home/default.nix
+++ b/hosts/machine/mafuyu/home/default.nix
@@ -33,10 +33,9 @@
   };
 
   imports = [
-    "${inputs.self}/modules/home/firefox.nix"
-    "${inputs.self}/modules/home/neovim.nix"
-    "${inputs.self}/modules/home/ghostty.nix"
-    "${inputs.self}/modules/home/zed.nix"
+    "${inputs.self}/modules/home/devtool/neovim.nix"
+    "${inputs.self}/modules/home/devtool/ghostty.nix"
+    "${inputs.self}/modules/home/devtool/zed.nix"
     "${inputs.self}/modules/home/discord/linux.nix"
     ./config/shell.nix
     ./config/plasma.nix
diff --git a/hosts/machine/mafuyu/home/packages.nix b/hosts/machine/mafuyu/home/packages.nix
index 3831639..3891ec6 100644
--- a/hosts/machine/mafuyu/home/packages.nix
+++ b/hosts/machine/mafuyu/home/packages.nix
@@ -4,4 +4,5 @@ with pkgs;
   pjsk-cursor.n25.ani
   codex
   inputs.codex-app.packages.${stdenv.buildPlatform.system}.codex-desktop
+  microsoft-edge
 ]
diff --git a/hosts/machine/mizuki/configuration.nix b/hosts/machine/mizuki/configuration.nix
index a166c7d..8dba4dd 100644
--- a/hosts/machine/mizuki/configuration.nix
+++ b/hosts/machine/mizuki/configuration.nix
@@ -4,20 +4,20 @@
     ./hardware-configuration.nix
 
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
     "${inputs.self}/modules/nixos/features/fonts.nix"
     "${inputs.self}/modules/nixos/features/packages.nix"
     "${inputs.self}/modules/nixos/features/plasma.nix"
-    "${inputs.self}/modules/nixos/features/sound.nix"
+    "${inputs.self}/modules/nixos/features/system/sound.nix"
     "${inputs.self}/modules/nixos/features/catppuccin.nix"
     "${inputs.self}/modules/nixos/features/figma-agent.nix"
-    "${inputs.self}/modules/nixos/features/cockpit.nix"
-    "${inputs.self}/modules/nixos/features/bluetooth.nix"
-    "${inputs.self}/modules/nixos/features/graphics.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
-    "${inputs.self}/modules/nixos/features/virtualisation.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/system/bluetooth.nix"
+    "${inputs.self}/modules/nixos/features/system/graphics.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/system/virtualisation.nix"
     "${inputs.self}/modules/nixos/features/steam.nix"
-    "${inputs.self}/modules/nixos/features/sunshine.nix"
+    "${inputs.self}/modules/nixos/features/remote/sunshine.nix"
   ];
 
   networking = {
diff --git a/hosts/machine/mizuki/home/default.nix b/hosts/machine/mizuki/home/default.nix
index 76f4fd6..cb34717 100644
--- a/hosts/machine/mizuki/home/default.nix
+++ b/hosts/machine/mizuki/home/default.nix
@@ -45,17 +45,17 @@
   xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true;
 
   imports = [
-    "${inputs.self}/modules/home/git.nix"
-    "${inputs.self}/modules/home/neovim.nix"
+    "${inputs.self}/modules/home/devtool/git.nix"
+    "${inputs.self}/modules/home/devtool/neovim.nix"
     "${inputs.self}/modules/home/spicetify.nix"
-    "${inputs.self}/modules/home/ghostty.nix"
-    "${inputs.self}/modules/home/zed.nix"
+    "${inputs.self}/modules/home/devtool/ghostty.nix"
+    "${inputs.self}/modules/home/devtool/zed.nix"
     "${inputs.self}/modules/home/vicinae.nix"
     ./config/shell.nix
     ./config/plasma.nix
     "${inputs.self}/modules/home/discord/linux.nix"
     "${inputs.self}/modules/home/obs-studio.nix"
-    "${inputs.self}/modules/home/vscode.nix"
-    "${inputs.self}/modules/home/ciscopackettracer.nix"
+    "${inputs.self}/modules/home/devtool/vscode.nix"
+    "${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
   ];
 }
diff --git a/hosts/machine/ribbon/home/home.nix b/hosts/machine/ribbon/home/home.nix
index c08979b..56c4bf8 100644
--- a/hosts/machine/ribbon/home/home.nix
+++ b/hosts/machine/ribbon/home/home.nix
@@ -29,7 +29,7 @@
   };
 
   imports = [
-    "${inputs.self}/modules/home/neovim.nix"
+    "${inputs.self}/modules/home/devtool/neovim.nix"
     ./config/shell.nix
   ];
 }
diff --git a/hosts/server/hikari/default/configuration.nix b/hosts/server/hikari/default/configuration.nix
index 6f03a7a..58bcefe 100644
--- a/hosts/server/hikari/default/configuration.nix
+++ b/hosts/server/hikari/default/configuration.nix
@@ -3,10 +3,10 @@
   imports = [
     ./hardware-configuration.nix
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/cockpit.nix"
-    "${inputs.self}/modules/nixos/features/boot.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
-    "${inputs.self}/modules/nixos/features/podman.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/management/podman.nix"
 
     ./services/rustfs.nix
     ./services/nextcloud.nix
diff --git a/hosts/server/hikari/hako/configuration.nix b/hosts/server/hikari/hako/configuration.nix
index cc68237..32da0d9 100644
--- a/hosts/server/hikari/hako/configuration.nix
+++ b/hosts/server/hikari/hako/configuration.nix
@@ -5,7 +5,7 @@
     "${inputs.self}/modules/nixos/base"
     "${inputs.self}/modules/nixos/features/boot.nix"
     "${inputs.self}/modules/nixos/features/ssh.nix"
-    "${inputs.self}/modules/nixos/features/docker.nix"
+    "${inputs.self}/modules/nixos/features/management/docker.nix"
   ];
 
   # 1. 크론 설정
diff --git a/hosts/server/kazusa/configuration.nix b/hosts/server/kazusa/configuration.nix
index 37daa3f..7e2edba 100644
--- a/hosts/server/kazusa/configuration.nix
+++ b/hosts/server/kazusa/configuration.nix
@@ -9,7 +9,7 @@
     "${inputs.self}/modules/nixos/base"
     "${inputs.self}/modules/nixos/features/boot.nix"
     "${inputs.self}/modules/nixos/features/ssh.nix"
-    "${inputs.self}/modules/nixos/features/docker.nix"
+    "${inputs.self}/modules/nixos/features/management/docker.nix"
     ./services/mailserver.nix
     ./services/caddy.nix
   ];
diff --git a/hosts/server/natsu/configuration.nix b/hosts/server/natsu/configuration.nix
index e59b4e6..3696dec 100644
--- a/hosts/server/natsu/configuration.nix
+++ b/hosts/server/natsu/configuration.nix
@@ -5,10 +5,9 @@
     "${inputs.self}/modules/nixos/base"
     "${inputs.self}/modules/nixos/features/boot.nix"
     "${inputs.self}/modules/nixos/features/ssh.nix"
-    "${inputs.self}/modules/nixos/features/docker.nix"
+    "${inputs.self}/modules/nixos/features/management/docker.nix"
   ];
 
-  # 1. Docker 추가 설정 (IPv6)
   virtualisation.docker.daemon.settings = {
     fixed-cidr-v6 = "fd00::/80";
     ipv6 = true;
diff --git a/modules/home/ciscopackettracer.nix b/modules/home/devtool/ciscopackettracer.nix
similarity index 100%
rename from modules/home/ciscopackettracer.nix
rename to modules/home/devtool/ciscopackettracer.nix
diff --git a/modules/home/ghostty.nix b/modules/home/devtool/ghostty.nix
similarity index 100%
rename from modules/home/ghostty.nix
rename to modules/home/devtool/ghostty.nix
diff --git a/modules/home/git.nix b/modules/home/devtool/git.nix
similarity index 100%
rename from modules/home/git.nix
rename to modules/home/devtool/git.nix
diff --git a/modules/home/neovim.nix b/modules/home/devtool/neovim.nix
similarity index 100%
rename from modules/home/neovim.nix
rename to modules/home/devtool/neovim.nix
diff --git a/modules/home/vscode.nix b/modules/home/devtool/vscode.nix
similarity index 100%
rename from modules/home/vscode.nix
rename to modules/home/devtool/vscode.nix
diff --git a/modules/home/zed.nix b/modules/home/devtool/zed.nix
similarity index 100%
rename from modules/home/zed.nix
rename to modules/home/devtool/zed.nix
diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
deleted file mode 100644
index 7a0e4dd..0000000
--- a/modules/home/firefox.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs, config, ... }:
-{
-  programs.firefox = {
-    enable = true;
-    configPath = ".mozilla/firefox";
-    package = pkgs.firefox-devedition;
-    policies = {
-      Preferences = {
-        "widget.use-xdg-desktop-portal.file-picker" = {
-          Value = 1;
-          Status = "default";
-        };
-        "middlemouse.paste" = {
-          Value = false;
-          Status = "default";
-        };
-      };
-      ExtensionSettings = {
-        "figma-windows-ua-spoofer@imnyang.local" = {
-          installation_mode = "force_installed";
-          install_url = "https://git.mizuki.guru/imnyang/thisiswindowsfigma/releases/download/v1.0.0/d168a70cb6a24fe4a478-1.0.0.xpi";
-        };
-      };
-    };
-  };
-
-  home.file.".waterfox/native-messaging-hosts".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla/native-messaging-hosts";
-}
diff --git a/modules/nixos/features/cockpit.nix b/modules/nixos/features/management/cockpit.nix
similarity index 100%
rename from modules/nixos/features/cockpit.nix
rename to modules/nixos/features/management/cockpit.nix
diff --git a/modules/nixos/features/docker.nix b/modules/nixos/features/management/docker.nix
similarity index 100%
rename from modules/nixos/features/docker.nix
rename to modules/nixos/features/management/docker.nix
diff --git a/modules/nixos/features/podman.nix b/modules/nixos/features/management/podman.nix
similarity index 100%
rename from modules/nixos/features/podman.nix
rename to modules/nixos/features/management/podman.nix
diff --git a/modules/nixos/features/ssh.nix b/modules/nixos/features/remote/ssh.nix
similarity index 100%
rename from modules/nixos/features/ssh.nix
rename to modules/nixos/features/remote/ssh.nix
diff --git a/modules/nixos/features/sunshine.nix b/modules/nixos/features/remote/sunshine.nix
similarity index 100%
rename from modules/nixos/features/sunshine.nix
rename to modules/nixos/features/remote/sunshine.nix
diff --git a/modules/nixos/features/bluetooth.nix b/modules/nixos/features/system/bluetooth.nix
similarity index 100%
rename from modules/nixos/features/bluetooth.nix
rename to modules/nixos/features/system/bluetooth.nix
diff --git a/modules/nixos/features/boot.nix b/modules/nixos/features/system/boot.nix
similarity index 100%
rename from modules/nixos/features/boot.nix
rename to modules/nixos/features/system/boot.nix
diff --git a/modules/nixos/features/graphics.nix b/modules/nixos/features/system/graphics.nix
similarity index 100%
rename from modules/nixos/features/graphics.nix
rename to modules/nixos/features/system/graphics.nix
diff --git a/modules/nixos/features/grub-standalone.nix b/modules/nixos/features/system/grub-standalone.nix
similarity index 100%
rename from modules/nixos/features/grub-standalone.nix
rename to modules/nixos/features/system/grub-standalone.nix
diff --git a/modules/nixos/features/sbctl.nix b/modules/nixos/features/system/sbctl.nix
similarity index 100%
rename from modules/nixos/features/sbctl.nix
rename to modules/nixos/features/system/sbctl.nix
diff --git a/modules/nixos/features/sound.nix b/modules/nixos/features/system/sound.nix
similarity index 100%
rename from modules/nixos/features/sound.nix
rename to modules/nixos/features/system/sound.nix
diff --git a/modules/nixos/features/virtualisation.nix b/modules/nixos/features/system/virtualisation.nix
similarity index 100%
rename from modules/nixos/features/virtualisation.nix
rename to modules/nixos/features/system/virtualisation.nix