diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 2bf79381c9..a23ed67bbb 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -358,18 +358,18 @@ tup.append_table(img_files, {
  {"CPUID", PROGS .. "/system/cpuid/trunk/CPUID"},
  {"DOCPACK", PROGS .. "/system/docpack/trunk/docpack"},
  {"DEFAULT.SKN", "../skins/Leency/Shkvorka/Shkvorka.skn"},
- {"DISPTEST", PROGS .. "/system/disptest/trunk/disptest"},
+ {"DISPTEST", PROGS .. "/testing/disptest/trunk/disptest"},
  {"END", PROGS .. "/system/end/light/end"},
  {"ESKIN", PROGS .. "/system/eskin/trunk/eskin"},
- {"FSPEED", PROGS .. "/fs/fspeed/fspeed"},
+ {"FSPEED", PROGS .. "/testing/fspeed/fspeed"},
  {"GMON", PROGS .. "/system/gmon/gmon"},
  {"HDD_INFO", PROGS .. "/system/hdd_info/trunk/hdd_info"},
- {"KBD", PROGS .. "/system/kbd/trunk/kbd"},
+ {"KBD", PROGS .. "/testing/kbd/trunk/kbd"},
  {"KPACK", PROGS .. "/other/kpack/trunk/kpack"},
  {"LAUNCHER", PROGS .. "/system/launcher/trunk/launcher"},
  {"LOADDRV", PROGS .. "/system/loaddrv/loaddrv"},
  {"MAGNIFY", PROGS .. "/demos/magnify/trunk/magnify"},
- {"MGB", PROGS .. "/system/mgb/trunk/mgb"},
+ {"MGB", PROGS .. "/testing/mgb/trunk/mgb"},
  {"MOUSEMUL", PROGS .. "/system/mousemul/trunk/mousemul"},
  {"MADMOUSE", PROGS .. "/other/madmouse/madmouse"},
  {"MYKEY", PROGS .. "/system/MyKey/trunk/MyKey"},
@@ -381,7 +381,7 @@ tup.append_table(img_files, {
  {"SETUP", PROGS .. "/system/setup/trunk/setup"},
  {"SKINCFG", PROGS .. "/system/skincfg/trunk/skincfg"},
  {"TERMINAL", PROGS .. "/system/terminal/terminal"},
- {"TEST", PROGS .. "/system/test/trunk/test"},
+ {"TEST", PROGS .. "/testing/test/trunk/protection"},
  {"TINYPAD", PROGS .. "/develop/tinypad/trunk/tinypad"},
  {"UNZ", PROGS .. "/fs/unz/unz"},
  {"ZKEY", PROGS .. "/system/zkey/trunk/ZKEY"},
diff --git a/programs/system/disptest/trunk/Tupfile.lua b/programs/testing/disptest/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/disptest/trunk/Tupfile.lua
rename to programs/testing/disptest/trunk/Tupfile.lua
diff --git a/programs/system/disptest/trunk/build_en.bat b/programs/testing/disptest/trunk/build_en.bat
similarity index 100%
rename from programs/system/disptest/trunk/build_en.bat
rename to programs/testing/disptest/trunk/build_en.bat
diff --git a/programs/system/disptest/trunk/build_ru.bat b/programs/testing/disptest/trunk/build_ru.bat
similarity index 100%
rename from programs/system/disptest/trunk/build_ru.bat
rename to programs/testing/disptest/trunk/build_ru.bat
diff --git a/programs/system/disptest/trunk/disptest.ASM b/programs/testing/disptest/trunk/disptest.ASM
similarity index 100%
rename from programs/system/disptest/trunk/disptest.ASM
rename to programs/testing/disptest/trunk/disptest.ASM
diff --git a/programs/system/disptest/trunk/readme.txt b/programs/testing/disptest/trunk/readme.txt
similarity index 100%
rename from programs/system/disptest/trunk/readme.txt
rename to programs/testing/disptest/trunk/readme.txt
diff --git a/programs/fs/fspeed/Tupfile.lua b/programs/testing/fspeed/Tupfile.lua
similarity index 100%
rename from programs/fs/fspeed/Tupfile.lua
rename to programs/testing/fspeed/Tupfile.lua
diff --git a/programs/fs/fspeed/build_en.bat b/programs/testing/fspeed/build_en.bat
similarity index 100%
rename from programs/fs/fspeed/build_en.bat
rename to programs/testing/fspeed/build_en.bat
diff --git a/programs/fs/fspeed/build_ru.bat b/programs/testing/fspeed/build_ru.bat
similarity index 100%
rename from programs/fs/fspeed/build_ru.bat
rename to programs/testing/fspeed/build_ru.bat
diff --git a/programs/fs/fspeed/fspeed.asm b/programs/testing/fspeed/fspeed.asm
similarity index 100%
rename from programs/fs/fspeed/fspeed.asm
rename to programs/testing/fspeed/fspeed.asm
diff --git a/programs/fs/fspeed/idata.inc b/programs/testing/fspeed/idata.inc
similarity index 100%
rename from programs/fs/fspeed/idata.inc
rename to programs/testing/fspeed/idata.inc
diff --git a/programs/fs/fspeed/udata.inc b/programs/testing/fspeed/udata.inc
similarity index 100%
rename from programs/fs/fspeed/udata.inc
rename to programs/testing/fspeed/udata.inc
diff --git a/programs/system/kbd/trunk/Tupfile.lua b/programs/testing/kbd/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/kbd/trunk/Tupfile.lua
rename to programs/testing/kbd/trunk/Tupfile.lua
diff --git a/programs/system/kbd/trunk/build.bat b/programs/testing/kbd/trunk/build.bat
similarity index 100%
rename from programs/system/kbd/trunk/build.bat
rename to programs/testing/kbd/trunk/build.bat
diff --git a/programs/system/kbd/trunk/kbd.ASM b/programs/testing/kbd/trunk/kbd.ASM
similarity index 100%
rename from programs/system/kbd/trunk/kbd.ASM
rename to programs/testing/kbd/trunk/kbd.ASM
diff --git a/programs/system/kbd/trunk/makefile b/programs/testing/kbd/trunk/makefile
similarity index 100%
rename from programs/system/kbd/trunk/makefile
rename to programs/testing/kbd/trunk/makefile
diff --git a/programs/system/kbd/trunk/readme.txt b/programs/testing/kbd/trunk/readme.txt
similarity index 100%
rename from programs/system/kbd/trunk/readme.txt
rename to programs/testing/kbd/trunk/readme.txt
diff --git a/programs/system/mgb/trunk/Tupfile.lua b/programs/testing/mgb/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/mgb/trunk/Tupfile.lua
rename to programs/testing/mgb/trunk/Tupfile.lua
diff --git a/programs/system/mgb/trunk/build.bat b/programs/testing/mgb/trunk/build.bat
similarity index 100%
rename from programs/system/mgb/trunk/build.bat
rename to programs/testing/mgb/trunk/build.bat
diff --git a/programs/system/mgb/trunk/build.sh b/programs/testing/mgb/trunk/build.sh
similarity index 100%
rename from programs/system/mgb/trunk/build.sh
rename to programs/testing/mgb/trunk/build.sh
diff --git a/programs/system/mgb/trunk/makefile b/programs/testing/mgb/trunk/makefile
similarity index 100%
rename from programs/system/mgb/trunk/makefile
rename to programs/testing/mgb/trunk/makefile
diff --git a/programs/system/mgb/trunk/mgb.asm b/programs/testing/mgb/trunk/mgb.asm
similarity index 100%
rename from programs/system/mgb/trunk/mgb.asm
rename to programs/testing/mgb/trunk/mgb.asm
diff --git a/programs/system/test/trunk/Tupfile.lua b/programs/testing/protection/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/test/trunk/Tupfile.lua
rename to programs/testing/protection/trunk/Tupfile.lua
diff --git a/programs/system/test/trunk/build_en.bat b/programs/testing/protection/trunk/build_en.bat
similarity index 100%
rename from programs/system/test/trunk/build_en.bat
rename to programs/testing/protection/trunk/build_en.bat
diff --git a/programs/system/test/trunk/build_ru.bat b/programs/testing/protection/trunk/build_ru.bat
similarity index 100%
rename from programs/system/test/trunk/build_ru.bat
rename to programs/testing/protection/trunk/build_ru.bat
diff --git a/programs/system/test/trunk/makefile b/programs/testing/protection/trunk/makefile
similarity index 100%
rename from programs/system/test/trunk/makefile
rename to programs/testing/protection/trunk/makefile
diff --git a/programs/system/test/trunk/test.asm b/programs/testing/protection/trunk/test.asm
similarity index 100%
rename from programs/system/test/trunk/test.asm
rename to programs/testing/protection/trunk/test.asm