diff --git a/README.md b/README.md
index c04defc06e17c142d75c1ad0f4c4a23df62814c7..68f6053bd2cecf60aca49257997657df72621a87 100644
--- a/README.md
+++ b/README.md
@@ -29,26 +29,26 @@ from the [redox](https://gitlab.redox-os.org/redox-os/redox) repository.
 
 The categories inside the `recipes` folder.
 
-- `backends` - Middlewares, like SDL2
-- `core` - System components (included on `server` build)
-- `demos` - Software with demos
-- `development` - Any software used for development, like compilers and dependency managers
-- `documentation` - Software used for documentation
-- `emulators` - Console emulators or compatibility/translation layers
-- `examples` - Softwares with examples
+- `core` - System components
+- `demos` - Programs with demos and examples
+- `dev` - Programs used for development and programming languages, like compilers and dependency managers
+- `doc` - Programs used for documentation
+- `emulators` - Console emulators or compatibility layers
 - `games` - Any kind of game
+- `graphics` - Programs used for graphics processing or production
 - `gui` - Graphical interfaces
 - `icons` - Icon packs
-- `libraries` - Software with functions for other softwares, like OpenSSL
-- `network` - Networking tools
+- `libs` - Software with functions for other softwares, like OpenSSL
+- `math` - Programs used for calculations
+- `net` - Networking tools
 - `other` - Software that can't fit on other categories
-- `shells` - Terminal interpreters
-- `sound` - Software used for sound processing/production
+- `shells` - Terminal interpreters and extensions
+- `sound` - Software used for sound processing or production
 - `tests` - Software used to test other softwares
-- `toolkits` - Software used to create other softwares with a framework-like approach
 - `tools` - Text editors, terminal tools and any other kind of tools
-- `tui` - Graphical terminal interfaces
-- `video` - Video players and video processing/production tools
+- `tui` - Programs with a [terminal user interface](https://en.wikipedia.org/wiki/Text-based_user_interface)
+- `video` - Programs used for video playback, processing and production
+- `web` - World Wide Web browsers and tools
 - `wip` - Software that needs porting or incomplete recipes
 
 ### Package Policy
diff --git a/recipes/dev/pkgar/recipe.toml b/recipes/core/pkgar/recipe.toml
similarity index 100%
rename from recipes/dev/pkgar/recipe.toml
rename to recipes/core/pkgar/recipe.toml
diff --git a/recipes/dev/redoxerd/recipe.toml b/recipes/core/redoxerd/recipe.toml
similarity index 100%
rename from recipes/dev/redoxerd/recipe.toml
rename to recipes/core/redoxerd/recipe.toml
diff --git a/recipes/dev/strace/recipe.toml b/recipes/core/strace/recipe.toml
similarity index 100%
rename from recipes/dev/strace/recipe.toml
rename to recipes/core/strace/recipe.toml
diff --git a/recipes/tools/git/git.patch b/recipes/dev/git/git.patch
similarity index 100%
rename from recipes/tools/git/git.patch
rename to recipes/dev/git/git.patch
diff --git a/recipes/tools/git/recipe.sh b/recipes/dev/git/recipe.sh
similarity index 100%
rename from recipes/tools/git/recipe.sh
rename to recipes/dev/git/recipe.sh
diff --git a/recipes/tools/gitoxide/recipe.toml b/recipes/dev/gitoxide/recipe.toml
similarity index 100%
rename from recipes/tools/gitoxide/recipe.toml
rename to recipes/dev/gitoxide/recipe.toml
diff --git a/recipes/tools/procedural-wallpapers-rs/recipe.toml b/recipes/graphics/procedural-wallpapers-rs/recipe.toml
similarity index 100%
rename from recipes/tools/procedural-wallpapers-rs/recipe.toml
rename to recipes/graphics/procedural-wallpapers-rs/recipe.toml
diff --git a/recipes/toolkits/atk/recipe.sh b/recipes/libs/atk/recipe.sh
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/toolkits/atk/recipe.sh
rename to recipes/libs/atk/recipe.sh
diff --git a/recipes/toolkits/atk/redox.patch b/recipes/libs/atk/redox.patch
similarity index 100%
rename from recipes/toolkits/atk/redox.patch
rename to recipes/libs/atk/redox.patch
diff --git a/recipes/backends/cairo/recipe.toml b/recipes/libs/cairo/recipe.toml
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/backends/cairo/recipe.toml
rename to recipes/libs/cairo/recipe.toml
diff --git a/recipes/backends/cairo/redox.patch b/recipes/libs/cairo/redox.patch
similarity index 100%
rename from recipes/backends/cairo/redox.patch
rename to recipes/libs/cairo/redox.patch
diff --git a/recipes/net/nghttp2/recipe.toml b/recipes/libs/nghttp2/recipe.toml
similarity index 100%
rename from recipes/net/nghttp2/recipe.toml
rename to recipes/libs/nghttp2/recipe.toml
diff --git a/recipes/backends/pango/recipe.sh b/recipes/libs/pango/recipe.sh
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/backends/pango/recipe.sh
rename to recipes/libs/pango/recipe.sh
diff --git a/recipes/backends/pango/redox.patch b/recipes/libs/pango/redox.patch
similarity index 100%
rename from recipes/backends/pango/redox.patch
rename to recipes/libs/pango/redox.patch
diff --git a/recipes/backends/sdl-gfx/01_redox.patch b/recipes/libs/sdl-gfx/01_redox.patch
similarity index 100%
rename from recipes/backends/sdl-gfx/01_redox.patch
rename to recipes/libs/sdl-gfx/01_redox.patch
diff --git a/recipes/backends/sdl-gfx/recipe.sh b/recipes/libs/sdl-gfx/recipe.sh
similarity index 100%
rename from recipes/backends/sdl-gfx/recipe.sh
rename to recipes/libs/sdl-gfx/recipe.sh
diff --git a/recipes/backends/sdl1-image/01_redox.patch b/recipes/libs/sdl1-image/01_redox.patch
similarity index 100%
rename from recipes/backends/sdl1-image/01_redox.patch
rename to recipes/libs/sdl1-image/01_redox.patch
diff --git a/recipes/backends/sdl1-image/recipe.sh b/recipes/libs/sdl1-image/recipe.sh
similarity index 100%
rename from recipes/backends/sdl1-image/recipe.sh
rename to recipes/libs/sdl1-image/recipe.sh
diff --git a/recipes/backends/sdl1-mixer/recipe.toml b/recipes/libs/sdl1-mixer/recipe.toml
similarity index 100%
rename from recipes/backends/sdl1-mixer/recipe.toml
rename to recipes/libs/sdl1-mixer/recipe.toml
diff --git a/recipes/backends/sdl1-mixer/redox.patch b/recipes/libs/sdl1-mixer/redox.patch
similarity index 100%
rename from recipes/backends/sdl1-mixer/redox.patch
rename to recipes/libs/sdl1-mixer/redox.patch
diff --git a/recipes/backends/sdl1-ttf/01_redox.patch b/recipes/libs/sdl1-ttf/01_redox.patch
similarity index 100%
rename from recipes/backends/sdl1-ttf/01_redox.patch
rename to recipes/libs/sdl1-ttf/01_redox.patch
diff --git a/recipes/backends/sdl1-ttf/recipe.sh b/recipes/libs/sdl1-ttf/recipe.sh
similarity index 100%
rename from recipes/backends/sdl1-ttf/recipe.sh
rename to recipes/libs/sdl1-ttf/recipe.sh
diff --git a/recipes/backends/sdl1/recipe.toml b/recipes/libs/sdl1/recipe.toml
similarity index 100%
rename from recipes/backends/sdl1/recipe.toml
rename to recipes/libs/sdl1/recipe.toml
diff --git a/recipes/backends/sdl2-image/recipe.toml b/recipes/libs/sdl2-image/recipe.toml
similarity index 100%
rename from recipes/backends/sdl2-image/recipe.toml
rename to recipes/libs/sdl2-image/recipe.toml
diff --git a/recipes/backends/sdl2-mixer/recipe.toml b/recipes/libs/sdl2-mixer/recipe.toml
similarity index 100%
rename from recipes/backends/sdl2-mixer/recipe.toml
rename to recipes/libs/sdl2-mixer/recipe.toml
diff --git a/recipes/backends/sdl2-mixer/redox.patch b/recipes/libs/sdl2-mixer/redox.patch
similarity index 100%
rename from recipes/backends/sdl2-mixer/redox.patch
rename to recipes/libs/sdl2-mixer/redox.patch
diff --git a/recipes/backends/sdl2-ttf/recipe.sh b/recipes/libs/sdl2-ttf/recipe.sh
similarity index 100%
rename from recipes/backends/sdl2-ttf/recipe.sh
rename to recipes/libs/sdl2-ttf/recipe.sh
diff --git a/recipes/backends/sdl2/recipe.toml b/recipes/libs/sdl2/recipe.toml
similarity index 100%
rename from recipes/backends/sdl2/recipe.toml
rename to recipes/libs/sdl2/recipe.toml
diff --git a/recipes/backends/webrender/recipe.sh b/recipes/libs/webrender/recipe.sh
similarity index 100%
rename from recipes/backends/webrender/recipe.sh
rename to recipes/libs/webrender/recipe.sh
diff --git a/recipes/tools/calculator/recipe.toml b/recipes/math/calculator/recipe.toml
similarity index 100%
rename from recipes/tools/calculator/recipe.toml
rename to recipes/math/calculator/recipe.toml
diff --git a/recipes/tools/curl/recipe.toml b/recipes/net/curl/recipe.toml
similarity index 100%
rename from recipes/tools/curl/recipe.toml
rename to recipes/net/curl/recipe.toml
diff --git a/recipes/gui/cosmic-edit/manifest b/recipes/tools/cosmic-edit/manifest
similarity index 100%
rename from recipes/gui/cosmic-edit/manifest
rename to recipes/tools/cosmic-edit/manifest
diff --git a/recipes/gui/cosmic-edit/recipe.toml b/recipes/tools/cosmic-edit/recipe.toml
similarity index 100%
rename from recipes/gui/cosmic-edit/recipe.toml
rename to recipes/tools/cosmic-edit/recipe.toml
diff --git a/recipes/gui/cosmic-files/manifest b/recipes/tools/cosmic-files/manifest
similarity index 100%
rename from recipes/gui/cosmic-files/manifest
rename to recipes/tools/cosmic-files/manifest
diff --git a/recipes/gui/cosmic-files/recipe.toml b/recipes/tools/cosmic-files/recipe.toml
similarity index 100%
rename from recipes/gui/cosmic-files/recipe.toml
rename to recipes/tools/cosmic-files/recipe.toml
diff --git a/recipes/gui/cosmic-term/manifest b/recipes/tools/cosmic-term/manifest
similarity index 100%
rename from recipes/gui/cosmic-term/manifest
rename to recipes/tools/cosmic-term/manifest
diff --git a/recipes/gui/cosmic-term/recipe.toml b/recipes/tools/cosmic-term/recipe.toml
similarity index 100%
rename from recipes/gui/cosmic-term/recipe.toml
rename to recipes/tools/cosmic-term/recipe.toml
diff --git a/recipes/gui/periodictable/recipe.sh b/recipes/tools/periodictable/recipe.sh
similarity index 100%
rename from recipes/gui/periodictable/recipe.sh
rename to recipes/tools/periodictable/recipe.sh
diff --git a/recipes/tools/redox-ssh/recipe.toml b/recipes/tools/ssh/redox-ssh/recipe.toml
similarity index 100%
rename from recipes/tools/redox-ssh/recipe.toml
rename to recipes/tools/ssh/redox-ssh/recipe.toml
diff --git a/recipes/net/netsurf/01_redox.patch b/recipes/web/netsurf/01_redox.patch
similarity index 100%
rename from recipes/net/netsurf/01_redox.patch
rename to recipes/web/netsurf/01_redox.patch
diff --git a/recipes/net/netsurf/manifest b/recipes/web/netsurf/manifest
similarity index 100%
rename from recipes/net/netsurf/manifest
rename to recipes/web/netsurf/manifest
diff --git a/recipes/net/netsurf/recipe.sh b/recipes/web/netsurf/recipe.sh
similarity index 100%
rename from recipes/net/netsurf/recipe.sh
rename to recipes/web/netsurf/recipe.sh
diff --git a/recipes/toolkits/servo/recipe.sh b/recipes/web/servo/recipe.sh
similarity index 100%
rename from recipes/toolkits/servo/recipe.sh
rename to recipes/web/servo/recipe.sh