diff --git a/recipes/tools/bzip2/pkgconfig b/recipes/archives/bzip2/pkgconfig
similarity index 100%
rename from recipes/tools/bzip2/pkgconfig
rename to recipes/archives/bzip2/pkgconfig
diff --git a/recipes/tools/bzip2/recipe.toml b/recipes/archives/bzip2/recipe.toml
similarity index 100%
rename from recipes/tools/bzip2/recipe.toml
rename to recipes/archives/bzip2/recipe.toml
diff --git a/recipes/tools/xz/recipe.toml b/recipes/archives/xz/recipe.toml
similarity index 100%
rename from recipes/tools/xz/recipe.toml
rename to recipes/archives/xz/recipe.toml
diff --git a/recipes/tools/cosmic-edit/manifest b/recipes/cosmic/cosmic-edit/manifest
similarity index 100%
rename from recipes/tools/cosmic-edit/manifest
rename to recipes/cosmic/cosmic-edit/manifest
diff --git a/recipes/tools/cosmic-edit/recipe.toml b/recipes/cosmic/cosmic-edit/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-edit/recipe.toml
rename to recipes/cosmic/cosmic-edit/recipe.toml
diff --git a/recipes/tools/cosmic-edit/redox.patch b/recipes/cosmic/cosmic-edit/redox.patch
similarity index 100%
rename from recipes/tools/cosmic-edit/redox.patch
rename to recipes/cosmic/cosmic-edit/redox.patch
diff --git a/recipes/tools/cosmic-files/manifest b/recipes/cosmic/cosmic-files/manifest
similarity index 100%
rename from recipes/tools/cosmic-files/manifest
rename to recipes/cosmic/cosmic-files/manifest
diff --git a/recipes/tools/cosmic-files/recipe.toml b/recipes/cosmic/cosmic-files/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-files/recipe.toml
rename to recipes/cosmic/cosmic-files/recipe.toml
diff --git a/recipes/tools/cosmic-files/redox.patch b/recipes/cosmic/cosmic-files/redox.patch
similarity index 100%
rename from recipes/tools/cosmic-files/redox.patch
rename to recipes/cosmic/cosmic-files/redox.patch
diff --git a/recipes/tools/cosmic-reader/manifest b/recipes/cosmic/cosmic-reader/manifest
similarity index 100%
rename from recipes/tools/cosmic-reader/manifest
rename to recipes/cosmic/cosmic-reader/manifest
diff --git a/recipes/tools/cosmic-reader/recipe.toml b/recipes/cosmic/cosmic-reader/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-reader/recipe.toml
rename to recipes/cosmic/cosmic-reader/recipe.toml
diff --git a/recipes/tools/cosmic-settings/recipe.toml b/recipes/cosmic/cosmic-settings/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-settings/recipe.toml
rename to recipes/cosmic/cosmic-settings/recipe.toml
diff --git a/recipes/tools/cosmic-store/recipe.toml b/recipes/cosmic/cosmic-store/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-store/recipe.toml
rename to recipes/cosmic/cosmic-store/recipe.toml
diff --git a/recipes/tools/cosmic-sync/recipe.toml b/recipes/cosmic/cosmic-sync/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-sync/recipe.toml
rename to recipes/cosmic/cosmic-sync/recipe.toml
diff --git a/recipes/tools/cosmic-term/manifest b/recipes/cosmic/cosmic-term/manifest
similarity index 100%
rename from recipes/tools/cosmic-term/manifest
rename to recipes/cosmic/cosmic-term/manifest
diff --git a/recipes/tools/cosmic-term/recipe.toml b/recipes/cosmic/cosmic-term/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-term/recipe.toml
rename to recipes/cosmic/cosmic-term/recipe.toml
diff --git a/recipes/tools/cosmic-term/redox.patch b/recipes/cosmic/cosmic-term/redox.patch
similarity index 100%
rename from recipes/tools/cosmic-term/redox.patch
rename to recipes/cosmic/cosmic-term/redox.patch
diff --git a/recipes/tools/cosmic-text/recipe.toml b/recipes/cosmic/cosmic-text/recipe.toml
similarity index 100%
rename from recipes/tools/cosmic-text/recipe.toml
rename to recipes/cosmic/cosmic-text/recipe.toml
diff --git a/recipes/other/ca-certificates/recipe.toml b/recipes/data/ca-certificates/recipe.toml
similarity index 100%
rename from recipes/other/ca-certificates/recipe.toml
rename to recipes/data/ca-certificates/recipe.toml
diff --git a/recipes/other/generaluser-gs/recipe.toml b/recipes/data/generaluser-gs/recipe.toml
similarity index 100%
rename from recipes/other/generaluser-gs/recipe.toml
rename to recipes/data/generaluser-gs/recipe.toml
diff --git a/recipes/other/shared-mime-info/recipe.toml b/recipes/data/shared-mime-info/recipe.toml
similarity index 100%
rename from recipes/other/shared-mime-info/recipe.toml
rename to recipes/data/shared-mime-info/recipe.toml
diff --git a/recipes/other/terminfo/recipe.toml b/recipes/data/terminfo/recipe.toml
similarity index 100%
rename from recipes/other/terminfo/recipe.toml
rename to recipes/data/terminfo/recipe.toml
diff --git a/recipes/net/download/curl/recipe.toml b/recipes/net/curl/recipe.toml
similarity index 100%
rename from recipes/net/download/curl/recipe.toml
rename to recipes/net/curl/recipe.toml
diff --git a/recipes/net/download/curl/redox.patch b/recipes/net/curl/redox.patch
similarity index 100%
rename from recipes/net/download/curl/redox.patch
rename to recipes/net/curl/redox.patch
diff --git a/recipes/net/download/wget/recipe.toml b/recipes/net/wget/recipe.toml
similarity index 100%
rename from recipes/net/download/wget/recipe.toml
rename to recipes/net/wget/recipe.toml
diff --git a/recipes/doc/book/recipe.toml b/recipes/other/book/recipe.toml
similarity index 100%
rename from recipes/doc/book/recipe.toml
rename to recipes/other/book/recipe.toml
diff --git a/recipes/web/website/recipe.toml b/recipes/other/website/recipe.toml
similarity index 100%
rename from recipes/web/website/recipe.toml
rename to recipes/other/website/recipe.toml
diff --git a/recipes/shells/bash/etc/bash.bashrc b/recipes/terminal/bash/etc/bash.bashrc
similarity index 100%
rename from recipes/shells/bash/etc/bash.bashrc
rename to recipes/terminal/bash/etc/bash.bashrc
diff --git a/recipes/shells/bash/etc/profile b/recipes/terminal/bash/etc/profile
similarity index 100%
rename from recipes/shells/bash/etc/profile
rename to recipes/terminal/bash/etc/profile
diff --git a/recipes/shells/bash/etc/skel/.bashrc b/recipes/terminal/bash/etc/skel/.bashrc
similarity index 100%
rename from recipes/shells/bash/etc/skel/.bashrc
rename to recipes/terminal/bash/etc/skel/.bashrc
diff --git a/recipes/shells/bash/etc/skel/.profile b/recipes/terminal/bash/etc/skel/.profile
similarity index 100%
rename from recipes/shells/bash/etc/skel/.profile
rename to recipes/terminal/bash/etc/skel/.profile
diff --git a/recipes/shells/bash/recipe.toml b/recipes/terminal/bash/recipe.toml
similarity index 100%
rename from recipes/shells/bash/recipe.toml
rename to recipes/terminal/bash/recipe.toml
diff --git a/recipes/shells/bash/redox.patch b/recipes/terminal/bash/redox.patch
similarity index 100%
rename from recipes/shells/bash/redox.patch
rename to recipes/terminal/bash/redox.patch
diff --git a/recipes/wip/shells/fish-shell/recipe.toml b/recipes/terminal/fish-shell/recipe.toml
similarity index 77%
rename from recipes/wip/shells/fish-shell/recipe.toml
rename to recipes/terminal/fish-shell/recipe.toml
index ca1bf588..cdffdaa1 100644
--- a/recipes/wip/shells/fish-shell/recipe.toml
+++ b/recipes/terminal/fish-shell/recipe.toml
@@ -1,4 +1,3 @@
-#TODO: Install share/completion files
 [source]
 git = "https://github.com/fish-shell/fish-shell"
 rev = "54e8ad7e90a8213c01ba58de0640223bee6846d6"
