diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index b8080e31d..547d74cb7 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -442,7 +442,7 @@ tup.append_table(img_files, {
  {"SKINCFG", VAR_PROGS .. "/system/skincfg/trunk/skincfg"},
  {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"},
  {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"},
- {"TINYPAD", VAR_PROGS .. "/develop/tinypad/trunk/tinypad"},
+ {"TINYPAD", VAR_PROGS .. "/develop/tinypad/tinypad"},
  {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
  {"TIMER", VAR_PROGS .. "/other/Timer/Timer"},
  {"UNZ", VAR_PROGS .. "/fs/unz/unz"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index a8f7b8cae..e343c09db 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -95,7 +95,7 @@ fasm develop\keyascii\keyascii.asm %BIN%\develop\keyascii
 fasm develop\mtdbg\mtdbg.asm %BIN%\develop\mtdbg
 rem fasm develop\param\trunk\param.asm param
 fasm develop\scancode\scancode.asm %BIN%\develop\scancode
-fasm develop\tinypad\trunk\tinypad.asm %BIN%\tinypad
+fasm develop\tinypad\tinypad.asm %BIN%\tinypad
 fasm develop\cObj\cObj.asm %BIN%\develop\cObj
 
 echo *
@@ -236,7 +236,7 @@ fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot
 fasm media\animage\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\heed.asm %BIN%\nightbuild\heed
-fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
+fasm develop\tinypad\tinypad.asm %BIN%\nightbuild\tinypad
 fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg
 fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info
 fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
diff --git a/programs/develop/tinypad/trunk/Tupfile.lua b/programs/develop/tinypad/Tupfile.lua
similarity index 79%
rename from programs/develop/tinypad/trunk/Tupfile.lua
rename to programs/develop/tinypad/Tupfile.lua
index 316919ed8..9b4e87f1c 100644
--- a/programs/develop/tinypad/trunk/Tupfile.lua
+++ b/programs/develop/tinypad/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
diff --git a/programs/develop/tinypad/trunk/build.sh b/programs/develop/tinypad/build.sh
similarity index 100%
rename from programs/develop/tinypad/trunk/build.sh
rename to programs/develop/tinypad/build.sh
diff --git a/programs/develop/tinypad/trunk/build_en.bat b/programs/develop/tinypad/build_en.bat
similarity index 100%
rename from programs/develop/tinypad/trunk/build_en.bat
rename to programs/develop/tinypad/build_en.bat
diff --git a/programs/develop/tinypad/trunk/build_it.bat b/programs/develop/tinypad/build_it.bat
similarity index 100%
rename from programs/develop/tinypad/trunk/build_it.bat
rename to programs/develop/tinypad/build_it.bat
diff --git a/programs/develop/tinypad/trunk/build_ru.bat b/programs/develop/tinypad/build_ru.bat
similarity index 100%
rename from programs/develop/tinypad/trunk/build_ru.bat
rename to programs/develop/tinypad/build_ru.bat
diff --git a/programs/develop/tinypad/trunk/data/tp-defines.inc b/programs/develop/tinypad/data/tp-defines.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/data/tp-defines.inc
rename to programs/develop/tinypad/data/tp-defines.inc
diff --git a/programs/develop/tinypad/trunk/data/tp-idata.inc b/programs/develop/tinypad/data/tp-idata.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/data/tp-idata.inc
rename to programs/develop/tinypad/data/tp-idata.inc
diff --git a/programs/develop/tinypad/trunk/data/tp-locale.inc b/programs/develop/tinypad/data/tp-locale.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/data/tp-locale.inc
rename to programs/develop/tinypad/data/tp-locale.inc
diff --git a/programs/develop/tinypad/trunk/data/tp-tables.inc b/programs/develop/tinypad/data/tp-tables.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/data/tp-tables.inc
rename to programs/develop/tinypad/data/tp-tables.inc
diff --git a/programs/develop/tinypad/trunk/data/tp-udata.inc b/programs/develop/tinypad/data/tp-udata.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/data/tp-udata.inc
rename to programs/develop/tinypad/data/tp-udata.inc
diff --git a/programs/develop/tinypad/trunk/external/libio.inc b/programs/develop/tinypad/external/libio.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/external/libio.inc
rename to programs/develop/tinypad/external/libio.inc
diff --git a/programs/develop/tinypad/trunk/history.txt b/programs/develop/tinypad/history.txt
similarity index 100%
rename from programs/develop/tinypad/trunk/history.txt
rename to programs/develop/tinypad/history.txt
diff --git a/programs/develop/tinypad/trunk/tinypad.asm b/programs/develop/tinypad/tinypad.asm
similarity index 98%
rename from programs/develop/tinypad/trunk/tinypad.asm
rename to programs/develop/tinypad/tinypad.asm
index 1893430fd..c5a2e8702 100644
--- a/programs/develop/tinypad/trunk/tinypad.asm
+++ b/programs/develop/tinypad/tinypad.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;-----------------------------------------------------------------------------
 ; project name:      TINYPAD
 ; compiler:          flat assembler 1.67.21
@@ -24,10 +27,10 @@
 
 include 'lang.inc'
 
-include '../../../config.inc'		;for nightbuild
-include '../../../macros.inc'		; useful stuff
-include '../../../struct.inc'
-include '../../../proc32.inc'
+include '../../config.inc'		;for nightbuild
+include '../../macros.inc'		; useful stuff
+include '../../struct.inc'
+include '../../proc32.inc'
 
 include 'external/libio.inc'
 
@@ -44,7 +47,7 @@ FALSE = 0
 
 ;define __DEBUG__ 1
 ;define __DEBUG_LEVEL__ 1
-;include '../../../debug-fdo.inc'
+;include '../../debug-fdo.inc'
 
 ; compiled-in options
 
@@ -611,7 +614,7 @@ include 'tp-editor.asm'
 include 'tp-recode.asm'
 include 'tp-clipboard.asm'
 
-include '../../../dll.inc'
+include '../../dll.inc'
 
 ;-----------------------------------------------------------------------------
 __section @DATA ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
diff --git a/programs/develop/tinypad/trunk/tinypad.inc b/programs/develop/tinypad/tinypad.inc
similarity index 100%
rename from programs/develop/tinypad/trunk/tinypad.inc
rename to programs/develop/tinypad/tinypad.inc
diff --git a/programs/develop/tinypad/trunk/tp-button.asm b/programs/develop/tinypad/tp-button.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-button.asm
rename to programs/develop/tinypad/tp-button.asm
diff --git a/programs/develop/tinypad/trunk/tp-clipboard.asm b/programs/develop/tinypad/tp-clipboard.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-clipboard.asm
rename to programs/develop/tinypad/tp-clipboard.asm
diff --git a/programs/develop/tinypad/trunk/tp-common.asm b/programs/develop/tinypad/tp-common.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-common.asm
rename to programs/develop/tinypad/tp-common.asm
diff --git a/programs/develop/tinypad/trunk/tp-dialog.asm b/programs/develop/tinypad/tp-dialog.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-dialog.asm
rename to programs/develop/tinypad/tp-dialog.asm
diff --git a/programs/develop/tinypad/trunk/tp-draw.asm b/programs/develop/tinypad/tp-draw.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-draw.asm
rename to programs/develop/tinypad/tp-draw.asm
diff --git a/programs/develop/tinypad/trunk/tp-editor.asm b/programs/develop/tinypad/tp-editor.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-editor.asm
rename to programs/develop/tinypad/tp-editor.asm
diff --git a/programs/develop/tinypad/trunk/tp-files.asm b/programs/develop/tinypad/tp-files.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-files.asm
rename to programs/develop/tinypad/tp-files.asm
diff --git a/programs/develop/tinypad/trunk/tp-key.asm b/programs/develop/tinypad/tp-key.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-key.asm
rename to programs/develop/tinypad/tp-key.asm
diff --git a/programs/develop/tinypad/trunk/tp-mouse.asm b/programs/develop/tinypad/tp-mouse.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-mouse.asm
rename to programs/develop/tinypad/tp-mouse.asm
diff --git a/programs/develop/tinypad/trunk/tp-popup.asm b/programs/develop/tinypad/tp-popup.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-popup.asm
rename to programs/develop/tinypad/tp-popup.asm
diff --git a/programs/develop/tinypad/trunk/tp-recode.asm b/programs/develop/tinypad/tp-recode.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-recode.asm
rename to programs/develop/tinypad/tp-recode.asm
diff --git a/programs/develop/tinypad/trunk/tp-tabctl.asm b/programs/develop/tinypad/tp-tabctl.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-tabctl.asm
rename to programs/develop/tinypad/tp-tabctl.asm
diff --git a/programs/develop/tinypad/trunk/tp-tbox.asm b/programs/develop/tinypad/tp-tbox.asm
similarity index 100%
rename from programs/develop/tinypad/trunk/tp-tbox.asm
rename to programs/develop/tinypad/tp-tbox.asm