diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index b86ca2f436..8c1ad66c46 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -669,7 +669,7 @@ tup.append_table(extra_files, {
  {"kolibrios/drivers/drvinst.kex", PROGS .. "/cmm/drvinst/drvinst.com"},
  {"kolibrios/games/pig/pigex", PROGS .. "/cmm/examples/pigex.com"},
  {"kolibrios/games/the_bus/the_bus", PROGS .. "/cmm/the_bus/the_bus.com"},
- {"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/installer/install.com"},
+ {"kolibrios/KolibriNext/install.kex", PROGS .. "/cmm/misc/install.com"},
  {"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
  {"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"},
  {"kolibrios/utils/notes", PROGS .. "/cmm/notes/notes.com"},
diff --git a/programs/cmm/installer/Tupfile.lua b/programs/cmm/installer/Tupfile.lua
deleted file mode 100644
index 08e6f2d4af..0000000000
--- a/programs/cmm/installer/Tupfile.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-if tup.getconfig("NO_CMM") ~= "" then return end
-if tup.getconfig("LANG") == "ru"
-then C_LANG = "LANG_RUS"
-else C_LANG = "LANG_ENG" -- this includes default case without config
-end
-tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com")
diff --git a/programs/cmm/installer/_compile_en.bat b/programs/cmm/installer/_compile_en.bat
deleted file mode 100644
index e82d55a3ff..0000000000
--- a/programs/cmm/installer/_compile_en.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-
-C-- install.c
-@del install.kex
-@rename install.com install.kex
-@pause
-@del lang.h--
-@del warning.txt
\ No newline at end of file
diff --git a/programs/cmm/installer/_compile_ru.bat b/programs/cmm/installer/_compile_ru.bat
deleted file mode 100644
index 9833164277..0000000000
--- a/programs/cmm/installer/_compile_ru.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-
-C-- install.c
-@del install.kex
-@rename install.com install.kex
-@pause
-@del lang.h--
-@del warning.txt
\ No newline at end of file
diff --git a/programs/cmm/installer/img/logo.ico b/programs/cmm/installer/img/logo.ico
deleted file mode 100644
index ce29b7da59..0000000000
Binary files a/programs/cmm/installer/img/logo.ico and /dev/null differ
diff --git a/programs/cmm/installer/img/logo.raw b/programs/cmm/installer/img/logo.raw
deleted file mode 100644
index 66ba96cb8e..0000000000
Binary files a/programs/cmm/installer/img/logo.raw and /dev/null differ
diff --git a/programs/cmm/misc/Tupfile.lua b/programs/cmm/misc/Tupfile.lua
index 8cd25bbe67..74eacc3018 100644
--- a/programs/cmm/misc/Tupfile.lua
+++ b/programs/cmm/misc/Tupfile.lua
@@ -4,6 +4,7 @@ then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
 tup.rule("easyshot.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "easyshot.com")
+tup.rule("install.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "install.com")
 tup.rule("mblocks.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "mblocks.com")
 tup.rule("notify.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "notify.com")
 tup.rule("osupdate.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "osupdate.com")
diff --git a/programs/cmm/installer/install.c b/programs/cmm/misc/install.c
similarity index 93%
rename from programs/cmm/installer/install.c
rename to programs/cmm/misc/install.c
index e920978352..745323f815 100644
--- a/programs/cmm/installer/install.c
+++ b/programs/cmm/misc/install.c
@@ -116,6 +116,7 @@ void EventInstall()
 {
 	ini_set_int stdcall ("/sys/settings/taskbar.ini", "Flags", "Attachment", 0);
 	copyf("/kolibrios/KolibriNext/settings", "/sys/settings");
+	copyf("/kolibrios/KolibriNext", "/sys");
 
 	RestartProcessByName("/sys/@icon", MULTIPLE);
 	RestartProcessByName("/sys/@taskbar", SINGLE);