diff --git a/hosts/nixos/system/partials/apps.nix b/hosts/nixos/system/partials/apps.nix
deleted file mode 100644
index 9491d06..0000000
--- a/hosts/nixos/system/partials/apps.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  services.flatpak.packages = [
-    "io.github.flattool.Warehouse"
-  ];
-
-  environment.systemPackages = with pkgs; [
-    zed-editor
-  ];
-}
diff --git a/hosts/nixos/system/partials/podman.nix b/hosts/nixos/system/partials/apps/env.nix
similarity index 83%
rename from hosts/nixos/system/partials/podman.nix
rename to hosts/nixos/system/partials/apps/env.nix
index 49253db..3b6e514 100644
--- a/hosts/nixos/system/partials/podman.nix
+++ b/hosts/nixos/system/partials/apps/env.nix
@@ -2,5 +2,6 @@
 {
   environment.systemPackages = with pkgs; [
     pods
+    zed-editor
   ];
 }
diff --git a/hosts/nixos/system/partials/apps/settings.nix b/hosts/nixos/system/partials/apps/settings.nix
new file mode 100644
index 0000000..20a1d76
--- /dev/null
+++ b/hosts/nixos/system/partials/apps/settings.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  services.flatpak.packages = [
+    "io.github.flattool.Warehouse"
+  ];
+}
diff --git a/modules/system/darwin/apps/eul.nix b/modules/system/darwin/casks/eul.nix
similarity index 100%
rename from modules/system/darwin/apps/eul.nix
rename to modules/system/darwin/casks/eul.nix
diff --git a/modules/system/darwin/apps/ghostty.nix b/modules/system/darwin/casks/ghostty.nix
similarity index 100%
rename from modules/system/darwin/apps/ghostty.nix
rename to modules/system/darwin/casks/ghostty.nix
diff --git a/modules/system/darwin/apps/iina.nix b/modules/system/darwin/casks/iina.nix
similarity index 100%
rename from modules/system/darwin/apps/iina.nix
rename to modules/system/darwin/casks/iina.nix
diff --git a/modules/system/darwin/apps/iterm.nix b/modules/system/darwin/casks/iterm.nix
similarity index 100%
rename from modules/system/darwin/apps/iterm.nix
rename to modules/system/darwin/casks/iterm.nix
diff --git a/modules/system/darwin/apps/jetbrain.nix b/modules/system/darwin/casks/jetbrain.nix
similarity index 100%
rename from modules/system/darwin/apps/jetbrain.nix
rename to modules/system/darwin/casks/jetbrain.nix
diff --git a/modules/system/darwin/apps/keka.nix b/modules/system/darwin/casks/keka.nix
similarity index 100%
rename from modules/system/darwin/apps/keka.nix
rename to modules/system/darwin/casks/keka.nix
diff --git a/modules/system/darwin/apps/microsoft.nix b/modules/system/darwin/casks/microsoft.nix
similarity index 100%
rename from modules/system/darwin/apps/microsoft.nix
rename to modules/system/darwin/casks/microsoft.nix
diff --git a/modules/system/darwin/apps/obsidian.nix b/modules/system/darwin/casks/obsidian.nix
similarity index 100%
rename from modules/system/darwin/apps/obsidian.nix
rename to modules/system/darwin/casks/obsidian.nix
diff --git a/modules/system/darwin/apps/zed.nix b/modules/system/darwin/casks/zed.nix
similarity index 100%
rename from modules/system/darwin/apps/zed.nix
rename to modules/system/darwin/casks/zed.nix
diff --git a/modules/system/darwin/apps/zen.nix b/modules/system/darwin/casks/zen.nix
similarity index 100%
rename from modules/system/darwin/apps/zen.nix
rename to modules/system/darwin/casks/zen.nix
diff --git a/modules/system/nixos/shells/shell.nix b/modules/system/nixos/shells/gnome.nix
similarity index 100%
rename from modules/system/nixos/shells/shell.nix
rename to modules/system/nixos/shells/gnome.nix