diff --git a/programs/build_all.bat b/programs/build_all.bat
index 38ec1cbe2..dce123a64 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -208,7 +208,7 @@ cd demos\aclock\trunk\
 nasmw -t -f bin -o ..\..\..\%BIN%\demos\aclock aclock.asm
 cd ..\..\..
 fasm demos\bcdclk\trunk\bcdclk.asm %BIN%\demos\bcdclk
-fasm demos\bgitest\trunk\bgitest.asm %BIN%\fonts\bgitest
+rem fasm demos\bgitest\trunk\bgitest.asm %BIN%\fonts\bgitest
 fasm demos\colorref\trunk\colorref.asm %BIN%\demos\colorref
 fasm demos\crownscr\trunk\crownscr.asm %BIN%\3d\crownscr
 fasm demos\cslide\trunk\cslide.asm %BIN%\demos\cslide
@@ -413,7 +413,7 @@ kpack %BIN%\3d\3dcube2
 kpack %BIN%\3d\3dtcub10
 kpack %BIN%\demos\aclock
 kpack %BIN%\demos\bcdclk
-kpack %BIN%\fonts\bgitest
+rem kpack %BIN%\fonts\bgitest
 kpack %BIN%\demos\colorref
 kpack %BIN%\3d\crownscr
 kpack %BIN%\demos\cslide
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/BOLD.CHR b/programs/other/outdated/bgitest/FONTS/BOLD.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/BOLD.CHR
rename to programs/other/outdated/bgitest/FONTS/BOLD.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/EURO.CHR b/programs/other/outdated/bgitest/FONTS/EURO.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/EURO.CHR
rename to programs/other/outdated/bgitest/FONTS/EURO.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/GOTH.CHR b/programs/other/outdated/bgitest/FONTS/GOTH.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/GOTH.CHR
rename to programs/other/outdated/bgitest/FONTS/GOTH.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/LCOM.CHR b/programs/other/outdated/bgitest/FONTS/LCOM.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/LCOM.CHR
rename to programs/other/outdated/bgitest/FONTS/LCOM.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/LITT.CHR b/programs/other/outdated/bgitest/FONTS/LITT.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/LITT.CHR
rename to programs/other/outdated/bgitest/FONTS/LITT.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/SANS.CHR b/programs/other/outdated/bgitest/FONTS/SANS.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/SANS.CHR
rename to programs/other/outdated/bgitest/FONTS/SANS.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/SCRI.CHR b/programs/other/outdated/bgitest/FONTS/SCRI.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/SCRI.CHR
rename to programs/other/outdated/bgitest/FONTS/SCRI.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/SIMP.CHR b/programs/other/outdated/bgitest/FONTS/SIMP.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/SIMP.CHR
rename to programs/other/outdated/bgitest/FONTS/SIMP.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/SMAL.CHR b/programs/other/outdated/bgitest/FONTS/SMAL.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/SMAL.CHR
rename to programs/other/outdated/bgitest/FONTS/SMAL.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/TRIP.CHR b/programs/other/outdated/bgitest/FONTS/TRIP.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/TRIP.CHR
rename to programs/other/outdated/bgitest/FONTS/TRIP.CHR
diff --git a/programs/other/outdated/bgitest/trunk/FONTS/TSCR.CHR b/programs/other/outdated/bgitest/FONTS/TSCR.CHR
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/FONTS/TSCR.CHR
rename to programs/other/outdated/bgitest/FONTS/TSCR.CHR
diff --git a/programs/other/outdated/bgitest/trunk/Tupfile.lua b/programs/other/outdated/bgitest/Tupfile.lua
similarity index 79%
rename from programs/other/outdated/bgitest/trunk/Tupfile.lua
rename to programs/other/outdated/bgitest/Tupfile.lua
index 017fa8ac3..11d6c7d6e 100644
--- a/programs/other/outdated/bgitest/trunk/Tupfile.lua
+++ b/programs/other/outdated/bgitest/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/other/outdated/bgitest/trunk/bgifont.inc b/programs/other/outdated/bgitest/bgifont.inc
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/bgifont.inc
rename to programs/other/outdated/bgitest/bgifont.inc
diff --git a/programs/other/outdated/bgitest/trunk/bgitest.asm b/programs/other/outdated/bgitest/bgitest.asm
similarity index 98%
rename from programs/other/outdated/bgitest/trunk/bgitest.asm
rename to programs/other/outdated/bgitest/bgitest.asm
index 7d92ccb91..bf009db4e 100644
--- a/programs/other/outdated/bgitest/trunk/bgitest.asm
+++ b/programs/other/outdated/bgitest/bgitest.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ; BGI Font Test
 ;
 ; Written in pure assembler by Ivushkin Andrey aka Willow
@@ -69,7 +75,7 @@ use32
 not1strun  dd	 0x0
 
 include 'lang.inc'
-include  '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'
 ;include   'debug.inc'
 include  'bgifont.inc'
 
diff --git a/programs/other/outdated/bgitest/trunk/build_en.bat b/programs/other/outdated/bgitest/build_en.bat
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/build_en.bat
rename to programs/other/outdated/bgitest/build_en.bat
diff --git a/programs/other/outdated/bgitest/trunk/build_ru.bat b/programs/other/outdated/bgitest/build_ru.bat
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/build_ru.bat
rename to programs/other/outdated/bgitest/build_ru.bat
diff --git a/programs/other/outdated/bgitest/trunk/read_eng.txt b/programs/other/outdated/bgitest/read_eng.txt
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/read_eng.txt
rename to programs/other/outdated/bgitest/read_eng.txt
diff --git a/programs/other/outdated/bgitest/trunk/read_rus.txt b/programs/other/outdated/bgitest/read_rus.txt
similarity index 100%
rename from programs/other/outdated/bgitest/trunk/read_rus.txt
rename to programs/other/outdated/bgitest/read_rus.txt