diff --git a/packages/addons/debug/tools/evtest/addon b/packages/addons/debugging/tools/evtest/addon
similarity index 100%
rename from packages/addons/debug/tools/evtest/addon
rename to packages/addons/debugging/tools/evtest/addon
diff --git a/packages/addons/debug/tools/evtest/build b/packages/addons/debugging/tools/evtest/build
similarity index 100%
rename from packages/addons/debug/tools/evtest/build
rename to packages/addons/debugging/tools/evtest/build
diff --git a/packages/addons/debug/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt
similarity index 100%
rename from packages/addons/debug/tools/evtest/changelog.txt
rename to packages/addons/debugging/tools/evtest/changelog.txt
diff --git a/packages/addons/debug/tools/evtest/icon/icon.png b/packages/addons/debugging/tools/evtest/icon/icon.png
similarity index 100%
rename from packages/addons/debug/tools/evtest/icon/icon.png
rename to packages/addons/debugging/tools/evtest/icon/icon.png
diff --git a/packages/addons/debug/tools/evtest/meta b/packages/addons/debugging/tools/evtest/meta
similarity index 100%
rename from packages/addons/debug/tools/evtest/meta
rename to packages/addons/debugging/tools/evtest/meta
diff --git a/packages/addons/debug/tools/evtest/source/default.py b/packages/addons/debugging/tools/evtest/source/default.py
similarity index 100%
rename from packages/addons/debug/tools/evtest/source/default.py
rename to packages/addons/debugging/tools/evtest/source/default.py
diff --git a/packages/addons/debug/tools/htop/addon b/packages/addons/debugging/tools/htop/addon
similarity index 100%
rename from packages/addons/debug/tools/htop/addon
rename to packages/addons/debugging/tools/htop/addon
diff --git a/packages/addons/debug/tools/htop/build b/packages/addons/debugging/tools/htop/build
similarity index 100%
rename from packages/addons/debug/tools/htop/build
rename to packages/addons/debugging/tools/htop/build
diff --git a/packages/addons/debug/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
similarity index 100%
rename from packages/addons/debug/tools/htop/changelog.txt
rename to packages/addons/debugging/tools/htop/changelog.txt
diff --git a/packages/addons/debug/tools/htop/icon/icon.png b/packages/addons/debugging/tools/htop/icon/icon.png
similarity index 100%
rename from packages/addons/debug/tools/htop/icon/icon.png
rename to packages/addons/debugging/tools/htop/icon/icon.png
diff --git a/packages/addons/debug/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
similarity index 100%
rename from packages/addons/debug/tools/htop/meta
rename to packages/addons/debugging/tools/htop/meta
diff --git a/packages/addons/debug/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch b/packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
similarity index 100%
rename from packages/addons/debug/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
rename to packages/addons/debugging/tools/htop/patches/htop-0.9-crosscompiling-0.1.patch
diff --git a/packages/addons/debug/tools/htop/source/default.py b/packages/addons/debugging/tools/htop/source/default.py
similarity index 100%
rename from packages/addons/debug/tools/htop/source/default.py
rename to packages/addons/debugging/tools/htop/source/default.py