diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index b4de96f6d1..dbf8d3b2dc 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -205,7 +205,7 @@ jobs:
       - name: Run a maturin build
         run: export LLVM_CONFIG=llvm-config-${{env.MAIN_LLVM_VERSION}} && cd ./bindings/pylibafl && python3 -m venv .env && . .env/bin/activate && pip install --upgrade --force-reinstall . && ./test.sh
       - name: Run python test
-        run: . ./bindings/pylibafl/.env/bin/activate # && cd ./fuzzers/binary-only/python_qemu/ && python3 fuzzer.py 2>&1 | grep "Bye"
+        run: . ./bindings/pylibafl/.env/bin/activate # && cd ./fuzzers/binary_only/python_qemu/ && python3 fuzzer.py 2>&1 | grep "Bye"
 
   cargo-fmt:
     runs-on: ubuntu-24.04
@@ -255,20 +255,12 @@ jobs:
         os: [ ubuntu-24.04 ]
         fuzzer:
           # Baby
-          - ./fuzzers/baby/baby_fuzzer_with_forkexecutor
-          - ./fuzzers/baby/baby_no_std
           - ./fuzzers/baby/baby_fuzzer_swap_differential
-          - ./fuzzers/baby/baby_fuzzer_grimoire
-          - ./fuzzers/baby/baby_fuzzer_gramatron
+          - ./fuzzers/baby/tutorial
           - ./fuzzers/baby/baby_fuzzer
-          - ./fuzzers/baby/baby_fuzzer_custom_input
-          - ./fuzzers/baby/baby_fuzzer_nautilus
           # - ./fuzzers/baby/backtrace_baby_fuzzers
           - ./fuzzers/baby/baby_fuzzer_unicode
-          - ./fuzzers/baby/baby_fuzzer_multi
-          - ./fuzzers/baby/baby_fuzzer_wasm
           - ./fuzzers/baby/baby_fuzzer_minimizing
-          - ./fuzzers/baby/baby_fuzzer_tokens
           - ./fuzzers/baby/backtrace_baby_fuzzers/c_code_with_fork_executor
           - ./fuzzers/baby/backtrace_baby_fuzzers/c_code_with_inprocess_executor
           - ./fuzzers/baby/backtrace_baby_fuzzers/rust_code_with_fork_executor
@@ -277,12 +269,12 @@ jobs:
           - ./fuzzers/baby/backtrace_baby_fuzzers/forkserver_executor
 
           # Binary-only
-          - ./fuzzers/binary-only/fuzzbench_fork_qemu
-          - ./fuzzers/binary-only/frida_executable_libpng
-          - ./fuzzers/binary-only/frida_gdiplus
-          - ./fuzzers/binary-only/frida_libpng
-          - ./fuzzers/binary-only/fuzzbench_qemu
-          - ./fuzzers/binary-only/tinyinst_simple
+          - ./fuzzers/binary_only/fuzzbench_fork_qemu
+          - ./fuzzers/binary_only/frida_executable_libpng
+          - ./fuzzers/binary_only/frida_gdiplus
+          - ./fuzzers/binary_only/frida_libpng
+          - ./fuzzers/binary_only/fuzzbench_qemu
+          - ./fuzzers/binary_only/tinyinst_simple
 
           # Forkserver
           - ./fuzzers/forkserver/forkserver_simple
@@ -290,16 +282,23 @@ jobs:
           - ./fuzzers/forkserver/fuzzbench_forkserver
           - ./fuzzers/forkserver/fuzzbench_forkserver_cmplog
           - ./fuzzers/forkserver/libafl-fuzz
+          - ./fuzzers/forkserver/baby_fuzzer_with_forkexecutor
 
           # Full-system
-          - ./fuzzers/full-system/nyx_libxml2_standalone
-          - ./fuzzers/full-system/nyx_libxml2_parallel
+          - ./fuzzers/full_system/nyx_libxml2_standalone
+          - ./fuzzers/full_system/nyx_libxml2_parallel
 
-          # Grammar-aware
-          - ./fuzzers/grammar-aware/nautilus_sync
+          # Structure-aware
+          - ./fuzzers/structure_aware/nautilus_sync
+          - ./fuzzers/structure_aware/baby_fuzzer_grimoire
+          - ./fuzzers/structure_aware/baby_fuzzer_gramatron
+          - ./fuzzers/structure_aware/baby_fuzzer_tokens
+          - ./fuzzers/structure_aware/baby_fuzzer_multi
+          - ./fuzzers/structure_aware/baby_fuzzer_custom_input
+          - ./fuzzers/structure_aware/baby_fuzzer_nautilus
 
           # In-process
-          - ./fuzzers/inprocess/cargo_fuzz
+          - ./fuzzers/fuzz_anything/cargo_fuzz
           # - ./fuzzers/inprocess/dynamic_analysis
           - ./fuzzers/inprocess/fuzzbench
           - ./fuzzers/inprocess/fuzzbench_text
@@ -314,15 +313,17 @@ jobs:
           # - ./fuzzers/inprocess/libfuzzer_libpng_tcp_manager
           - ./fuzzers/inprocess/libfuzzer_stb_image_sugar
           - ./fuzzers/inprocess/libfuzzer_stb_image
-          # - ./fuzzers/inprocess/libfuzzer_stb_image_concolic
+          # - ./fuzzers/structure_aware/libfuzzer_stb_image_concolic
           # - ./fuzzers/inprocess/libfuzzer_windows_asan
-          - ./fuzzers/inprocess/push_harness
-          - ./fuzzers/inprocess/push_stage_harness
           # - ./fuzzers/inprocess/sqlite_centralized_multi_machine
-          - ./fuzzers/inprocess/tutorial
 
-          # Others
-          - ./fuzzers/others/libafl_atheris
+          # Fuzz Anything
+          - ./fuzzers/fuzz_anything/push_harness
+          - ./fuzzers/fuzz_anything/push_stage_harness
+          - ./fuzzers/fuzz_anything/libafl_atheris
+          - ./fuzzers/fuzz_anything/baby_no_std
+          - ./fuzzers/fuzz_anything/baby_fuzzer_wasm
+
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -362,14 +363,14 @@ jobs:
         os: [ubuntu-24.04]
         fuzzer:
           # Binary only
-          - ./fuzzers/binary-only/qemu_cmin
-          - ./fuzzers/binary-only/qemu_coverage
-          - ./fuzzers/binary-only/qemu_launcher
+          - ./fuzzers/binary_only/qemu_cmin
+          - ./fuzzers/binary_only/qemu_coverage
+          - ./fuzzers/binary_only/qemu_launcher
 
           # Full-system
-          - ./fuzzers/full-system/qemu_baremetal
-          # - ./fuzzers/full-system/qemu_linux_kernel
-          #- ./fuzzers/full-system/qemu_linux_process
+          - ./fuzzers/full_system/qemu_baremetal
+          # - ./fuzzers/full_system/qemu_linux_kernel
+          #- ./fuzzers/full_system/qemu_linux_process
 
     runs-on: [ self-hosted, qemu ]
     container: registry.gitlab.com/qemu-project/qemu/qemu/ubuntu2204:latest
@@ -392,9 +393,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - name: Build aarch64-unknown-none
-        run: cd ./fuzzers/baby/baby_no_std && cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release && cd ../..
+        run: cd ./fuzzers/fuzz_anything/baby_no_std && cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release && cd ../..
       - name: run x86_64 until panic!
-        run: cd ./fuzzers/baby/baby_no_std && cargo +nightly run || test $? -ne 0 || exit 1
+        run: cd ./fuzzers/fuzz_anything/baby_no_std && cargo +nightly run || test $? -ne 0 || exit 1
       - name: no_std tests
         run: cd ./libafl && cargo test --no-default-features
 
@@ -436,8 +437,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/windows-tester-prepare
-      - name: Build fuzzers/binary-only/frida_libpng
-        run: cd fuzzers/binary-only/frida_libpng/ && cargo make test
+      - name: Build fuzzers/binary_only/frida_libpng
+        run: cd fuzzers/binary_only/frida_libpng/ && cargo make test
 
   windows-frida-libfuzzer-stb-image:
     runs-on: windows-latest
@@ -456,8 +457,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/windows-tester-prepare
-      - name: Build fuzzers/binary-only/frida_gdiplus
-        run: cd fuzzers/binary-only/frida_gdiplus/ && cargo make test && cargo make test_cmplog
+      - name: Build fuzzers/binary_only/frida_gdiplus
+        run: cd fuzzers/binary_only/frida_gdiplus/ && cargo make test && cargo make test_cmplog
 
   windows-tinyinst-simple:
     runs-on: windows-latest
@@ -468,8 +469,8 @@ jobs:
         run: cargo install cxxbridge-cmd
       - uses: actions/checkout@v4
       - uses: ./.github/workflows/windows-tester-prepare
-      - name: Build fuzzers/binary-only/tinyinst_simple
-        run: cd fuzzers/binary-only/tinyinst_simple/ && cargo make test
+      - name: Build fuzzers/binary_only/tinyinst_simple
+        run: cd fuzzers/binary_only/tinyinst_simple/ && cargo make test
 
   windows-clippy:
     runs-on: windows-latest
diff --git a/.gitignore b/.gitignore
index 0baea31779..f194e9e6aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ test.dict
 AFLplusplus
 test_*
 *_fuzzer
-*_harness
 
 # Ignore common dummy and logfiles
 *.log
@@ -73,6 +72,5 @@ libafl_nyx/packer
 # common harness names
 harness
 program
-fuzzer
 fuzzer_libpng*
 forkserver_simple
