diff --git a/programs/other/HotAngles/HA/HOTANGLES.ASM b/programs/other/HotAngles/@HOTANGLES.ASM
similarity index 95%
rename from programs/other/HotAngles/HA/HOTANGLES.ASM
rename to programs/other/HotAngles/@HOTANGLES.ASM
index 2dbf9e7489..5af734459e 100644
--- a/programs/other/HotAngles/HA/HOTANGLES.ASM
+++ b/programs/other/HotAngles/@HOTANGLES.ASM
@@ -42,7 +42,7 @@ dd 0x7fff0        ;
 dd 0, 0           ;адрес строки параметров и адрес строки пути исполняемого файла
 
 
-include '../../../macros.inc'
+include '../../macros.inc'
 
 START_DEBUG:
    call copyKill         ;простейшая защита от повторного запуска
diff --git a/programs/other/HotAngles/HA/AUTORUN.DAT b/programs/other/HotAngles/HA/AUTORUN.DAT
deleted file mode 100644
index 4a0819d71e..0000000000
--- a/programs/other/HotAngles/HA/AUTORUN.DAT
+++ /dev/null
@@ -1,22 +0,0 @@
-# Syntaxis is: <Program_Name> <Parameter(s)> <Delay_Time>
-# Use "parameter value" for parameters with spaces. Use "" if no parameter is required.
-# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds.
-# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait
-#
-#/SYS/CROPFLAT  "XS800 YS480"   1       # set limits of screen
-#/SYS/LOADDRV   COMMOUSE        1       # serial mouse driver
-#/SYS/DEVELOP/BOARD     ""      0       # Load DEBUG board
-/SYS/SETUP              BOOT    0       # Load device settings
-/SYS/LOADDRV            RDC     0       # videodriver for RDC M2010/M2012
-/SYS/@TASKBAR           ""      0       # Start taskbar
-/SYS/@ICON              ""      0       # Multithread icon
-/SYS/ESKIN              ""      0       # Set style
-/SYS/@DOCKY             ""      0       # Start docky
-/SYS/NETWORK/NETCFG     A       0       #
-/SYS/NETWORK/@ZEROCONF  ""      0       # Network configuration
-/SYS/@VOLUME            ""      0       # Start volume daemon
-/SYS/@SS                ASSM    0       # Screensaver
-/SYS/TMPDISK            A0      -1      # Add virtual RAM disk /tmp0/1
-/SYS/SEARCHAP           ""      -1      # Search and mount additional system directory
-/SYS/@HOTANGLES         ""      0       # Start Hot Angles
-### Hello, ASM World! ###
diff --git a/programs/other/HotAngles/HA/SETTINGS/HOTANGLES.CFG b/programs/other/HotAngles/HA/SETTINGS/HOTANGLES.CFG
deleted file mode 100644
index afc4e21bc3..0000000000
--- a/programs/other/HotAngles/HA/SETTINGS/HOTANGLES.CFG
+++ /dev/null
@@ -1,5 +0,0 @@
-y
-/rd/1/SHELL
-/rd/1/RUN
-/rd/1/TINYPAD
-/rd/1/File Managers/EOLITE
diff --git a/programs/other/HotAngles/HA/Tupfile.lua b/programs/other/HotAngles/HA/Tupfile.lua
deleted file mode 100644
index 4ae86dbe99..0000000000
--- a/programs/other/HotAngles/HA/Tupfile.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
-tup.rule({"HOTANGLES.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "HOTANGLES")
diff --git a/programs/other/HotAngles/HA/build.bat b/programs/other/HotAngles/HA/build.bat
deleted file mode 100644
index eb24315104..0000000000
--- a/programs/other/HotAngles/HA/build.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo lang fix ru >lang.inc
-@fasm.exe -m 16384 @HOTANGLES.asm @HOTANGLES
-@erase lang.inc
-@kpack @HOTANGLES
-@pause
\ No newline at end of file
diff --git a/programs/other/HotAngles/HAconfig/HACONFIG.asm b/programs/other/HotAngles/HACONFIG.ASM
similarity index 96%
rename from programs/other/HotAngles/HAconfig/HACONFIG.asm
rename to programs/other/HotAngles/HACONFIG.ASM
index 1f94a5cf79..04b01f02d7 100644
--- a/programs/other/HotAngles/HAconfig/HACONFIG.asm
+++ b/programs/other/HotAngles/HACONFIG.ASM
@@ -40,7 +40,7 @@ dd STACKTOP
 dd 0, 0
 
 ; Начало области кода
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'editbox.inc'
 use_edit_box
 include 'check.inc'      ;включить файл check.inc
diff --git a/programs/other/HotAngles/HAconfig/build.bat b/programs/other/HotAngles/HAconfig/build.bat
deleted file mode 100644
index ec3254f0ab..0000000000
--- a/programs/other/HotAngles/HAconfig/build.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo lang fix ru >lang.inc
-@fasm.exe -m 16384 HACONFIG.asm HACONFIG
-@erase lang.inc
-@kpack HACONFIG
-@pause
\ No newline at end of file
diff --git a/programs/other/HotAngles/HAconfig/SETTINGS/HOTANGLES.CFG b/programs/other/HotAngles/SETTINGS/HOTANGLES.CFG
similarity index 100%
rename from programs/other/HotAngles/HAconfig/SETTINGS/HOTANGLES.CFG
rename to programs/other/HotAngles/SETTINGS/HOTANGLES.CFG
diff --git a/programs/other/HotAngles/HAconfig/Tupfile.lua b/programs/other/HotAngles/Tupfile.lua
similarity index 55%
rename from programs/other/HotAngles/HAconfig/Tupfile.lua
rename to programs/other/HotAngles/Tupfile.lua
index 9c81d70735..21d3c047bf 100644
--- a/programs/other/HotAngles/HAconfig/Tupfile.lua
+++ b/programs/other/HotAngles/Tupfile.lua
@@ -1,3 +1,4 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
-tup.rule({"HACONFIG.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "HACONFIG")
+tup.rule({"@HOTANGLES.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "@HOTANGLES")
+tup.rule({"HACONFIG.ASM", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "HACONFIG")
diff --git a/programs/other/HotAngles/build.bat b/programs/other/HotAngles/build.bat
new file mode 100644
index 0000000000..1238f003a9
--- /dev/null
+++ b/programs/other/HotAngles/build.bat
@@ -0,0 +1,7 @@
+@echo lang fix ru >lang.inc
+@fasm.exe -m 16384 @HOTANGLES.ASM @HOTANGLES
+@fasm.exe -m 16384 HACONFIG.ASM HACONFIG
+@erase lang.inc
+@kpack @HOTANGLES
+@kpack HACONFIG
+@pause
\ No newline at end of file
diff --git a/programs/other/HotAngles/HAconfig/check.inc b/programs/other/HotAngles/check.inc
similarity index 100%
rename from programs/other/HotAngles/HAconfig/check.inc
rename to programs/other/HotAngles/check.inc
diff --git a/programs/other/HotAngles/HAconfig/editbox.inc b/programs/other/HotAngles/editbox.inc
similarity index 100%
rename from programs/other/HotAngles/HAconfig/editbox.inc
rename to programs/other/HotAngles/editbox.inc
diff --git a/programs/other/HotAngles/HAconfig/editbox.mac b/programs/other/HotAngles/editbox.mac
similarity index 100%
rename from programs/other/HotAngles/HAconfig/editbox.mac
rename to programs/other/HotAngles/editbox.mac