@@ -13,4 +12,6 @@ DYNAMIC_INIT
 # The only default enabled feature is building the man pages.
 # However, that requires sphinx so it can just be enabled later.
 cookbook_cargo --no-default-features
+mkdir -p "${COOKBOOK_STAGE}/usr/share/fish"
+rsync -a "${COOKBOOK_SOURCE}/share/" "${COOKBOOK_STAGE}/usr/share/fish/"
 """
diff --git a/recipes/wip/shells/fish-shell/redox.patch b/recipes/terminal/fish-shell/redox.patch
similarity index 100%
rename from recipes/wip/shells/fish-shell/redox.patch
rename to recipes/terminal/fish-shell/redox.patch
diff --git a/recipes/shells/nushell/recipe.toml b/recipes/terminal/nushell/recipe.toml
similarity index 100%
rename from recipes/shells/nushell/recipe.toml
rename to recipes/terminal/nushell/recipe.toml
diff --git a/recipes/shells/nushell/redox.patch b/recipes/terminal/nushell/redox.patch
similarity index 100%
rename from recipes/shells/nushell/redox.patch
rename to recipes/terminal/nushell/redox.patch
diff --git a/recipes/tools/diffutils/diffutils.patch b/recipes/text/diffutils/diffutils.patch
similarity index 100%
rename from recipes/tools/diffutils/diffutils.patch
rename to recipes/text/diffutils/diffutils.patch
diff --git a/recipes/tools/diffutils/recipe.toml b/recipes/text/diffutils/recipe.toml
similarity index 100%
rename from recipes/tools/diffutils/recipe.toml
rename to recipes/text/diffutils/recipe.toml
diff --git a/recipes/dev/lang/gawk/recipe.toml b/recipes/text/gawk/recipe.toml
similarity index 100%
rename from recipes/dev/lang/gawk/recipe.toml
rename to recipes/text/gawk/recipe.toml
diff --git a/recipes/tools/helix/recipe.toml b/recipes/text/helix/recipe.toml
similarity index 100%
rename from recipes/tools/helix/recipe.toml
rename to recipes/text/helix/recipe.toml
diff --git a/recipes/wip/text/kibi/recipe.toml b/recipes/text/kibi/recipe.toml
similarity index 94%
rename from recipes/wip/text/kibi/recipe.toml
rename to recipes/text/kibi/recipe.toml
index acca2823..841e4c7e 100644
--- a/recipes/wip/text/kibi/recipe.toml
+++ b/recipes/text/kibi/recipe.toml
@@ -1,4 +1,3 @@
-#TODO promote
 [source]
 git = "https://github.com/ilai-deutel/kibi"
 rev = "v0.3.2"
diff --git a/recipes/tools/nano/recipe.toml b/recipes/text/nano/recipe.toml
similarity index 100%
rename from recipes/tools/nano/recipe.toml
rename to recipes/text/nano/recipe.toml
diff --git a/recipes/tools/sodium/recipe.toml b/recipes/text/sodium/recipe.toml
similarity index 100%
rename from recipes/tools/sodium/recipe.toml
rename to recipes/text/sodium/recipe.toml
diff --git a/recipes/tools/vim/recipe.toml b/recipes/text/vim/recipe.toml
similarity index 100%
rename from recipes/tools/vim/recipe.toml
rename to recipes/text/vim/recipe.toml
diff --git a/recipes/tools/vim/vim.patch b/recipes/text/vim/vim.patch
similarity index 100%
rename from recipes/tools/vim/vim.patch
rename to recipes/text/vim/vim.patch
diff --git a/recipes/files/hf/recipe.toml b/recipes/tools/hf/recipe.toml
similarity index 100%
rename from recipes/files/hf/recipe.toml
rename to recipes/tools/hf/recipe.toml
diff --git a/recipes/terminal/pls/recipe.toml b/recipes/tui/pls/recipe.toml
similarity index 100%
rename from recipes/terminal/pls/recipe.toml
rename to recipes/tui/pls/recipe.toml
diff --git a/recipes/terminal/zoxide/recipe.toml b/recipes/tui/zoxide/recipe.toml
similarity index 100%
rename from recipes/terminal/zoxide/recipe.toml
rename to recipes/tui/zoxide/recipe.toml