diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 0e94c6fab..2b4c8f2c0 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -414,7 +414,7 @@ tup.append_table(img_files, {
  {"CALENDAR", VAR_PROGS .. "/system/calendar/calendar"},
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
  {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
- {"CPU", VAR_PROGS .. "/system/cpu/trunk/cpu"},
+ {"CPU", VAR_PROGS .. "/system/cpu/cpu"},
  {"CPUID", VAR_PROGS .. "/testing/cpuid/trunk/CPUID"},
  {"DOCPACK", VAR_PROGS .. "/system/docpack/trunk/docpack"},
  {"DEFAULT.SKN", VAR_SKINS .. "/../skins/Leency/Shkvorka/Shkvorka.skn"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 805878597..bbf11b5e7 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -59,7 +59,7 @@ echo *
 fasm system\calendar\calendar.asm %BIN%\calendar
 fasm system\board\board.asm %BIN%\develop\board
 fasm system\commouse\trunk\commouse.asm %BIN%\commouse
-fasm system\cpu\trunk\cpu.asm %BIN%\cpu
+fasm system\cpu\cpu.asm %BIN%\cpu
 fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
 fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
 fasm system\docpack\trunk\docpack.asm %BIN%\docpack
diff --git a/programs/system/cpu/trunk/Tupfile.lua b/programs/system/cpu/Tupfile.lua
similarity index 79%
rename from programs/system/cpu/trunk/Tupfile.lua
rename to programs/system/cpu/Tupfile.lua
index f49486fc9..b12be1970 100644
--- a/programs/system/cpu/trunk/Tupfile.lua
+++ b/programs/system/cpu/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/system/cpu/trunk/build_de.bat b/programs/system/cpu/build_de.bat
similarity index 100%
rename from programs/system/cpu/trunk/build_de.bat
rename to programs/system/cpu/build_de.bat
diff --git a/programs/system/cpu/trunk/build_en.bat b/programs/system/cpu/build_en.bat
similarity index 100%
rename from programs/system/cpu/trunk/build_en.bat
rename to programs/system/cpu/build_en.bat
diff --git a/programs/system/cpu/trunk/build_et.bat b/programs/system/cpu/build_et.bat
similarity index 100%
rename from programs/system/cpu/trunk/build_et.bat
rename to programs/system/cpu/build_et.bat
diff --git a/programs/system/cpu/trunk/build_ru.bat b/programs/system/cpu/build_ru.bat
similarity index 100%
rename from programs/system/cpu/trunk/build_ru.bat
rename to programs/system/cpu/build_ru.bat
diff --git a/programs/system/cpu/trunk/cpu.asm b/programs/system/cpu/cpu.asm
similarity index 99%
rename from programs/system/cpu/trunk/cpu.asm
rename to programs/system/cpu/cpu.asm
index da50e176a..fcedcaceb 100644
--- a/programs/system/cpu/trunk/cpu.asm
+++ b/programs/system/cpu/cpu.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;-----------------------;
 ; CPU - process manager ;
 ;-----------------------;
@@ -17,10 +20,10 @@
         dd      cur_dir_path     ; path
 ;-------------------------------------------------------------------------------
 include "lang.inc" ; Language support for locales (UTF-8): de_DE, et_EE, ru_RU, it_IT, en_US.
-include "../../../macros.inc"
-include "../../../develop/libraries/box_lib/trunk/box_lib.mac"
-include "../../../KOSfuncs.inc"
-include "../../../load_lib.mac"
+include "../../macros.inc"
+include "../../develop/libraries/box_lib/trunk/box_lib.mac"
+include "../../KOSfuncs.inc"
+include "../../load_lib.mac"
 ;-------------------------------------------------------------------------------
 DISPLAY_PROCESSES = 20  ;number of processes to show
 ;-------------------------------------------------------------------------------
diff --git a/programs/system/cpu/trunk/makefile b/programs/system/cpu/makefile
similarity index 100%
rename from programs/system/cpu/trunk/makefile
rename to programs/system/cpu/makefile