diff --git a/recipes/wip/blogbench/recipe.toml b/recipes/wip/benchmarks/blogbench/recipe.toml
similarity index 100%
rename from recipes/wip/blogbench/recipe.toml
rename to recipes/wip/benchmarks/blogbench/recipe.toml
diff --git a/recipes/wip/bluez/recipe.toml b/recipes/wip/bluez/recipe.toml
deleted file mode 100644
index 2a87925f8a419af22a9a3144a2b2b5e1b15bc64d..0000000000000000000000000000000000000000
--- a/recipes/wip/bluez/recipe.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-#TODO require signalfd
-#TODO require Bluetooth drivers
-#TODO build instructions - https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/INSTALL
-[source]
-tar = "http://www.kernel.org/pub/linux/bluetooth/bluez-5.66.tar.xz"
-[build]
-template = "configure"
diff --git a/recipes/wip/clickhouse/recipe.toml b/recipes/wip/db/clickhouse/recipe.toml
similarity index 100%
rename from recipes/wip/clickhouse/recipe.toml
rename to recipes/wip/db/clickhouse/recipe.toml
diff --git a/recipes/wip/cackle/recipe.toml b/recipes/wip/dev/cackle/recipe.toml
similarity index 100%
rename from recipes/wip/cackle/recipe.toml
rename to recipes/wip/dev/cackle/recipe.toml
diff --git a/recipes/wip/capnproto/recipe.toml b/recipes/wip/dev/capnproto/recipe.toml
similarity index 100%
rename from recipes/wip/capnproto/recipe.toml
rename to recipes/wip/dev/capnproto/recipe.toml
diff --git a/recipes/wip/ccs-tools/recipe.toml b/recipes/wip/dev/ccs-tools/recipe.toml
similarity index 100%
rename from recipes/wip/ccs-tools/recipe.toml
rename to recipes/wip/dev/ccs-tools/recipe.toml
diff --git a/recipes/wip/charm++/recipe.toml b/recipes/wip/dev/charm++/recipe.toml
similarity index 100%
rename from recipes/wip/charm++/recipe.toml
rename to recipes/wip/dev/charm++/recipe.toml
diff --git a/recipes/wip/codevis/recipe.toml b/recipes/wip/dev/codevis/recipe.toml
similarity index 100%
rename from recipes/wip/codevis/recipe.toml
rename to recipes/wip/dev/codevis/recipe.toml
diff --git a/recipes/wip/colm/recipe.toml b/recipes/wip/dev/colm/recipe.toml
similarity index 100%
rename from recipes/wip/colm/recipe.toml
rename to recipes/wip/dev/colm/recipe.toml
diff --git a/recipes/wip/appleseed/recipe.toml b/recipes/wip/graphics/appleseed/recipe.toml
similarity index 100%
rename from recipes/wip/appleseed/recipe.toml
rename to recipes/wip/graphics/appleseed/recipe.toml
diff --git a/recipes/wip/babl/recipe.toml b/recipes/wip/libs/babl/recipe.toml
similarity index 100%
rename from recipes/wip/babl/recipe.toml
rename to recipes/wip/libs/babl/recipe.toml
diff --git a/recipes/wip/bita/recipe.toml b/recipes/wip/net/bita/recipe.toml
similarity index 100%
rename from recipes/wip/bita/recipe.toml
rename to recipes/wip/net/bita/recipe.toml
diff --git a/recipes/wip/celeste/recipe.toml b/recipes/wip/net/celeste/recipe.toml
similarity index 100%
rename from recipes/wip/celeste/recipe.toml
rename to recipes/wip/net/celeste/recipe.toml
diff --git a/recipes/wip/cobalt/recipe.toml b/recipes/wip/net/cobalt/recipe.toml
similarity index 100%
rename from recipes/wip/cobalt/recipe.toml
rename to recipes/wip/net/cobalt/recipe.toml
diff --git a/recipes/wip/authoscope/recipe.toml b/recipes/wip/security/authoscope/recipe.toml
similarity index 100%
rename from recipes/wip/authoscope/recipe.toml
rename to recipes/wip/security/authoscope/recipe.toml
diff --git a/recipes/wip/cicada/recipe.toml b/recipes/wip/shells/cicada/recipe.toml
similarity index 100%
rename from recipes/wip/cicada/recipe.toml
rename to recipes/wip/shells/cicada/recipe.toml
diff --git a/recipes/wip/astc-encoder/recipe.toml b/recipes/wip/tools/astc-encoder/recipe.toml
similarity index 100%
rename from recipes/wip/astc-encoder/recipe.toml
rename to recipes/wip/tools/astc-encoder/recipe.toml
diff --git a/recipes/wip/astyle/recipe.toml b/recipes/wip/tools/astyle/recipe.toml
similarity index 100%
rename from recipes/wip/astyle/recipe.toml
rename to recipes/wip/tools/astyle/recipe.toml
diff --git a/recipes/wip/atuin/recipe.toml b/recipes/wip/tools/atuin/recipe.toml
similarity index 100%
rename from recipes/wip/atuin/recipe.toml
rename to recipes/wip/tools/atuin/recipe.toml
diff --git a/recipes/wip/bacon/recipe.toml b/recipes/wip/tools/bacon/recipe.toml
similarity index 100%
rename from recipes/wip/bacon/recipe.toml
rename to recipes/wip/tools/bacon/recipe.toml
diff --git a/recipes/wip/birdy/recipe.toml b/recipes/wip/tools/birdy/recipe.toml
similarity index 100%
rename from recipes/wip/birdy/recipe.toml
rename to recipes/wip/tools/birdy/recipe.toml
diff --git a/recipes/wip/broot/recipe.toml b/recipes/wip/tools/broot/recipe.toml
similarity index 100%
rename from recipes/wip/broot/recipe.toml
rename to recipes/wip/tools/broot/recipe.toml
diff --git a/recipes/wip/bvr/recipe.toml b/recipes/wip/tools/bvr/recipe.toml
similarity index 100%
rename from recipes/wip/bvr/recipe.toml
rename to recipes/wip/tools/bvr/recipe.toml
diff --git a/recipes/wip/cb/recipe.toml b/recipes/wip/tools/cb/recipe.toml
similarity index 100%
rename from recipes/wip/cb/recipe.toml
rename to recipes/wip/tools/cb/recipe.toml