diff --git a/REVIEWERS b/REVIEWERS
index 3d630d31a03d5b43a5329343e37e3b7459b1916c..b0ccf3835c37b254eda0560bef3f0e661f25ce48 100644
--- a/REVIEWERS
+++ b/REVIEWERS
@@ -13,24 +13,18 @@
 
 * @dmitriitr @Prof1983 @igelhaus @ragnvald
 
-# MemoryConcurrency
-/runtime/mem/          @dmitriitr
-/runtime/async/*async* @dmitriitr
-/runtime/tests/mem/    @dmitriitr
-
-# Compiler
-/compiler/            @Prof1983
-/irtoc_scripts/       @Prof1983
-/runtime/asm_defines/ @Prof1983
-/runtime/bridge/      @Prof1983
-/runtime/compiler/    @Prof1983
-
-# Runtime
-/assembler/          @igelhaus
-/bytecode_optimizer/ @igelhaus
-/isa/                @igelhaus
-/libpandabase/       @igelhaus
-/runtime/            @igelhaus
-
-# Tools
-runtime/tooling/ @ragnvald
\ No newline at end of file
+/assembler/             @igelhaus
+/bytecode_optimizer/    @igelhaus
+/compiler/              @Prof1983
+/irtoc_scripts/         @Prof1983
+/isa/                   @igelhaus
+/libpandabase/          @igelhaus
+/runtime/               @igelhaus
+/runtime/asm_defines/   @Prof1983
+/runtime/async/*async*  @dmitriitr
+/runtime/bridge/        @Prof1983
+/runtime/compiler/      @Prof1983
+/runtime/mem/           @dmitriitr
+/runtime/tooling/       @ragnvald
+/runtime/tests/mem/     @dmitriitr
+/tests/runtime/tooling/ @ragnvald