diff --git a/config/packages/common.nix b/config/packages/common.nix
index 8866927..c3d5922 100644
--- a/config/packages/common.nix
+++ b/config/packages/common.nix
@@ -2,32 +2,18 @@
 
 {
   home.packages = with pkgs; [
-    # Development and build tools
-    texlive.combined.scheme-full
-    python312
-    uv
-    gnumake
-    
     # Network and file transfer
     lftp
     termscp
     httpie
     openssh
     rsync
-    
-    # Database and data tools
-    lazysql
-    sqlite
-    papis
+    gnumake
     
     # Command-line utilities
     ncdu
     git-credential-oauth
     zoxide
     delta
-    
-    # Cross-platform applications
-    keepassxc      # Password manager (Linux/Windows/macOS)
-    syncthing      # File synchronization (cross-platform)
   ];
 }
diff --git a/config/packages/dev.nix b/config/packages/dev.nix
new file mode 100644
index 0000000..4eca3bd
--- /dev/null
+++ b/config/packages/dev.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    # Development and build tools
+    texlive.combined.scheme-full
+    python312
+    uv
+    
+    # Database and data tools
+    lazysql
+    sqlite
+  ];
+}
diff --git a/config/packages/productivity.nix b/config/packages/productivity.nix
new file mode 100644
index 0000000..598365e
--- /dev/null
+++ b/config/packages/productivity.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    papis
+    keepassxc      # Password manager (Linux/Windows/macOS)
+    syncthing      # File synchronization (cross-platform)
+  ];
+}
diff --git a/flake.nix b/flake.nix
index d78dbf1..3696fee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,6 +65,8 @@
         ./config/fonts.nix
         ./config/packages/common.nix
         ./config/packages/darwin.nix
+        ./config/packages/dev.nix
+        ./config/packages/productivity.nix
       ];
 
       nixpkgs.config.allowUnfree = true;
diff --git a/hosts/darwin/MacBook-Air/default.nix b/hosts/darwin/MacBook-Air/default.nix
index 7969ebb..11f5b5b 100644
--- a/hosts/darwin/MacBook-Air/default.nix
+++ b/hosts/darwin/MacBook-Air/default.nix
@@ -8,5 +8,6 @@
   # Import common Darwin configuration
   imports = [
     ../../../system
+    ../../../system/darwin
   ];
-}
\ No newline at end of file
+}
diff --git a/hosts/darwin/iMac/default.nix b/hosts/darwin/iMac/default.nix
index d171118..1b46ec3 100644
--- a/hosts/darwin/iMac/default.nix
+++ b/hosts/darwin/iMac/default.nix
@@ -8,5 +8,6 @@
   # Import common Darwin configuration
   imports = [
     ../../../system
+    ../../../system/darwin
   ];
-}
\ No newline at end of file
+}
diff --git a/system/darwin/defaults.nix b/system/darwin/default.nix
similarity index 100%
rename from system/darwin/defaults.nix
rename to system/darwin/default.nix
diff --git a/system/default.nix b/system/default.nix
index 34ff3dd..84194dc 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./darwin/defaults.nix
   ];
 
 }