diff --git a/docs/src/advanced_features/concolic.md b/docs/src/advanced_features/concolic.md
index aa636df2c1..153607f84c 100644
--- a/docs/src/advanced_features/concolic.md
+++ b/docs/src/advanced_features/concolic.md
@@ -115,7 +115,7 @@ The `symcc_runtime` crate supports this use case and runtimes built with `symcc_
 
 ## Hybrid Fuzzing in LibAFL
 
-The LibAFL repository contains an [example hybrid fuzzer](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/inprocess/libfuzzer_stb_image_concolic).
+The LibAFL repository contains an [example hybrid fuzzer](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/structure_aware/libfuzzer_stb_image_concolic).
 
 There are three main steps involved with building a hybrid fuzzer using LibAFL:
 
@@ -130,7 +130,7 @@ For example, we need to have a runtime ready before we can do instrumentation wi
 
 Building a custom runtime can be done easily using the `symcc_runtime` crate.
 Note, that a custom runtime is a separate shared object file, which means that we need a separate crate for our runtime.
-Check out the [example hybrid fuzzer's runtime](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/inprocess/libfuzzer_stb_image_concolic/runtime) and the [`symcc_runtime` docs](https://docs.rs/symcc_runtime/0.1/symcc_runtime) for inspiration.
+Check out the [example hybrid fuzzer's runtime](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/structure_aware/libfuzzer_stb_image_concolic/runtime) and the [`symcc_runtime` docs](https://docs.rs/symcc_runtime/0.1/symcc_runtime) for inspiration.
 
 ### Instrumentation
 
@@ -151,7 +151,7 @@ How exactly this is done does not matter.
 However, the SymCC compiler needs to be made aware of the location of the runtime that it should instrument against.
 This is done by setting the `SYMCC_RUNTIME_DIR` environment variable to the directory which contains the runtime (typically the `target/(debug|release)` folder of your runtime crate).
 
-The example hybrid fuzzer instruments the target in its [`build.rs` build script](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/build.rs#L50).
+The example hybrid fuzzer instruments the target in its [`build.rs` build script](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/build.rs#L50).
 It does this by cloning and building a copy of SymCC and then using this version to instrument the target.
 The [`symcc_libafl` crate](https://docs.rs/symcc_libafl) contains helper functions for cloning and building SymCC.
 
@@ -169,7 +169,7 @@ No matter the instrumentation method, the interface between the fuzzer and the i
 The only difference between using SymCC and SymQEMU should be the binary that represents the target:
 In the case of SymCC it will be the binary that was build with instrumentation and with SymQEMU it will be the emulator binary (eg. `x86_64-linux-user/symqemu-x86_64`), followed by your uninstrumented target binary and its arguments.
 
-You can use the [`CommandExecutor`](https://docs.rs/libafl/latest/libafl/executors/command/struct.CommandExecutor.html) to execute your target ([example](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/src/main.rs#L244)).
+You can use the [`CommandExecutor`](https://docs.rs/libafl/latest/libafl/executors/command/struct.CommandExecutor.html) to execute your target ([example](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/src/main.rs#L244)).
 When configuring the command, make sure you pass the `SYMCC_INPUT_FILE` environment variable (set to the input file path), if your target reads input from a file (instead of standard input).
 
 #### Serialization and Solving
@@ -184,4 +184,4 @@ It will attempt to solve all branches, like the original simple backend from Sym
 
 ### Example
 
-The example fuzzer shows how to use the [`ConcolicTracingStage` together with the `SimpleConcolicMutationalStage`](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/src/main.rs#L222) to build a basic hybrid fuzzer.
+The example fuzzer shows how to use the [`ConcolicTracingStage` together with the `SimpleConcolicMutationalStage`](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/src/main.rs#L222) to build a basic hybrid fuzzer.
diff --git a/docs/src/advanced_features/frida.md b/docs/src/advanced_features/frida.md
index 97e0ab2324..ed8a85a5fe 100644
--- a/docs/src/advanced_features/frida.md
+++ b/docs/src/advanced_features/frida.md
@@ -4,7 +4,7 @@ LibAFL supports different instrumentation engines for binary-only fuzzing.
 A potent cross-platform (Windows, MacOS, Android, Linux, iOS) option for binary-only fuzzing is Frida; the dynamic instrumentation tool.
 
 In this section, we will talk about the components in fuzzing with `libafl_frida`.
-You can take a look at a working example in our [`fuzzers/binary-only/frida_libpng`](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/binary-only/frida_libpng) folder for Linux, and [`fuzzers/binary-only/frida_gdiplus`](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/binary-only/frida_gdiplus) for Windows.
+You can take a look at a working example in our [`fuzzers/binary_only/frida_libpng`](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/binary_only/frida_libpng) folder for Linux, and [`fuzzers/binary_only/frida_gdiplus`](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/binary_only/frida_gdiplus) for Windows.
 
 ## Dependencies
 
@@ -84,4 +84,4 @@ You can then link this observer to `FridaInProcessExecutor` as follows:
 ```
 
 And finally you can run the fuzzer.
