diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index a23ed67bbb..2799790c90 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -355,7 +355,7 @@ tup.append_table(img_files, {
  {"COLRDIAL", PROGS .. "/system/colrdial/color_dialog"},
  {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"},
  {"CPU", PROGS .. "/system/cpu/trunk/cpu"},
- {"CPUID", PROGS .. "/system/cpuid/trunk/CPUID"},
+ {"CPUID", PROGS .. "/testing/cpuid/trunk/CPUID"},
  {"DOCPACK", PROGS .. "/system/docpack/trunk/docpack"},
  {"DEFAULT.SKN", "../skins/Leency/Shkvorka/Shkvorka.skn"},
  {"DISPTEST", PROGS .. "/testing/disptest/trunk/disptest"},
@@ -373,7 +373,7 @@ tup.append_table(img_files, {
  {"MOUSEMUL", PROGS .. "/system/mousemul/trunk/mousemul"},
  {"MADMOUSE", PROGS .. "/other/madmouse/madmouse"},
  {"MYKEY", PROGS .. "/system/MyKey/trunk/MyKey"},
- {"PCIDEV", PROGS .. "/system/pcidev/trunk/PCIDEV"},
+ {"PCIDEV", PROGS .. "/testing/pcidev/trunk/PCIDEV"},
  {"RDSAVE", PROGS .. "/system/rdsave/trunk/rdsave"},
  {"RTFREAD", PROGS .. "/other/rtfread/trunk/rtfread"},
  {"SEARCHAP", PROGS .. "/system/searchap/searchap"},
@@ -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 .. "/testing/test/trunk/protection"},
+ {"TEST", PROGS .. "/testing/protection/trunk/test"},
  {"TINYPAD", PROGS .. "/develop/tinypad/trunk/tinypad"},
  {"UNZ", PROGS .. "/fs/unz/unz"},
  {"ZKEY", PROGS .. "/system/zkey/trunk/ZKEY"},
diff --git a/programs/system/cpuid/trunk/Build.bat b/programs/testing/cpuid/trunk/Build.bat
similarity index 100%
rename from programs/system/cpuid/trunk/Build.bat
rename to programs/testing/cpuid/trunk/Build.bat
diff --git a/programs/system/cpuid/trunk/CPUID.ASM b/programs/testing/cpuid/trunk/CPUID.ASM
similarity index 100%
rename from programs/system/cpuid/trunk/CPUID.ASM
rename to programs/testing/cpuid/trunk/CPUID.ASM
diff --git a/programs/system/cpuid/trunk/HISTORY.TXT b/programs/testing/cpuid/trunk/HISTORY.TXT
similarity index 100%
rename from programs/system/cpuid/trunk/HISTORY.TXT
rename to programs/testing/cpuid/trunk/HISTORY.TXT
diff --git a/programs/system/cpuid/trunk/README.TXT b/programs/testing/cpuid/trunk/README.TXT
similarity index 100%
rename from programs/system/cpuid/trunk/README.TXT
rename to programs/testing/cpuid/trunk/README.TXT
diff --git a/programs/system/cpuid/trunk/Tupfile.lua b/programs/testing/cpuid/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/cpuid/trunk/Tupfile.lua
rename to programs/testing/cpuid/trunk/Tupfile.lua
diff --git a/programs/system/cpuid/trunk/amd.gif b/programs/testing/cpuid/trunk/amd.gif
similarity index 100%
rename from programs/system/cpuid/trunk/amd.gif
rename to programs/testing/cpuid/trunk/amd.gif
diff --git a/programs/system/cpuid/trunk/brand.inc b/programs/testing/cpuid/trunk/brand.inc
similarity index 100%
rename from programs/system/cpuid/trunk/brand.inc
rename to programs/testing/cpuid/trunk/brand.inc
diff --git a/programs/system/cpuid/trunk/caches.inc b/programs/testing/cpuid/trunk/caches.inc
similarity index 100%
rename from programs/system/cpuid/trunk/caches.inc
rename to programs/testing/cpuid/trunk/caches.inc
diff --git a/programs/system/cpuid/trunk/cyrix.gif b/programs/testing/cpuid/trunk/cyrix.gif
similarity index 100%
rename from programs/system/cpuid/trunk/cyrix.gif
rename to programs/testing/cpuid/trunk/cyrix.gif
diff --git a/programs/system/cpuid/trunk/draw.inc b/programs/testing/cpuid/trunk/draw.inc
similarity index 100%
rename from programs/system/cpuid/trunk/draw.inc
rename to programs/testing/cpuid/trunk/draw.inc
diff --git a/programs/system/cpuid/trunk/features.inc b/programs/testing/cpuid/trunk/features.inc
similarity index 100%
rename from programs/system/cpuid/trunk/features.inc
rename to programs/testing/cpuid/trunk/features.inc
diff --git a/programs/system/cpuid/trunk/gif_lite.inc b/programs/testing/cpuid/trunk/gif_lite.inc
similarity index 100%
rename from programs/system/cpuid/trunk/gif_lite.inc
rename to programs/testing/cpuid/trunk/gif_lite.inc
diff --git a/programs/system/cpuid/trunk/idt.gif b/programs/testing/cpuid/trunk/idt.gif
similarity index 100%
rename from programs/system/cpuid/trunk/idt.gif
rename to programs/testing/cpuid/trunk/idt.gif
diff --git a/programs/system/cpuid/trunk/intel.gif b/programs/testing/cpuid/trunk/intel.gif
similarity index 100%
rename from programs/system/cpuid/trunk/intel.gif
rename to programs/testing/cpuid/trunk/intel.gif
diff --git a/programs/system/cpuid/trunk/logos.inc b/programs/testing/cpuid/trunk/logos.inc
similarity index 100%
rename from programs/system/cpuid/trunk/logos.inc
rename to programs/testing/cpuid/trunk/logos.inc
diff --git a/programs/system/cpuid/trunk/makefile b/programs/testing/cpuid/trunk/makefile
similarity index 100%
rename from programs/system/cpuid/trunk/makefile
rename to programs/testing/cpuid/trunk/makefile
diff --git a/programs/system/cpuid/trunk/multipli.inc b/programs/testing/cpuid/trunk/multipli.inc
similarity index 100%
rename from programs/system/cpuid/trunk/multipli.inc
rename to programs/testing/cpuid/trunk/multipli.inc
diff --git a/programs/system/cpuid/trunk/rsatest.inc b/programs/testing/cpuid/trunk/rsatest.inc
similarity index 100%
rename from programs/system/cpuid/trunk/rsatest.inc
rename to programs/testing/cpuid/trunk/rsatest.inc
diff --git a/programs/system/cpuid/trunk/transmet.gif b/programs/testing/cpuid/trunk/transmet.gif
similarity index 100%
rename from programs/system/cpuid/trunk/transmet.gif
rename to programs/testing/cpuid/trunk/transmet.gif
diff --git a/programs/system/cpuid/trunk/variable.inc b/programs/testing/cpuid/trunk/variable.inc
similarity index 100%
rename from programs/system/cpuid/trunk/variable.inc
rename to programs/testing/cpuid/trunk/variable.inc
diff --git a/programs/system/cpuid/trunk/via.gif b/programs/testing/cpuid/trunk/via.gif
similarity index 100%
rename from programs/system/cpuid/trunk/via.gif
rename to programs/testing/cpuid/trunk/via.gif
diff --git a/programs/system/cpuid/trunk/vortex.gif b/programs/testing/cpuid/trunk/vortex.gif
similarity index 100%
rename from programs/system/cpuid/trunk/vortex.gif
rename to programs/testing/cpuid/trunk/vortex.gif
diff --git a/programs/system/latency/trunk/Tupfile.lua b/programs/testing/latency/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/latency/trunk/Tupfile.lua
rename to programs/testing/latency/trunk/Tupfile.lua
diff --git a/programs/system/latency/trunk/build.bat b/programs/testing/latency/trunk/build.bat
similarity index 100%
rename from programs/system/latency/trunk/build.bat
rename to programs/testing/latency/trunk/build.bat
diff --git a/programs/system/latency/trunk/latency.asm b/programs/testing/latency/trunk/latency.asm
similarity index 100%
rename from programs/system/latency/trunk/latency.asm
rename to programs/testing/latency/trunk/latency.asm
diff --git a/programs/system/latency/trunk/makefile b/programs/testing/latency/trunk/makefile
similarity index 100%
rename from programs/system/latency/trunk/makefile
rename to programs/testing/latency/trunk/makefile
diff --git a/programs/system/pcidev/branches/new_api/PCIDEV.ASM b/programs/testing/pcidev/branches/new_api/PCIDEV.ASM
similarity index 100%
rename from programs/system/pcidev/branches/new_api/PCIDEV.ASM
rename to programs/testing/pcidev/branches/new_api/PCIDEV.ASM
diff --git a/programs/system/pcidev/branches/new_api/Tupfile.lua b/programs/testing/pcidev/branches/new_api/Tupfile.lua
similarity index 100%
rename from programs/system/pcidev/branches/new_api/Tupfile.lua
rename to programs/testing/pcidev/branches/new_api/Tupfile.lua
diff --git a/programs/system/pcidev/branches/new_api/build.bat b/programs/testing/pcidev/branches/new_api/build.bat
similarity index 100%
rename from programs/system/pcidev/branches/new_api/build.bat
rename to programs/testing/pcidev/branches/new_api/build.bat
diff --git a/programs/system/pcidev/branches/new_api/makefile b/programs/testing/pcidev/branches/new_api/makefile
similarity index 100%
rename from programs/system/pcidev/branches/new_api/makefile
rename to programs/testing/pcidev/branches/new_api/makefile
diff --git a/programs/system/pcidev/branches/new_api/vendors.inc b/programs/testing/pcidev/branches/new_api/vendors.inc
similarity index 100%
rename from programs/system/pcidev/branches/new_api/vendors.inc
rename to programs/testing/pcidev/branches/new_api/vendors.inc
diff --git a/programs/system/pcidev/trunk/PCIDEV.ASM b/programs/testing/pcidev/trunk/PCIDEV.ASM
similarity index 100%
rename from programs/system/pcidev/trunk/PCIDEV.ASM
rename to programs/testing/pcidev/trunk/PCIDEV.ASM
diff --git a/programs/system/pcidev/trunk/Tupfile.lua b/programs/testing/pcidev/trunk/Tupfile.lua
similarity index 100%
rename from programs/system/pcidev/trunk/Tupfile.lua
rename to programs/testing/pcidev/trunk/Tupfile.lua
diff --git a/programs/system/pcidev/trunk/build_en.bat b/programs/testing/pcidev/trunk/build_en.bat
similarity index 100%
rename from programs/system/pcidev/trunk/build_en.bat
rename to programs/testing/pcidev/trunk/build_en.bat
diff --git a/programs/system/pcidev/trunk/history.txt b/programs/testing/pcidev/trunk/history.txt
similarity index 100%
rename from programs/system/pcidev/trunk/history.txt
rename to programs/testing/pcidev/trunk/history.txt
diff --git a/programs/system/pcidev/trunk/makefile b/programs/testing/pcidev/trunk/makefile
similarity index 100%
rename from programs/system/pcidev/trunk/makefile
rename to programs/testing/pcidev/trunk/makefile
diff --git a/programs/system/pcidev/trunk/vendors.add b/programs/testing/pcidev/trunk/vendors.add
similarity index 100%
rename from programs/system/pcidev/trunk/vendors.add
rename to programs/testing/pcidev/trunk/vendors.add
diff --git a/programs/system/pcidev/trunk/vendors.inc b/programs/testing/pcidev/trunk/vendors.inc
similarity index 100%
rename from programs/system/pcidev/trunk/vendors.inc
rename to programs/testing/pcidev/trunk/vendors.inc