-See the `frida_` examples in [`./fuzzers/binary-only`](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/binary-only/) for more information and, for linux or full-system, play around with `libafl_qemu`, another binary-only tracer.
+See the `frida_` examples in [`./fuzzers/binary_only`](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/binary_only/) for more information and, for linux or full-system, play around with `libafl_qemu`, another binary_only tracer.
diff --git a/docs/src/advanced_features/no_std.md b/docs/src/advanced_features/no_std.md
index a527a8f8fb..529e4148fd 100644
--- a/docs/src/advanced_features/no_std.md
+++ b/docs/src/advanced_features/no_std.md
@@ -37,4 +37,4 @@ pub extern "C" fn external_current_millis() -> u64 {
 }
 ```
 
-See [./fuzzers/baby/baby_no_std](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/baby/baby_no_std) for an example.
+See [./fuzzers/fuzz_anything/baby_no_std](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/fuzz_anything/baby_no_std) for an example.
diff --git a/docs/src/advanced_features/nyx.md b/docs/src/advanced_features/nyx.md
index 40dfeb8b6b..e78094afc7 100644
--- a/docs/src/advanced_features/nyx.md
+++ b/docs/src/advanced_features/nyx.md
@@ -24,7 +24,7 @@ For binary-only fuzzing, Nyx uses intel-PT(Intel® Processor Trace). You can fin
 
 ## Preparing the Nyx working directory
 
-This step is used to pack the target into Nyx's kernel. Don't worry, we have a template shell script in our [example](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/full-system/nyx_libxml2_parallel/setup_libxml2.sh):
+This step is used to pack the target into Nyx's kernel. Don't worry, we have a template shell script in our [example](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/full_system/nyx_libxml2_parallel/setup_libxml2.sh):
 
 the parameter's meaning is listed below:
 
@@ -49,7 +49,7 @@ python3 ./packer/packer/nyx_config_gen.py /tmp/nyx_libxml2/ Kernel || exit
 
 ## Standalone fuzzing
 
-In the [example fuzzer](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/full-system/nyx_libxml2_standalone/src/main.rs) you first need to run `./setup_libxml2.sh`. It will prepare your target and create your nyx work directory in `/tmp/libxml2`. After that, you can start to write your code.
+In the [example fuzzer](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/full_system/nyx_libxml2_standalone/src/main.rs) you first need to run `./setup_libxml2.sh`. It will prepare your target and create your nyx work directory in `/tmp/libxml2`. After that, you can start to write your code.
 
 First, to create `Nyxhelper`:
 
@@ -71,7 +71,7 @@ Finally, use them normally and pass them into `fuzzer.fuzz_loop(&mut stages, &mu
 
 ## Parallel fuzzing
 
-In the [example fuzzer](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/full-system/nyx_libxml2_parallel/src/main.rs) you first need to run `./setup_libxml2.sh` as described before.
+In the [example fuzzer](https://github.com/AFLplusplus/LibAFL/blob/main/fuzzers/full_system/nyx_libxml2_parallel/src/main.rs) you first need to run `./setup_libxml2.sh` as described before.
 
 Parallel fuzzing relies on [`Launcher`](../message_passing/spawn_instances.md), so spawn logic should be written in the scoop of anonymous function `run_client`:
 
diff --git a/docs/src/tutorial/intro.md b/docs/src/tutorial/intro.md
index 375e31125d..7b6cd323cb 100644
--- a/docs/src/tutorial/intro.md
+++ b/docs/src/tutorial/intro.md
@@ -5,4 +5,4 @@
 > This section is under construction.
 > Please check back later (or open a PR)
 >
-> In the meantime, find the final Lain-based fuzzer in [the fuzzers folder](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/inprocess/tutorial)
+> In the meantime, find the final Lain-based fuzzer in [the fuzzers folder](https://github.com/AFLplusplus/LibAFL/tree/main/fuzzers/baby/tutorial)
diff --git a/fuzzers/README.md b/fuzzers/README.md
index 3224a27648..d911d75ac1 100644
--- a/fuzzers/README.md
+++ b/fuzzers/README.md
@@ -2,17 +2,29 @@
 
 ## Example fuzzers
 
-You can find here all the example fuzzers built on top of LibAFL.
-They are sorted by fuzzer types:
+You can find a large amount of example fuzzers built on top of LibAFL.
+They are sorted by focus:
 
-- `baby`: Minimal fuzzers demonstrating a specific feature.
-- `binary-only`: Fuzzers for binary-only targets.
-- `forkserver`: Fuzzers using a forkserver-style executor.
-- `full-system`: Fuzzers for full-system targets (kernels, firmwares, etc...).
+- `baby`: Minimal fuzzers and fuzzers demonstrating specific features that don't fit anywhere else.
+- `inprocess`: Common In-process fuzzers. Most of the time, this is what you want.
+- `binary_only`: Fuzzers for binary-only targets.
+- `forkserver`: Fuzzers that use a forkserver-style executor.
+- `full_system`: Fuzzers for full-system targets (kernels, firmwares, etc...).
 - `fuzzbench`: Fuzzbench fuzzers.
-- `grammar-aware`: Grammar-aware fuzzers.
-- `inprocess`: In-process fuzzers, whn they don't fit another more specific type.
-- `others`: Fuzzers for specific / specialized things, that do not go in a specific category.
+- `structure_aware`: Grammar fuzzers, fuzzers for certain languages, fuzzers with custom inputs, and more.
+- `fuzz-anything`: Fuzzers for advanced targets like WASM or python, and other fuzzers that can be used for anything.
+
+(Some fuzzers may fit into multiple categories, in which case we sort them as it makes sense, for example `structure_aware > full_system > binary_only > the rest`)
+
+## Fully-feature Fuzzers
+
+Some rather complete fuzzers worth looking at are:
+
+- [`Libfuzzer_Libpng_Launcher`](./inprocess//): That's what most people want to use: our InProcess fuzzer with a lot of features like ASAn on some cores, multi threading (a better libfuzzer).
+- [`LibAFL-fuzz`](./forkserver/libafl-fuzz/): A reimplementation of afl-fuzz, the traditional forkserver fuzzer that tries to emulate the command line and behavior.
+- [`LibAFL-QEMU-Launcher`](./binary_only/qemu_launcher/): A full-featured QEMU-mode fuzzer that runs on multiple cores
+
+They may not be the best starting point for your own custom fuzzer, but they might be easy enough to just use.
 
 ## Paper Artifacts
 
diff --git a/fuzzers/baby/baby_fuzzer_wasm/pkg/.gitignore b/fuzzers/baby/baby_fuzzer_wasm/pkg/.gitignore
deleted file mode 100644
index f59ec20aab..0000000000
--- a/fuzzers/baby/baby_fuzzer_wasm/pkg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
\ No newline at end of file
diff --git a/fuzzers/baby/baby_fuzzer_wasm/pkg/index.html b/fuzzers/baby/baby_fuzzer_wasm/pkg/index.html
deleted file mode 100644
index f7077f9d6c..0000000000
--- a/fuzzers/baby/baby_fuzzer_wasm/pkg/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>libafl_wasm test</title>
-</head>
-<body>
-<script type="module">
-    import libafl_wasm from './libafl_wasm.js'
-
-    libafl_wasm().then(wasm => wasm.fuzz())
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/fuzzers/baby/baby_fuzzer_wasm/pkg/package.json b/fuzzers/baby/baby_fuzzer_wasm/pkg/package.json
deleted file mode 100644
index cdfba2f3b8..0000000000
--- a/fuzzers/baby/baby_fuzzer_wasm/pkg/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "baby_fuzzer_wasm",
-  "collaborators": [
-    "Addison Crump <research@addisoncrump.info>"
-  ],
-  "version": "0.1.0",
-  "files": [
-    "baby_fuzzer_wasm_bg.wasm",
-    "baby_fuzzer_wasm.js",
-    "baby_fuzzer_wasm.d.ts"
-  ],
-  "module": "baby_fuzzer_wasm.js",
-  "types": "baby_fuzzer_wasm.d.ts",
-  "sideEffects": [
-    "./snippets/*"
-  ]
-}
\ No newline at end of file
diff --git a/fuzzers/inprocess/tutorial/Cargo.toml b/fuzzers/baby/tutorial/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/tutorial/Cargo.toml
rename to fuzzers/baby/tutorial/Cargo.toml
diff --git a/fuzzers/baby/baby_no_std/rust-toolchain b/fuzzers/baby/tutorial/rust-toolchain
similarity index 100%
rename from fuzzers/baby/baby_no_std/rust-toolchain
rename to fuzzers/baby/tutorial/rust-toolchain
diff --git a/fuzzers/inprocess/tutorial/src/bin/libafl_cc.rs b/fuzzers/baby/tutorial/src/bin/libafl_cc.rs
similarity index 100%
rename from fuzzers/inprocess/tutorial/src/bin/libafl_cc.rs
rename to fuzzers/baby/tutorial/src/bin/libafl_cc.rs
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/src/bin/libafl_cxx.rs b/fuzzers/baby/tutorial/src/bin/libafl_cxx.rs
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/src/bin/libafl_cxx.rs
rename to fuzzers/baby/tutorial/src/bin/libafl_cxx.rs
diff --git a/fuzzers/inprocess/tutorial/src/input.rs b/fuzzers/baby/tutorial/src/input.rs
similarity index 100%
rename from fuzzers/inprocess/tutorial/src/input.rs
rename to fuzzers/baby/tutorial/src/input.rs
diff --git a/fuzzers/inprocess/tutorial/src/lib.rs b/fuzzers/baby/tutorial/src/lib.rs
similarity index 100%
rename from fuzzers/inprocess/tutorial/src/lib.rs
rename to fuzzers/baby/tutorial/src/lib.rs
diff --git a/fuzzers/inprocess/tutorial/src/metadata.rs b/fuzzers/baby/tutorial/src/metadata.rs
similarity index 100%
rename from fuzzers/inprocess/tutorial/src/metadata.rs
rename to fuzzers/baby/tutorial/src/metadata.rs
diff --git a/fuzzers/inprocess/tutorial/src/mutator.rs b/fuzzers/baby/tutorial/src/mutator.rs
similarity index 100%
rename from fuzzers/inprocess/tutorial/src/mutator.rs
rename to fuzzers/baby/tutorial/src/mutator.rs
diff --git a/fuzzers/inprocess/tutorial/target.c b/fuzzers/baby/tutorial/target.c
similarity index 100%
rename from fuzzers/inprocess/tutorial/target.c
rename to fuzzers/baby/tutorial/target.c
diff --git a/fuzzers/binary-only/frida_executable_libpng/.gitignore b/fuzzers/binary_only/frida_executable_libpng/.gitignore
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/.gitignore
rename to fuzzers/binary_only/frida_executable_libpng/.gitignore
diff --git a/fuzzers/binary-only/frida_executable_libpng/Cargo.toml b/fuzzers/binary_only/frida_executable_libpng/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/Cargo.toml
rename to fuzzers/binary_only/frida_executable_libpng/Cargo.toml
diff --git a/fuzzers/binary-only/frida_executable_libpng/Makefile.toml b/fuzzers/binary_only/frida_executable_libpng/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/Makefile.toml
rename to fuzzers/binary_only/frida_executable_libpng/Makefile.toml
diff --git a/fuzzers/binary-only/frida_executable_libpng/README.md b/fuzzers/binary_only/frida_executable_libpng/README.md
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/README.md
rename to fuzzers/binary_only/frida_executable_libpng/README.md
diff --git a/fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty.png b/fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty.png
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty.png
rename to fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty.png
diff --git a/fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty_alpha.png b/fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty_alpha.png
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty_alpha.png
rename to fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty_alpha.png
diff --git a/fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty_gamma.png b/fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty_gamma.png
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty_gamma.png
rename to fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty_gamma.png
diff --git a/fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty_icc.png b/fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty_icc.png
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/corpus/not_kitty_icc.png
rename to fuzzers/binary_only/frida_executable_libpng/corpus/not_kitty_icc.png
diff --git a/fuzzers/binary-only/frida_executable_libpng/harness.cc b/fuzzers/binary_only/frida_executable_libpng/harness.cc
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/harness.cc
rename to fuzzers/binary_only/frida_executable_libpng/harness.cc
diff --git a/fuzzers/binary-only/frida_executable_libpng/src/fuzzer.rs b/fuzzers/binary_only/frida_executable_libpng/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/src/fuzzer.rs
rename to fuzzers/binary_only/frida_executable_libpng/src/fuzzer.rs
diff --git a/fuzzers/binary-only/frida_executable_libpng/src/lib.rs b/fuzzers/binary_only/frida_executable_libpng/src/lib.rs
similarity index 100%
rename from fuzzers/binary-only/frida_executable_libpng/src/lib.rs
rename to fuzzers/binary_only/frida_executable_libpng/src/lib.rs
diff --git a/fuzzers/binary-only/frida_gdiplus/.gitignore b/fuzzers/binary_only/frida_gdiplus/.gitignore
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/.gitignore
rename to fuzzers/binary_only/frida_gdiplus/.gitignore
diff --git a/fuzzers/binary-only/frida_gdiplus/Cargo.toml b/fuzzers/binary_only/frida_gdiplus/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/Cargo.toml
rename to fuzzers/binary_only/frida_gdiplus/Cargo.toml
diff --git a/fuzzers/binary-only/frida_gdiplus/Makefile.toml b/fuzzers/binary_only/frida_gdiplus/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/Makefile.toml
rename to fuzzers/binary_only/frida_gdiplus/Makefile.toml
diff --git a/fuzzers/binary-only/frida_gdiplus/README.md b/fuzzers/binary_only/frida_gdiplus/README.md
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/README.md
rename to fuzzers/binary_only/frida_gdiplus/README.md
diff --git a/fuzzers/binary-only/frida_gdiplus/cargo/.config b/fuzzers/binary_only/frida_gdiplus/cargo/.config
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/cargo/.config
rename to fuzzers/binary_only/frida_gdiplus/cargo/.config
diff --git a/fuzzers/binary-only/frida_gdiplus/cmplog_test.asm b/fuzzers/binary_only/frida_gdiplus/cmplog_test.asm
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/cmplog_test.asm
rename to fuzzers/binary_only/frida_gdiplus/cmplog_test.asm
diff --git a/fuzzers/binary-only/frida_gdiplus/cmplog_test.def b/fuzzers/binary_only/frida_gdiplus/cmplog_test.def
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/cmplog_test.def
rename to fuzzers/binary_only/frida_gdiplus/cmplog_test.def
diff --git a/fuzzers/binary-only/frida_gdiplus/corpus/not_kitty.png b/fuzzers/binary_only/frida_gdiplus/corpus/not_kitty.png
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/corpus/not_kitty.png
rename to fuzzers/binary_only/frida_gdiplus/corpus/not_kitty.png
diff --git a/fuzzers/binary-only/frida_gdiplus/corpus/not_kitty_alpha.png b/fuzzers/binary_only/frida_gdiplus/corpus/not_kitty_alpha.png
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/corpus/not_kitty_alpha.png
rename to fuzzers/binary_only/frida_gdiplus/corpus/not_kitty_alpha.png
diff --git a/fuzzers/binary-only/frida_gdiplus/corpus/not_kitty_gamma.png b/fuzzers/binary_only/frida_gdiplus/corpus/not_kitty_gamma.png
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/corpus/not_kitty_gamma.png
rename to fuzzers/binary_only/frida_gdiplus/corpus/not_kitty_gamma.png
diff --git a/fuzzers/binary-only/frida_gdiplus/corpus/not_kitty_icc.png b/fuzzers/binary_only/frida_gdiplus/corpus/not_kitty_icc.png
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/corpus/not_kitty_icc.png
rename to fuzzers/binary_only/frida_gdiplus/corpus/not_kitty_icc.png
diff --git a/fuzzers/binary-only/frida_gdiplus/harness.cc b/fuzzers/binary_only/frida_gdiplus/harness.cc
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/harness.cc
rename to fuzzers/binary_only/frida_gdiplus/harness.cc
diff --git a/fuzzers/binary-only/frida_gdiplus/src/fuzzer.rs b/fuzzers/binary_only/frida_gdiplus/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/src/fuzzer.rs
rename to fuzzers/binary_only/frida_gdiplus/src/fuzzer.rs
diff --git a/fuzzers/binary-only/frida_gdiplus/src/main.rs b/fuzzers/binary_only/frida_gdiplus/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/frida_gdiplus/src/main.rs
rename to fuzzers/binary_only/frida_gdiplus/src/main.rs
diff --git a/fuzzers/binary-only/frida_libpng/.gitignore b/fuzzers/binary_only/frida_libpng/.gitignore
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/.gitignore
rename to fuzzers/binary_only/frida_libpng/.gitignore
diff --git a/fuzzers/binary-only/frida_libpng/Cargo.toml b/fuzzers/binary_only/frida_libpng/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/Cargo.toml
rename to fuzzers/binary_only/frida_libpng/Cargo.toml
diff --git a/fuzzers/binary-only/frida_libpng/Makefile.toml b/fuzzers/binary_only/frida_libpng/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/Makefile.toml
rename to fuzzers/binary_only/frida_libpng/Makefile.toml
diff --git a/fuzzers/binary-only/frida_libpng/README.md b/fuzzers/binary_only/frida_libpng/README.md
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/README.md
rename to fuzzers/binary_only/frida_libpng/README.md
diff --git a/fuzzers/binary-only/frida_libpng/corpus/not_kitty.png b/fuzzers/binary_only/frida_libpng/corpus/not_kitty.png
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/corpus/not_kitty.png
rename to fuzzers/binary_only/frida_libpng/corpus/not_kitty.png
diff --git a/fuzzers/binary-only/frida_libpng/corpus/not_kitty_alpha.png b/fuzzers/binary_only/frida_libpng/corpus/not_kitty_alpha.png
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/corpus/not_kitty_alpha.png
rename to fuzzers/binary_only/frida_libpng/corpus/not_kitty_alpha.png
diff --git a/fuzzers/binary-only/frida_libpng/corpus/not_kitty_gamma.png b/fuzzers/binary_only/frida_libpng/corpus/not_kitty_gamma.png
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/corpus/not_kitty_gamma.png
rename to fuzzers/binary_only/frida_libpng/corpus/not_kitty_gamma.png
diff --git a/fuzzers/binary-only/frida_libpng/corpus/not_kitty_icc.png b/fuzzers/binary_only/frida_libpng/corpus/not_kitty_icc.png
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/corpus/not_kitty_icc.png
rename to fuzzers/binary_only/frida_libpng/corpus/not_kitty_icc.png
diff --git a/fuzzers/binary-only/frida_libpng/harness.cc b/fuzzers/binary_only/frida_libpng/harness.cc
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/harness.cc
rename to fuzzers/binary_only/frida_libpng/harness.cc
diff --git a/fuzzers/binary-only/frida_libpng/harness_win.cpp b/fuzzers/binary_only/frida_libpng/harness_win.cpp
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/harness_win.cpp
rename to fuzzers/binary_only/frida_libpng/harness_win.cpp
diff --git a/fuzzers/binary-only/frida_libpng/src/fuzzer.rs b/fuzzers/binary_only/frida_libpng/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/src/fuzzer.rs
rename to fuzzers/binary_only/frida_libpng/src/fuzzer.rs
diff --git a/fuzzers/binary-only/frida_libpng/src/main.rs b/fuzzers/binary_only/frida_libpng/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/frida_libpng/src/main.rs
rename to fuzzers/binary_only/frida_libpng/src/main.rs
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/.gitignore b/fuzzers/binary_only/fuzzbench_fork_qemu/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/.gitignore
rename to fuzzers/binary_only/fuzzbench_fork_qemu/.gitignore
diff --git a/fuzzers/binary-only/fuzzbench_fork_qemu/Cargo.toml b/fuzzers/binary_only/fuzzbench_fork_qemu/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_fork_qemu/Cargo.toml
rename to fuzzers/binary_only/fuzzbench_fork_qemu/Cargo.toml
diff --git a/fuzzers/binary-only/fuzzbench_fork_qemu/Makefile.toml b/fuzzers/binary_only/fuzzbench_fork_qemu/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_fork_qemu/Makefile.toml
rename to fuzzers/binary_only/fuzzbench_fork_qemu/Makefile.toml
diff --git a/fuzzers/binary-only/fuzzbench_fork_qemu/libfuzzer_main.c b/fuzzers/binary_only/fuzzbench_fork_qemu/libfuzzer_main.c
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_fork_qemu/libfuzzer_main.c
rename to fuzzers/binary_only/fuzzbench_fork_qemu/libfuzzer_main.c
diff --git a/fuzzers/binary-only/fuzzbench_fork_qemu/src/fuzzer.rs b/fuzzers/binary_only/fuzzbench_fork_qemu/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_fork_qemu/src/fuzzer.rs
rename to fuzzers/binary_only/fuzzbench_fork_qemu/src/fuzzer.rs
diff --git a/fuzzers/binary-only/fuzzbench_fork_qemu/src/main.rs b/fuzzers/binary_only/fuzzbench_fork_qemu/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_fork_qemu/src/main.rs
rename to fuzzers/binary_only/fuzzbench_fork_qemu/src/main.rs
diff --git a/fuzzers/baby/baby_fuzzer_grimoire/.gitignore b/fuzzers/binary_only/fuzzbench_qemu/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_grimoire/.gitignore
rename to fuzzers/binary_only/fuzzbench_qemu/.gitignore
diff --git a/fuzzers/binary-only/fuzzbench_qemu/Cargo.toml b/fuzzers/binary_only/fuzzbench_qemu/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/Cargo.toml
rename to fuzzers/binary_only/fuzzbench_qemu/Cargo.toml
diff --git a/fuzzers/binary-only/fuzzbench_qemu/Makefile.toml b/fuzzers/binary_only/fuzzbench_qemu/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/Makefile.toml
rename to fuzzers/binary_only/fuzzbench_qemu/Makefile.toml
diff --git a/fuzzers/binary-only/fuzzbench_qemu/README.md b/fuzzers/binary_only/fuzzbench_qemu/README.md
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/README.md
rename to fuzzers/binary_only/fuzzbench_qemu/README.md
diff --git a/fuzzers/binary-only/fuzzbench_qemu/libfuzzer_main.c b/fuzzers/binary_only/fuzzbench_qemu/libfuzzer_main.c
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/libfuzzer_main.c
rename to fuzzers/binary_only/fuzzbench_qemu/libfuzzer_main.c
diff --git a/fuzzers/binary-only/fuzzbench_qemu/src/fuzzer.rs b/fuzzers/binary_only/fuzzbench_qemu/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/src/fuzzer.rs
rename to fuzzers/binary_only/fuzzbench_qemu/src/fuzzer.rs
diff --git a/fuzzers/binary-only/fuzzbench_qemu/src/main.rs b/fuzzers/binary_only/fuzzbench_qemu/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/src/main.rs
rename to fuzzers/binary_only/fuzzbench_qemu/src/main.rs
diff --git a/fuzzers/binary-only/python_qemu/README.md b/fuzzers/binary_only/python_qemu/README.md
similarity index 100%
rename from fuzzers/binary-only/python_qemu/README.md
rename to fuzzers/binary_only/python_qemu/README.md
diff --git a/fuzzers/binary-only/python_qemu/fuzz.c b/fuzzers/binary_only/python_qemu/fuzz.c
similarity index 100%
rename from fuzzers/binary-only/python_qemu/fuzz.c
rename to fuzzers/binary_only/python_qemu/fuzz.c
diff --git a/fuzzers/binary-only/python_qemu/fuzzer.py b/fuzzers/binary_only/python_qemu/fuzzer.py
similarity index 100%
rename from fuzzers/binary-only/python_qemu/fuzzer.py
rename to fuzzers/binary_only/python_qemu/fuzzer.py
diff --git a/fuzzers/binary-only/qemu_cmin/.gitignore b/fuzzers/binary_only/qemu_cmin/.gitignore
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/.gitignore
rename to fuzzers/binary_only/qemu_cmin/.gitignore
diff --git a/fuzzers/binary-only/qemu_cmin/Cargo.toml b/fuzzers/binary_only/qemu_cmin/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/Cargo.toml
rename to fuzzers/binary_only/qemu_cmin/Cargo.toml
diff --git a/fuzzers/binary-only/qemu_cmin/Makefile.toml b/fuzzers/binary_only/qemu_cmin/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/Makefile.toml
rename to fuzzers/binary_only/qemu_cmin/Makefile.toml
diff --git a/fuzzers/binary-only/qemu_cmin/README.md b/fuzzers/binary_only/qemu_cmin/README.md
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/README.md
rename to fuzzers/binary_only/qemu_cmin/README.md
diff --git a/fuzzers/binary-only/qemu_cmin/build.rs b/fuzzers/binary_only/qemu_cmin/build.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/build.rs
rename to fuzzers/binary_only/qemu_cmin/build.rs
diff --git a/fuzzers/binary-only/qemu_cmin/harness.cc b/fuzzers/binary_only/qemu_cmin/harness.cc
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/harness.cc
rename to fuzzers/binary_only/qemu_cmin/harness.cc
diff --git a/fuzzers/binary-only/qemu_cmin/src/fuzzer.rs b/fuzzers/binary_only/qemu_cmin/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/src/fuzzer.rs
rename to fuzzers/binary_only/qemu_cmin/src/fuzzer.rs
diff --git a/fuzzers/binary-only/qemu_cmin/src/main.rs b/fuzzers/binary_only/qemu_cmin/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/src/main.rs
rename to fuzzers/binary_only/qemu_cmin/src/main.rs
diff --git a/fuzzers/binary-only/qemu_coverage/.gitignore b/fuzzers/binary_only/qemu_coverage/.gitignore
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/.gitignore
rename to fuzzers/binary_only/qemu_coverage/.gitignore
diff --git a/fuzzers/binary-only/qemu_coverage/Cargo.toml b/fuzzers/binary_only/qemu_coverage/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/Cargo.toml
rename to fuzzers/binary_only/qemu_coverage/Cargo.toml
diff --git a/fuzzers/binary-only/qemu_coverage/Makefile.toml b/fuzzers/binary_only/qemu_coverage/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/Makefile.toml
rename to fuzzers/binary_only/qemu_coverage/Makefile.toml
diff --git a/fuzzers/binary-only/qemu_coverage/README.md b/fuzzers/binary_only/qemu_coverage/README.md
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/README.md
rename to fuzzers/binary_only/qemu_coverage/README.md
diff --git a/fuzzers/binary-only/qemu_coverage/build.rs b/fuzzers/binary_only/qemu_coverage/build.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/build.rs
rename to fuzzers/binary_only/qemu_coverage/build.rs
diff --git a/fuzzers/binary-only/qemu_cmin/corpus/not_kitty.png b/fuzzers/binary_only/qemu_coverage/corpus/not_kitty.png
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/corpus/not_kitty.png
rename to fuzzers/binary_only/qemu_coverage/corpus/not_kitty.png
diff --git a/fuzzers/binary-only/qemu_cmin/corpus/not_kitty_alpha.png b/fuzzers/binary_only/qemu_coverage/corpus/not_kitty_alpha.png
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/corpus/not_kitty_alpha.png
rename to fuzzers/binary_only/qemu_coverage/corpus/not_kitty_alpha.png
diff --git a/fuzzers/binary-only/qemu_cmin/corpus/not_kitty_gamma.png b/fuzzers/binary_only/qemu_coverage/corpus/not_kitty_gamma.png
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/corpus/not_kitty_gamma.png
rename to fuzzers/binary_only/qemu_coverage/corpus/not_kitty_gamma.png
diff --git a/fuzzers/binary-only/qemu_cmin/corpus/not_kitty_icc.png b/fuzzers/binary_only/qemu_coverage/corpus/not_kitty_icc.png
similarity index 100%
rename from fuzzers/binary-only/qemu_cmin/corpus/not_kitty_icc.png
rename to fuzzers/binary_only/qemu_coverage/corpus/not_kitty_icc.png
diff --git a/fuzzers/binary-only/qemu_coverage/harness.cc b/fuzzers/binary_only/qemu_coverage/harness.cc
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/harness.cc
rename to fuzzers/binary_only/qemu_coverage/harness.cc
diff --git a/fuzzers/binary-only/qemu_coverage/src/fuzzer.rs b/fuzzers/binary_only/qemu_coverage/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/src/fuzzer.rs
rename to fuzzers/binary_only/qemu_coverage/src/fuzzer.rs
diff --git a/fuzzers/binary-only/qemu_coverage/src/main.rs b/fuzzers/binary_only/qemu_coverage/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/src/main.rs
rename to fuzzers/binary_only/qemu_coverage/src/main.rs
diff --git a/fuzzers/binary-only/qemu_launcher/.gitignore b/fuzzers/binary_only/qemu_launcher/.gitignore
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/.gitignore
rename to fuzzers/binary_only/qemu_launcher/.gitignore
diff --git a/fuzzers/binary-only/qemu_launcher/Cargo.toml b/fuzzers/binary_only/qemu_launcher/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/Cargo.toml
rename to fuzzers/binary_only/qemu_launcher/Cargo.toml
diff --git a/fuzzers/binary-only/qemu_launcher/Makefile.toml b/fuzzers/binary_only/qemu_launcher/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/Makefile.toml
rename to fuzzers/binary_only/qemu_launcher/Makefile.toml
diff --git a/fuzzers/binary-only/qemu_launcher/README.md b/fuzzers/binary_only/qemu_launcher/README.md
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/README.md
rename to fuzzers/binary_only/qemu_launcher/README.md
diff --git a/fuzzers/binary-only/qemu_launcher/build.rs b/fuzzers/binary_only/qemu_launcher/build.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/build.rs
rename to fuzzers/binary_only/qemu_launcher/build.rs
diff --git a/fuzzers/binary-only/qemu_coverage/corpus/not_kitty.png b/fuzzers/binary_only/qemu_launcher/corpus/not_kitty.png
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/corpus/not_kitty.png
rename to fuzzers/binary_only/qemu_launcher/corpus/not_kitty.png
diff --git a/fuzzers/binary-only/qemu_coverage/corpus/not_kitty_alpha.png b/fuzzers/binary_only/qemu_launcher/corpus/not_kitty_alpha.png
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/corpus/not_kitty_alpha.png
rename to fuzzers/binary_only/qemu_launcher/corpus/not_kitty_alpha.png
diff --git a/fuzzers/binary-only/qemu_coverage/corpus/not_kitty_gamma.png b/fuzzers/binary_only/qemu_launcher/corpus/not_kitty_gamma.png
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/corpus/not_kitty_gamma.png
rename to fuzzers/binary_only/qemu_launcher/corpus/not_kitty_gamma.png
diff --git a/fuzzers/binary-only/qemu_coverage/corpus/not_kitty_icc.png b/fuzzers/binary_only/qemu_launcher/corpus/not_kitty_icc.png
similarity index 100%
rename from fuzzers/binary-only/qemu_coverage/corpus/not_kitty_icc.png
rename to fuzzers/binary_only/qemu_launcher/corpus/not_kitty_icc.png
diff --git a/fuzzers/binary-only/qemu_launcher/harness.cc b/fuzzers/binary_only/qemu_launcher/harness.cc
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/harness.cc
rename to fuzzers/binary_only/qemu_launcher/harness.cc
diff --git a/fuzzers/binary-only/qemu_launcher/injection_test/.gitignore b/fuzzers/binary_only/qemu_launcher/injection_test/.gitignore
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injection_test/.gitignore
rename to fuzzers/binary_only/qemu_launcher/injection_test/.gitignore
diff --git a/fuzzers/binary-only/qemu_launcher/injection_test/Makefile b/fuzzers/binary_only/qemu_launcher/injection_test/Makefile
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injection_test/Makefile
rename to fuzzers/binary_only/qemu_launcher/injection_test/Makefile
diff --git a/fuzzers/binary-only/qemu_launcher/injection_test/README.md b/fuzzers/binary_only/qemu_launcher/injection_test/README.md
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injection_test/README.md
rename to fuzzers/binary_only/qemu_launcher/injection_test/README.md
diff --git a/fuzzers/binary-only/qemu_launcher/injection_test/example.db b/fuzzers/binary_only/qemu_launcher/injection_test/example.db
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injection_test/example.db
rename to fuzzers/binary_only/qemu_launcher/injection_test/example.db
diff --git a/fuzzers/binary-only/qemu_launcher/injection_test/sqltest.c b/fuzzers/binary_only/qemu_launcher/injection_test/sqltest.c
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injection_test/sqltest.c
rename to fuzzers/binary_only/qemu_launcher/injection_test/sqltest.c
diff --git a/fuzzers/binary-only/qemu_launcher/injections.toml b/fuzzers/binary_only/qemu_launcher/injections.toml
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injections.toml
rename to fuzzers/binary_only/qemu_launcher/injections.toml
diff --git a/fuzzers/binary-only/qemu_launcher/injections.yaml b/fuzzers/binary_only/qemu_launcher/injections.yaml
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/injections.yaml
rename to fuzzers/binary_only/qemu_launcher/injections.yaml
diff --git a/fuzzers/binary-only/qemu_launcher/src/client.rs b/fuzzers/binary_only/qemu_launcher/src/client.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/client.rs
rename to fuzzers/binary_only/qemu_launcher/src/client.rs
diff --git a/fuzzers/binary-only/qemu_launcher/src/fuzzer.rs b/fuzzers/binary_only/qemu_launcher/src/fuzzer.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/fuzzer.rs
rename to fuzzers/binary_only/qemu_launcher/src/fuzzer.rs
diff --git a/fuzzers/binary-only/qemu_launcher/src/harness.rs b/fuzzers/binary_only/qemu_launcher/src/harness.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/harness.rs
rename to fuzzers/binary_only/qemu_launcher/src/harness.rs
diff --git a/fuzzers/binary-only/qemu_launcher/src/instance.rs b/fuzzers/binary_only/qemu_launcher/src/instance.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/instance.rs
rename to fuzzers/binary_only/qemu_launcher/src/instance.rs
diff --git a/fuzzers/binary-only/qemu_launcher/src/main.rs b/fuzzers/binary_only/qemu_launcher/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/main.rs
rename to fuzzers/binary_only/qemu_launcher/src/main.rs
diff --git a/fuzzers/binary-only/qemu_launcher/src/options.rs b/fuzzers/binary_only/qemu_launcher/src/options.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/options.rs
rename to fuzzers/binary_only/qemu_launcher/src/options.rs
diff --git a/fuzzers/binary-only/qemu_launcher/src/version.rs b/fuzzers/binary_only/qemu_launcher/src/version.rs
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/src/version.rs
rename to fuzzers/binary_only/qemu_launcher/src/version.rs
diff --git a/fuzzers/binary-only/tinyinst_simple/Cargo.toml b/fuzzers/binary_only/tinyinst_simple/Cargo.toml
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/Cargo.toml
rename to fuzzers/binary_only/tinyinst_simple/Cargo.toml
diff --git a/fuzzers/binary-only/tinyinst_simple/Makefile.toml b/fuzzers/binary_only/tinyinst_simple/Makefile.toml
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/Makefile.toml
rename to fuzzers/binary_only/tinyinst_simple/Makefile.toml
diff --git a/fuzzers/binary-only/tinyinst_simple/README.md b/fuzzers/binary_only/tinyinst_simple/README.md
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/README.md
rename to fuzzers/binary_only/tinyinst_simple/README.md
diff --git a/fuzzers/binary-only/tinyinst_simple/src/main.rs b/fuzzers/binary_only/tinyinst_simple/src/main.rs
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/src/main.rs
rename to fuzzers/binary_only/tinyinst_simple/src/main.rs
diff --git a/fuzzers/binary-only/tinyinst_simple/test/crash_input.txt b/fuzzers/binary_only/tinyinst_simple/test/crash_input.txt
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/test/crash_input.txt
rename to fuzzers/binary_only/tinyinst_simple/test/crash_input.txt
diff --git a/fuzzers/binary-only/tinyinst_simple/test/ok_input.txt b/fuzzers/binary_only/tinyinst_simple/test/ok_input.txt
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/test/ok_input.txt
rename to fuzzers/binary_only/tinyinst_simple/test/ok_input.txt
diff --git a/fuzzers/binary-only/tinyinst_simple/test/test.cpp b/fuzzers/binary_only/tinyinst_simple/test/test.cpp
similarity index 100%
rename from fuzzers/binary-only/tinyinst_simple/test/test.cpp
rename to fuzzers/binary_only/tinyinst_simple/test/test.cpp
diff --git a/fuzzers/baby/baby_fuzzer_with_forkexecutor/.gitignore b/fuzzers/forkserver/baby_fuzzer_with_forkexecutor/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_with_forkexecutor/.gitignore
rename to fuzzers/forkserver/baby_fuzzer_with_forkexecutor/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_with_forkexecutor/Cargo.toml b/fuzzers/forkserver/baby_fuzzer_with_forkexecutor/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_with_forkexecutor/Cargo.toml
rename to fuzzers/forkserver/baby_fuzzer_with_forkexecutor/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_with_forkexecutor/README.md b/fuzzers/forkserver/baby_fuzzer_with_forkexecutor/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_with_forkexecutor/README.md
rename to fuzzers/forkserver/baby_fuzzer_with_forkexecutor/README.md
diff --git a/fuzzers/baby/baby_fuzzer_with_forkexecutor/src/main.rs b/fuzzers/forkserver/baby_fuzzer_with_forkexecutor/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_with_forkexecutor/src/main.rs
rename to fuzzers/forkserver/baby_fuzzer_with_forkexecutor/src/main.rs
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/Cargo.toml b/fuzzers/full_system/nyx_libxml2_parallel/Cargo.toml
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/Cargo.toml
rename to fuzzers/full_system/nyx_libxml2_parallel/Cargo.toml
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/Makefile.toml b/fuzzers/full_system/nyx_libxml2_parallel/Makefile.toml
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/Makefile.toml
rename to fuzzers/full_system/nyx_libxml2_parallel/Makefile.toml
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/README.md b/fuzzers/full_system/nyx_libxml2_parallel/README.md
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/README.md
rename to fuzzers/full_system/nyx_libxml2_parallel/README.md
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/setup_libxml2.sh b/fuzzers/full_system/nyx_libxml2_parallel/setup_libxml2.sh
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/setup_libxml2.sh
rename to fuzzers/full_system/nyx_libxml2_parallel/setup_libxml2.sh
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/src/bin/libafl_cc.rs b/fuzzers/full_system/nyx_libxml2_parallel/src/bin/libafl_cc.rs
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/src/bin/libafl_cc.rs
rename to fuzzers/full_system/nyx_libxml2_parallel/src/bin/libafl_cc.rs
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/src/bin/libafl_cxx.rs b/fuzzers/full_system/nyx_libxml2_parallel/src/bin/libafl_cxx.rs
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/src/bin/libafl_cxx.rs
rename to fuzzers/full_system/nyx_libxml2_parallel/src/bin/libafl_cxx.rs
diff --git a/fuzzers/full-system/nyx_libxml2_parallel/src/main.rs b/fuzzers/full_system/nyx_libxml2_parallel/src/main.rs
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_parallel/src/main.rs
rename to fuzzers/full_system/nyx_libxml2_parallel/src/main.rs
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/Cargo.toml b/fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/Cargo.toml
rename to fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/Makefile.toml b/fuzzers/full_system/nyx_libxml2_standalone/Makefile.toml
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/Makefile.toml
rename to fuzzers/full_system/nyx_libxml2_standalone/Makefile.toml
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/README.md b/fuzzers/full_system/nyx_libxml2_standalone/README.md
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/README.md
rename to fuzzers/full_system/nyx_libxml2_standalone/README.md
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/setup_libxml2.sh b/fuzzers/full_system/nyx_libxml2_standalone/setup_libxml2.sh
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/setup_libxml2.sh
rename to fuzzers/full_system/nyx_libxml2_standalone/setup_libxml2.sh
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/src/bin/libafl_cc.rs b/fuzzers/full_system/nyx_libxml2_standalone/src/bin/libafl_cc.rs
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/src/bin/libafl_cc.rs
rename to fuzzers/full_system/nyx_libxml2_standalone/src/bin/libafl_cc.rs
diff --git a/fuzzers/grammar-aware/nautilus_sync/src/bin/libafl_cxx.rs b/fuzzers/full_system/nyx_libxml2_standalone/src/bin/libafl_cxx.rs
similarity index 100%
rename from fuzzers/grammar-aware/nautilus_sync/src/bin/libafl_cxx.rs
rename to fuzzers/full_system/nyx_libxml2_standalone/src/bin/libafl_cxx.rs
diff --git a/fuzzers/full-system/nyx_libxml2_standalone/src/main.rs b/fuzzers/full_system/nyx_libxml2_standalone/src/main.rs
similarity index 100%
rename from fuzzers/full-system/nyx_libxml2_standalone/src/main.rs
rename to fuzzers/full_system/nyx_libxml2_standalone/src/main.rs
diff --git a/fuzzers/full-system/qemu_baremetal/.gitignore b/fuzzers/full_system/qemu_baremetal/.gitignore
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/.gitignore
rename to fuzzers/full_system/qemu_baremetal/.gitignore
diff --git a/fuzzers/full-system/qemu_baremetal/Cargo.toml b/fuzzers/full_system/qemu_baremetal/Cargo.toml
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/Cargo.toml
rename to fuzzers/full_system/qemu_baremetal/Cargo.toml
diff --git a/fuzzers/full-system/qemu_baremetal/Makefile.toml b/fuzzers/full_system/qemu_baremetal/Makefile.toml
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/Makefile.toml
rename to fuzzers/full_system/qemu_baremetal/Makefile.toml
diff --git a/fuzzers/full-system/qemu_baremetal/README.md b/fuzzers/full_system/qemu_baremetal/README.md
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/README.md
rename to fuzzers/full_system/qemu_baremetal/README.md
diff --git a/fuzzers/full-system/qemu_baremetal/build.rs b/fuzzers/full_system/qemu_baremetal/build.rs
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/build.rs
rename to fuzzers/full_system/qemu_baremetal/build.rs
diff --git a/fuzzers/full-system/qemu_baremetal/corpus/random b/fuzzers/full_system/qemu_baremetal/corpus/random
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/corpus/random
rename to fuzzers/full_system/qemu_baremetal/corpus/random
diff --git a/fuzzers/full-system/qemu_baremetal/corpus/zero b/fuzzers/full_system/qemu_baremetal/corpus/zero
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/corpus/zero
rename to fuzzers/full_system/qemu_baremetal/corpus/zero
diff --git a/fuzzers/full-system/qemu_baremetal/example/main.c b/fuzzers/full_system/qemu_baremetal/example/main.c
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/example/main.c
rename to fuzzers/full_system/qemu_baremetal/example/main.c
diff --git a/fuzzers/full-system/qemu_baremetal/example/mps2_m3.ld b/fuzzers/full_system/qemu_baremetal/example/mps2_m3.ld
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/example/mps2_m3.ld
rename to fuzzers/full_system/qemu_baremetal/example/mps2_m3.ld
diff --git a/fuzzers/full-system/qemu_baremetal/example/startup.c b/fuzzers/full_system/qemu_baremetal/example/startup.c
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/example/startup.c
rename to fuzzers/full_system/qemu_baremetal/example/startup.c
diff --git a/fuzzers/full-system/qemu_baremetal/src/fuzzer_breakpoint.rs b/fuzzers/full_system/qemu_baremetal/src/fuzzer_breakpoint.rs
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/src/fuzzer_breakpoint.rs
rename to fuzzers/full_system/qemu_baremetal/src/fuzzer_breakpoint.rs
diff --git a/fuzzers/full-system/qemu_baremetal/src/fuzzer_low_level.rs b/fuzzers/full_system/qemu_baremetal/src/fuzzer_low_level.rs
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/src/fuzzer_low_level.rs
rename to fuzzers/full_system/qemu_baremetal/src/fuzzer_low_level.rs
diff --git a/fuzzers/full-system/qemu_baremetal/src/fuzzer_sync_exit.rs b/fuzzers/full_system/qemu_baremetal/src/fuzzer_sync_exit.rs
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/src/fuzzer_sync_exit.rs
rename to fuzzers/full_system/qemu_baremetal/src/fuzzer_sync_exit.rs
diff --git a/fuzzers/full-system/qemu_baremetal/src/main.rs b/fuzzers/full_system/qemu_baremetal/src/main.rs
similarity index 100%
rename from fuzzers/full-system/qemu_baremetal/src/main.rs
rename to fuzzers/full_system/qemu_baremetal/src/main.rs
diff --git a/fuzzers/full-system/qemu_linux_kernel/.gitignore b/fuzzers/full_system/qemu_linux_kernel/.gitignore
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/.gitignore
rename to fuzzers/full_system/qemu_linux_kernel/.gitignore
diff --git a/fuzzers/full-system/qemu_linux_kernel/Cargo.toml b/fuzzers/full_system/qemu_linux_kernel/Cargo.toml
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/Cargo.toml
rename to fuzzers/full_system/qemu_linux_kernel/Cargo.toml
diff --git a/fuzzers/full-system/qemu_linux_kernel/Makefile.toml b/fuzzers/full_system/qemu_linux_kernel/Makefile.toml
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/Makefile.toml
rename to fuzzers/full_system/qemu_linux_kernel/Makefile.toml
diff --git a/fuzzers/full-system/qemu_linux_kernel/README.md b/fuzzers/full_system/qemu_linux_kernel/README.md
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/README.md
rename to fuzzers/full_system/qemu_linux_kernel/README.md
diff --git a/fuzzers/full-system/qemu_linux_kernel/build.rs b/fuzzers/full_system/qemu_linux_kernel/build.rs
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/build.rs
rename to fuzzers/full_system/qemu_linux_kernel/build.rs
diff --git a/fuzzers/full-system/qemu_linux_kernel/corpus/random b/fuzzers/full_system/qemu_linux_kernel/corpus/random
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/corpus/random
rename to fuzzers/full_system/qemu_linux_kernel/corpus/random
diff --git a/fuzzers/full-system/qemu_linux_kernel/corpus/zero b/fuzzers/full_system/qemu_linux_kernel/corpus/zero
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/corpus/zero
rename to fuzzers/full_system/qemu_linux_kernel/corpus/zero
diff --git a/fuzzers/full-system/qemu_linux_kernel/runtime/entrypoint.sh b/fuzzers/full_system/qemu_linux_kernel/runtime/entrypoint.sh
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/runtime/entrypoint.sh
rename to fuzzers/full_system/qemu_linux_kernel/runtime/entrypoint.sh
diff --git a/fuzzers/full-system/qemu_linux_kernel/setup/Makefile b/fuzzers/full_system/qemu_linux_kernel/setup/Makefile
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/setup/Makefile
rename to fuzzers/full_system/qemu_linux_kernel/setup/Makefile
diff --git a/fuzzers/full-system/qemu_linux_kernel/setup/harness.c b/fuzzers/full_system/qemu_linux_kernel/setup/harness.c
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/setup/harness.c
rename to fuzzers/full_system/qemu_linux_kernel/setup/harness.c
diff --git a/fuzzers/full-system/qemu_linux_kernel/setup/setup.sh b/fuzzers/full_system/qemu_linux_kernel/setup/setup.sh
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/setup/setup.sh
rename to fuzzers/full_system/qemu_linux_kernel/setup/setup.sh
diff --git a/fuzzers/full-system/qemu_linux_kernel/setup/user.c b/fuzzers/full_system/qemu_linux_kernel/setup/user.c
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/setup/user.c
rename to fuzzers/full_system/qemu_linux_kernel/setup/user.c
diff --git a/fuzzers/full-system/qemu_linux_kernel/setup/x509-parser.h b/fuzzers/full_system/qemu_linux_kernel/setup/x509-parser.h
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/setup/x509-parser.h
rename to fuzzers/full_system/qemu_linux_kernel/setup/x509-parser.h
diff --git a/fuzzers/full-system/qemu_linux_kernel/src/fuzzer.rs b/fuzzers/full_system/qemu_linux_kernel/src/fuzzer.rs
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/src/fuzzer.rs
rename to fuzzers/full_system/qemu_linux_kernel/src/fuzzer.rs
diff --git a/fuzzers/full-system/qemu_linux_kernel/src/main.rs b/fuzzers/full_system/qemu_linux_kernel/src/main.rs
similarity index 100%
rename from fuzzers/full-system/qemu_linux_kernel/src/main.rs
rename to fuzzers/full_system/qemu_linux_kernel/src/main.rs
diff --git a/fuzzers/full-system/qemu_linux_process/.gitignore b/fuzzers/full_system/qemu_linux_process/.gitignore
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/.gitignore
rename to fuzzers/full_system/qemu_linux_process/.gitignore
diff --git a/fuzzers/full-system/qemu_linux_process/Cargo.toml b/fuzzers/full_system/qemu_linux_process/Cargo.toml
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/Cargo.toml
rename to fuzzers/full_system/qemu_linux_process/Cargo.toml
diff --git a/fuzzers/full-system/qemu_linux_process/Makefile.toml b/fuzzers/full_system/qemu_linux_process/Makefile.toml
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/Makefile.toml
rename to fuzzers/full_system/qemu_linux_process/Makefile.toml
diff --git a/fuzzers/full-system/qemu_linux_process/README.md b/fuzzers/full_system/qemu_linux_process/README.md
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/README.md
rename to fuzzers/full_system/qemu_linux_process/README.md
diff --git a/fuzzers/full-system/qemu_linux_process/build.rs b/fuzzers/full_system/qemu_linux_process/build.rs
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/build.rs
rename to fuzzers/full_system/qemu_linux_process/build.rs
diff --git a/fuzzers/full-system/qemu_linux_process/corpus/random b/fuzzers/full_system/qemu_linux_process/corpus/random
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/corpus/random
rename to fuzzers/full_system/qemu_linux_process/corpus/random
diff --git a/fuzzers/full-system/qemu_linux_process/corpus/zero b/fuzzers/full_system/qemu_linux_process/corpus/zero
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/corpus/zero
rename to fuzzers/full_system/qemu_linux_process/corpus/zero
diff --git a/fuzzers/full-system/qemu_linux_process/example/harness.c b/fuzzers/full_system/qemu_linux_process/example/harness.c
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/example/harness.c
rename to fuzzers/full_system/qemu_linux_process/example/harness.c
diff --git a/fuzzers/full-system/qemu_linux_process/runtime/entrypoint.sh b/fuzzers/full_system/qemu_linux_process/runtime/entrypoint.sh
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/runtime/entrypoint.sh
rename to fuzzers/full_system/qemu_linux_process/runtime/entrypoint.sh
diff --git a/fuzzers/full-system/qemu_linux_process/setup/setup.sh b/fuzzers/full_system/qemu_linux_process/setup/setup.sh
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/setup/setup.sh
rename to fuzzers/full_system/qemu_linux_process/setup/setup.sh
diff --git a/fuzzers/full-system/qemu_linux_process/src/fuzzer.rs b/fuzzers/full_system/qemu_linux_process/src/fuzzer.rs
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/src/fuzzer.rs
rename to fuzzers/full_system/qemu_linux_process/src/fuzzer.rs
diff --git a/fuzzers/full-system/qemu_linux_process/src/main.rs b/fuzzers/full_system/qemu_linux_process/src/main.rs
similarity index 100%
rename from fuzzers/full-system/qemu_linux_process/src/main.rs
rename to fuzzers/full_system/qemu_linux_process/src/main.rs
diff --git a/fuzzers/baby/baby_fuzzer_wasm/.cargo/config.toml b/fuzzers/fuzz_anything/baby_fuzzer_wasm/.cargo/config.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/.cargo/config.toml
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/.cargo/config.toml
diff --git a/fuzzers/baby/baby_fuzzer_wasm/.gitignore b/fuzzers/fuzz_anything/baby_fuzzer_wasm/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/.gitignore
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_wasm/Cargo.toml b/fuzzers/fuzz_anything/baby_fuzzer_wasm/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/Cargo.toml
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_wasm/Makefile.toml b/fuzzers/fuzz_anything/baby_fuzzer_wasm/Makefile.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/Makefile.toml
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/Makefile.toml
diff --git a/fuzzers/baby/baby_fuzzer_wasm/README.md b/fuzzers/fuzz_anything/baby_fuzzer_wasm/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/README.md
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/README.md
diff --git a/fuzzers/baby/baby_fuzzer_wasm/src/lib.rs b/fuzzers/fuzz_anything/baby_fuzzer_wasm/src/lib.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/src/lib.rs
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/src/lib.rs
diff --git a/fuzzers/baby/baby_fuzzer_wasm/src/utils.rs b/fuzzers/fuzz_anything/baby_fuzzer_wasm/src/utils.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/src/utils.rs
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/src/utils.rs
diff --git a/fuzzers/baby/baby_fuzzer_wasm/tests/web.rs b/fuzzers/fuzz_anything/baby_fuzzer_wasm/tests/web.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/tests/web.rs
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/tests/web.rs
diff --git a/fuzzers/baby/baby_fuzzer_wasm/webdriver.json b/fuzzers/fuzz_anything/baby_fuzzer_wasm/webdriver.json
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_wasm/webdriver.json
rename to fuzzers/fuzz_anything/baby_fuzzer_wasm/webdriver.json
diff --git a/fuzzers/baby/baby_fuzzer_multi/.gitignore b/fuzzers/fuzz_anything/baby_no_std/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_multi/.gitignore
rename to fuzzers/fuzz_anything/baby_no_std/.gitignore
diff --git a/fuzzers/baby/baby_no_std/Cargo.toml b/fuzzers/fuzz_anything/baby_no_std/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_no_std/Cargo.toml
rename to fuzzers/fuzz_anything/baby_no_std/Cargo.toml
diff --git a/fuzzers/baby/baby_no_std/Makefile.toml b/fuzzers/fuzz_anything/baby_no_std/Makefile.toml
similarity index 100%
rename from fuzzers/baby/baby_no_std/Makefile.toml
rename to fuzzers/fuzz_anything/baby_no_std/Makefile.toml
diff --git a/fuzzers/baby/baby_no_std/README.md b/fuzzers/fuzz_anything/baby_no_std/README.md
similarity index 100%
rename from fuzzers/baby/baby_no_std/README.md
rename to fuzzers/fuzz_anything/baby_no_std/README.md
diff --git a/fuzzers/baby/baby_no_std/build.rs b/fuzzers/fuzz_anything/baby_no_std/build.rs
similarity index 100%
rename from fuzzers/baby/baby_no_std/build.rs
rename to fuzzers/fuzz_anything/baby_no_std/build.rs
diff --git a/fuzzers/grammar-aware/nautilus_sync/rust-toolchain b/fuzzers/fuzz_anything/baby_no_std/rust-toolchain
similarity index 100%
rename from fuzzers/grammar-aware/nautilus_sync/rust-toolchain
rename to fuzzers/fuzz_anything/baby_no_std/rust-toolchain
diff --git a/fuzzers/baby/baby_no_std/src/main.rs b/fuzzers/fuzz_anything/baby_no_std/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_no_std/src/main.rs
rename to fuzzers/fuzz_anything/baby_no_std/src/main.rs
diff --git a/fuzzers/inprocess/cargo_fuzz/Cargo.toml b/fuzzers/fuzz_anything/cargo_fuzz/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/Cargo.toml
rename to fuzzers/fuzz_anything/cargo_fuzz/Cargo.toml
diff --git a/fuzzers/inprocess/cargo_fuzz/Makefile.toml b/fuzzers/fuzz_anything/cargo_fuzz/Makefile.toml
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/Makefile.toml
rename to fuzzers/fuzz_anything/cargo_fuzz/Makefile.toml
diff --git a/fuzzers/inprocess/cargo_fuzz/README.md b/fuzzers/fuzz_anything/cargo_fuzz/README.md
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/README.md
rename to fuzzers/fuzz_anything/cargo_fuzz/README.md
diff --git a/fuzzers/inprocess/cargo_fuzz/fuzz/.gitignore b/fuzzers/fuzz_anything/cargo_fuzz/fuzz/.gitignore
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/fuzz/.gitignore
rename to fuzzers/fuzz_anything/cargo_fuzz/fuzz/.gitignore
diff --git a/fuzzers/inprocess/cargo_fuzz/fuzz/Cargo.toml b/fuzzers/fuzz_anything/cargo_fuzz/fuzz/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/fuzz/Cargo.toml
rename to fuzzers/fuzz_anything/cargo_fuzz/fuzz/Cargo.toml
diff --git a/fuzzers/inprocess/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs b/fuzzers/fuzz_anything/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs
rename to fuzzers/fuzz_anything/cargo_fuzz/fuzz/fuzz_targets/fuzz_target_1.rs
diff --git a/fuzzers/inprocess/cargo_fuzz/src/lib.rs b/fuzzers/fuzz_anything/cargo_fuzz/src/lib.rs
similarity index 100%
rename from fuzzers/inprocess/cargo_fuzz/src/lib.rs
rename to fuzzers/fuzz_anything/cargo_fuzz/src/lib.rs
diff --git a/fuzzers/others/libafl_atheris/.gitignore b/fuzzers/fuzz_anything/libafl_atheris/.gitignore
similarity index 100%
rename from fuzzers/others/libafl_atheris/.gitignore
rename to fuzzers/fuzz_anything/libafl_atheris/.gitignore
diff --git a/fuzzers/others/libafl_atheris/Cargo.toml b/fuzzers/fuzz_anything/libafl_atheris/Cargo.toml
similarity index 100%
rename from fuzzers/others/libafl_atheris/Cargo.toml
rename to fuzzers/fuzz_anything/libafl_atheris/Cargo.toml
diff --git a/fuzzers/others/libafl_atheris/Makefile b/fuzzers/fuzz_anything/libafl_atheris/Makefile
similarity index 100%
rename from fuzzers/others/libafl_atheris/Makefile
rename to fuzzers/fuzz_anything/libafl_atheris/Makefile
diff --git a/fuzzers/others/libafl_atheris/README.md b/fuzzers/fuzz_anything/libafl_atheris/README.md
similarity index 100%
rename from fuzzers/others/libafl_atheris/README.md
rename to fuzzers/fuzz_anything/libafl_atheris/README.md
diff --git a/fuzzers/others/libafl_atheris/src/lib.rs b/fuzzers/fuzz_anything/libafl_atheris/src/lib.rs
similarity index 100%
rename from fuzzers/others/libafl_atheris/src/lib.rs
rename to fuzzers/fuzz_anything/libafl_atheris/src/lib.rs
diff --git a/fuzzers/baby/baby_fuzzer_nautilus/.gitignore b/fuzzers/fuzz_anything/push_harness/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_nautilus/.gitignore
rename to fuzzers/fuzz_anything/push_harness/.gitignore
diff --git a/fuzzers/inprocess/push_harness/Cargo.toml b/fuzzers/fuzz_anything/push_harness/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/push_harness/Cargo.toml
rename to fuzzers/fuzz_anything/push_harness/Cargo.toml
diff --git a/fuzzers/inprocess/push_harness/README.md b/fuzzers/fuzz_anything/push_harness/README.md
similarity index 100%
rename from fuzzers/inprocess/push_harness/README.md
rename to fuzzers/fuzz_anything/push_harness/README.md
diff --git a/fuzzers/inprocess/push_harness/src/main.rs b/fuzzers/fuzz_anything/push_harness/src/main.rs
similarity index 100%
rename from fuzzers/inprocess/push_harness/src/main.rs
rename to fuzzers/fuzz_anything/push_harness/src/main.rs
diff --git a/fuzzers/baby/baby_fuzzer_tokens/.gitignore b/fuzzers/fuzz_anything/push_stage_harness/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_tokens/.gitignore
rename to fuzzers/fuzz_anything/push_stage_harness/.gitignore
diff --git a/fuzzers/inprocess/push_stage_harness/Cargo.toml b/fuzzers/fuzz_anything/push_stage_harness/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/push_stage_harness/Cargo.toml
rename to fuzzers/fuzz_anything/push_stage_harness/Cargo.toml
diff --git a/fuzzers/inprocess/push_stage_harness/README.md b/fuzzers/fuzz_anything/push_stage_harness/README.md
similarity index 100%
rename from fuzzers/inprocess/push_stage_harness/README.md
rename to fuzzers/fuzz_anything/push_stage_harness/README.md
diff --git a/fuzzers/inprocess/push_stage_harness/src/main.rs b/fuzzers/fuzz_anything/push_stage_harness/src/main.rs
similarity index 100%
rename from fuzzers/inprocess/push_stage_harness/src/main.rs
rename to fuzzers/fuzz_anything/push_stage_harness/src/main.rs
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png b/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png
deleted file mode 100644
index eff7c1707b..0000000000
Binary files a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png and /dev/null differ
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png b/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png
deleted file mode 100644
index 2fb8da2c8f..0000000000
Binary files a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png and /dev/null differ
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png b/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png
deleted file mode 100644
index 939d9d29a9..0000000000
Binary files a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png and /dev/null differ
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png b/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png
deleted file mode 100644
index f0c7804d99..0000000000
Binary files a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png and /dev/null differ
diff --git a/fuzzers/baby/baby_fuzzer_custom_input/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_custom_input/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_custom_input/Cargo.toml
rename to fuzzers/structure_aware/baby_fuzzer_custom_input/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_custom_input/README.md b/fuzzers/structure_aware/baby_fuzzer_custom_input/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_custom_input/README.md
rename to fuzzers/structure_aware/baby_fuzzer_custom_input/README.md
diff --git a/fuzzers/baby/baby_fuzzer_custom_input/src/input.rs b/fuzzers/structure_aware/baby_fuzzer_custom_input/src/input.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_custom_input/src/input.rs
rename to fuzzers/structure_aware/baby_fuzzer_custom_input/src/input.rs
diff --git a/fuzzers/baby/baby_fuzzer_custom_input/src/main.rs b/fuzzers/structure_aware/baby_fuzzer_custom_input/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_custom_input/src/main.rs
rename to fuzzers/structure_aware/baby_fuzzer_custom_input/src/main.rs
diff --git a/fuzzers/baby/baby_no_std/.gitignore b/fuzzers/structure_aware/baby_fuzzer_gramatron/.gitignore
similarity index 100%
rename from fuzzers/baby/baby_no_std/.gitignore
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_gramatron/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/Cargo.toml
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/README.md b/fuzzers/structure_aware/baby_fuzzer_gramatron/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/README.md
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/README.md
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/auto.json b/fuzzers/structure_aware/baby_fuzzer_gramatron/auto.json
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/auto.json
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/auto.json
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/auto.postcard b/fuzzers/structure_aware/baby_fuzzer_gramatron/auto.postcard
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/auto.postcard
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/auto.postcard
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/corpus/new file b/fuzzers/structure_aware/baby_fuzzer_gramatron/corpus/new file
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/corpus/new file
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/corpus/new file
diff --git a/fuzzers/baby/baby_fuzzer_gramatron/src/main.rs b/fuzzers/structure_aware/baby_fuzzer_gramatron/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_gramatron/src/main.rs
rename to fuzzers/structure_aware/baby_fuzzer_gramatron/src/main.rs
diff --git a/fuzzers/binary-only/fuzzbench_fork_qemu/.gitignore b/fuzzers/structure_aware/baby_fuzzer_grimoire/.gitignore
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_fork_qemu/.gitignore
rename to fuzzers/structure_aware/baby_fuzzer_grimoire/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_grimoire/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_grimoire/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_grimoire/Cargo.toml
rename to fuzzers/structure_aware/baby_fuzzer_grimoire/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_grimoire/README.md b/fuzzers/structure_aware/baby_fuzzer_grimoire/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_grimoire/README.md
rename to fuzzers/structure_aware/baby_fuzzer_grimoire/README.md
diff --git a/fuzzers/baby/baby_fuzzer_grimoire/corpus/new file b/fuzzers/structure_aware/baby_fuzzer_grimoire/corpus/new file
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_grimoire/corpus/new file
rename to fuzzers/structure_aware/baby_fuzzer_grimoire/corpus/new file
diff --git a/fuzzers/baby/baby_fuzzer_grimoire/src/main.rs b/fuzzers/structure_aware/baby_fuzzer_grimoire/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_grimoire/src/main.rs
rename to fuzzers/structure_aware/baby_fuzzer_grimoire/src/main.rs
diff --git a/fuzzers/binary-only/fuzzbench_qemu/.gitignore b/fuzzers/structure_aware/baby_fuzzer_multi/.gitignore
similarity index 100%
rename from fuzzers/binary-only/fuzzbench_qemu/.gitignore
rename to fuzzers/structure_aware/baby_fuzzer_multi/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_multi/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_multi/Cargo.toml
rename to fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_multi/README.md b/fuzzers/structure_aware/baby_fuzzer_multi/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_multi/README.md
rename to fuzzers/structure_aware/baby_fuzzer_multi/README.md
diff --git a/fuzzers/baby/baby_fuzzer_multi/src/main.rs b/fuzzers/structure_aware/baby_fuzzer_multi/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_multi/src/main.rs
rename to fuzzers/structure_aware/baby_fuzzer_multi/src/main.rs
diff --git a/fuzzers/inprocess/push_harness/.gitignore b/fuzzers/structure_aware/baby_fuzzer_nautilus/.gitignore
similarity index 100%
rename from fuzzers/inprocess/push_harness/.gitignore
rename to fuzzers/structure_aware/baby_fuzzer_nautilus/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_nautilus/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_nautilus/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_nautilus/Cargo.toml
rename to fuzzers/structure_aware/baby_fuzzer_nautilus/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_nautilus/README.md b/fuzzers/structure_aware/baby_fuzzer_nautilus/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_nautilus/README.md
rename to fuzzers/structure_aware/baby_fuzzer_nautilus/README.md
diff --git a/fuzzers/baby/baby_fuzzer_nautilus/grammar.json b/fuzzers/structure_aware/baby_fuzzer_nautilus/grammar.json
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_nautilus/grammar.json
rename to fuzzers/structure_aware/baby_fuzzer_nautilus/grammar.json
diff --git a/fuzzers/baby/baby_fuzzer_nautilus/src/main.rs b/fuzzers/structure_aware/baby_fuzzer_nautilus/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_nautilus/src/main.rs
rename to fuzzers/structure_aware/baby_fuzzer_nautilus/src/main.rs
diff --git a/fuzzers/inprocess/push_stage_harness/.gitignore b/fuzzers/structure_aware/baby_fuzzer_tokens/.gitignore
similarity index 100%
rename from fuzzers/inprocess/push_stage_harness/.gitignore
rename to fuzzers/structure_aware/baby_fuzzer_tokens/.gitignore
diff --git a/fuzzers/baby/baby_fuzzer_tokens/Cargo.toml b/fuzzers/structure_aware/baby_fuzzer_tokens/Cargo.toml
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_tokens/Cargo.toml
rename to fuzzers/structure_aware/baby_fuzzer_tokens/Cargo.toml
diff --git a/fuzzers/baby/baby_fuzzer_tokens/README.md b/fuzzers/structure_aware/baby_fuzzer_tokens/README.md
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_tokens/README.md
rename to fuzzers/structure_aware/baby_fuzzer_tokens/README.md
diff --git a/fuzzers/baby/baby_fuzzer_tokens/corpus/new file b/fuzzers/structure_aware/baby_fuzzer_tokens/corpus/new file
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_tokens/corpus/new file
rename to fuzzers/structure_aware/baby_fuzzer_tokens/corpus/new file
diff --git a/fuzzers/baby/baby_fuzzer_tokens/src/main.rs b/fuzzers/structure_aware/baby_fuzzer_tokens/src/main.rs
similarity index 100%
rename from fuzzers/baby/baby_fuzzer_tokens/src/main.rs
rename to fuzzers/structure_aware/baby_fuzzer_tokens/src/main.rs
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/Makefile.toml b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/Makefile.toml
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/Makefile.toml
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/Makefile.toml
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/README.md b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/README.md
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/README.md
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/README.md
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/.gitignore b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/.gitignore
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/.gitignore
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/.gitignore
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/Cargo.toml
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/build.rs b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/build.rs
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/build.rs
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/build.rs
diff --git a/fuzzers/binary-only/qemu_launcher/corpus/not_kitty.png b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/corpus/not_kitty.png
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty.png
diff --git a/fuzzers/binary-only/qemu_launcher/corpus/not_kitty_alpha.png b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/corpus/not_kitty_alpha.png
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_alpha.png
diff --git a/fuzzers/binary-only/qemu_launcher/corpus/not_kitty_gamma.png b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/corpus/not_kitty_gamma.png
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_gamma.png
diff --git a/fuzzers/binary-only/qemu_launcher/corpus/not_kitty_icc.png b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png
similarity index 100%
rename from fuzzers/binary-only/qemu_launcher/corpus/not_kitty_icc.png
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/corpus/not_kitty_icc.png
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/harness.c b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/harness.c
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/harness.c
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/harness.c
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/harness_symcc.c
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/src/main.rs b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/src/main.rs
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/src/main.rs
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/src/main.rs
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/stb_image.h b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/stb_image.h
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/fuzzer/stb_image.h
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/fuzzer/stb_image.h
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/runtime/Cargo.toml b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/runtime/Cargo.toml
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/runtime/Cargo.toml
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/runtime/Cargo.toml
diff --git a/fuzzers/inprocess/libfuzzer_stb_image_concolic/runtime/src/lib.rs b/fuzzers/structure_aware/libfuzzer_stb_image_concolic/runtime/src/lib.rs
similarity index 100%
rename from fuzzers/inprocess/libfuzzer_stb_image_concolic/runtime/src/lib.rs
rename to fuzzers/structure_aware/libfuzzer_stb_image_concolic/runtime/src/lib.rs
diff --git a/fuzzers/grammar-aware/nautilus_sync/.gitignore b/fuzzers/structure_aware/nautilus_sync/.gitignore
similarity index 100%
rename from fuzzers/grammar-aware/nautilus_sync/.gitignore
rename to fuzzers/structure_aware/nautilus_sync/.gitignore
diff --git a/fuzzers/grammar-aware/nautilus_sync/Cargo.toml b/fuzzers/structure_aware/nautilus_sync/Cargo.toml
similarity index 100%
rename from fuzzers/grammar-aware/nautilus_sync/Cargo.toml
rename to fuzzers/structure_aware/nautilus_sync/Cargo.toml
diff --git a/fuzzers/grammar-aware/nautilus_sync/Makefile.toml b/fuzzers/structure_aware/nautilus_sync/Makefile.toml
similarity index 98%
rename from fuzzers/grammar-aware/nautilus_sync/Makefile.toml
rename to fuzzers/structure_aware/nautilus_sync/Makefile.toml
index 242b92026a..acf021f9b5 100644
--- a/fuzzers/grammar-aware/nautilus_sync/Makefile.toml
+++ b/fuzzers/structure_aware/nautilus_sync/Makefile.toml
@@ -63,7 +63,7 @@ script_runner = "@shell"
 script = '''
 cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
 cd "${PROJECT_DIR}"
-cp ../../baby/baby_fuzzer_nautilus/grammar.json .
+cp ../../structure-aware/baby_fuzzer_nautilus/grammar.json .
 make -C libpng-1.6.37 CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx"
 '''
 dependencies = ["libpng", "cxx", "cc"]
diff --git a/fuzzers/inprocess/tutorial/rust-toolchain b/fuzzers/structure_aware/nautilus_sync/rust-toolchain
similarity index 100%
rename from fuzzers/inprocess/tutorial/rust-toolchain
rename to fuzzers/structure_aware/nautilus_sync/rust-toolchain
diff --git a/fuzzers/grammar-aware/nautilus_sync/src/bin/libafl_cc.rs b/fuzzers/structure_aware/nautilus_sync/src/bin/libafl_cc.rs
similarity index 100%
rename from fuzzers/grammar-aware/nautilus_sync/src/bin/libafl_cc.rs
rename to fuzzers/structure_aware/nautilus_sync/src/bin/libafl_cc.rs
diff --git a/fuzzers/inprocess/tutorial/src/bin/libafl_cxx.rs b/fuzzers/structure_aware/nautilus_sync/src/bin/libafl_cxx.rs
similarity index 100%
rename from fuzzers/inprocess/tutorial/src/bin/libafl_cxx.rs
rename to fuzzers/structure_aware/nautilus_sync/src/bin/libafl_cxx.rs
diff --git a/fuzzers/grammar-aware/nautilus_sync/src/lib.rs b/fuzzers/structure_aware/nautilus_sync/src/lib.rs
similarity index 100%
rename from fuzzers/grammar-aware/nautilus_sync/src/lib.rs
rename to fuzzers/structure_aware/nautilus_sync/src/lib.rs