diff --git a/data/eng/Makefile b/data/eng/Makefile
index 7fff95a023..2556960f3c 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -289,8 +289,10 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
- kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \
- kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
+ kernel.mnt:KERNEL.MNT kerpack:KERPACK \
+ settings/keymap.key:SETTINGS/KEYMAP.KEY \
+ settings/lang.ini:SETTINGS/LANG.INI \
+ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
  settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
  shell:SHELL table:TABLE \
diff --git a/data/eng/keymap.key b/data/eng/settings/keymap.key
similarity index 100%
rename from data/eng/keymap.key
rename to data/eng/settings/keymap.key
diff --git a/data/eng/lang.ini b/data/eng/settings/lang.ini
similarity index 100%
rename from data/eng/lang.ini
rename to data/eng/settings/lang.ini
diff --git a/data/et/Makefile b/data/et/Makefile
index 7fff95a023..8af21bbf04 100644
--- a/data/et/Makefile
+++ b/data/et/Makefile
@@ -289,8 +289,10 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
- kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \
- kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
+ kernel.mnt:KERNEL.MNT kerpack:KERPACK \
+ settings/keymap.key:SETTINGS/KEYMAP.KEY \
+ settings/lang.ini:SETTINGS/LANG.INI \ 
+ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
  settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
  shell:SHELL table:TABLE \
diff --git a/data/et/keymap.key b/data/et/settings/keymap.key
similarity index 100%
rename from data/et/keymap.key
rename to data/et/settings/keymap.key
diff --git a/data/et/lang.ini b/data/et/settings/lang.ini
similarity index 100%
rename from data/et/lang.ini
rename to data/et/settings/lang.ini
diff --git a/data/it/Makefile b/data/it/Makefile
index 0bb1ae6b3c..3ccec467e0 100644
--- a/data/it/Makefile
+++ b/data/it/Makefile
@@ -288,8 +288,10 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
- kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \
- kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
+ kernel.mnt:KERNEL.MNT kerpack:KERPACK \
+ settings/keymap.key:SETTINGS/KEYMAP.KEY \
+ settings/lang.ini:SETTINGS/LANG.INI \
+ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
  settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
  shell:SHELL table:TABLE \
diff --git a/data/it/keymap.key b/data/it/settings/keymap.key
similarity index 100%
rename from data/it/keymap.key
rename to data/it/settings/keymap.key
diff --git a/data/it/lang.ini b/data/it/settings/lang.ini
similarity index 100%
rename from data/it/lang.ini
rename to data/it/settings/lang.ini
diff --git a/data/rus/Makefile b/data/rus/Makefile
index d5a0c90bb7..d6c44079f8 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -283,8 +283,10 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
- kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \
- kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
+ kernel.mnt:KERNEL.MNT kerpack:KERPACK \
+ settings/keymap.key:SETTINGS/KEYMAP.KEY \
+ settings/lang.ini:SETTINGS/LANG.INI \ 
+ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
  settings/panel.ini:SETTINGS/PANEL.INI pipetka:PIPETKA setup.dat:SETUP.DAT \
  shell:SHELL table:TABLE vmode:VMODE \
diff --git a/data/rus/keymap.key b/data/rus/settings/keymap.key
similarity index 100%
rename from data/rus/keymap.key
rename to data/rus/settings/keymap.key
diff --git a/data/rus/lang.ini b/data/rus/settings/lang.ini
similarity index 100%
rename from data/rus/lang.ini
rename to data/rus/settings/lang.ini
diff --git a/data/sp/Makefile b/data/sp/Makefile
index f3d91764ac..4f3866c3dd 100644
--- a/data/sp/Makefile
+++ b/data/sp/Makefile
@@ -288,8 +288,10 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
  icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
- kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \
- kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \
+ kernel.mnt:KERNEL.MNT kerpack:KERPACK \
+ settings/keymap.key:SETTINGS/KEYMAP.KEY \
+ settings/lang.ini:SETTINGS/LANG.INI \
+ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \
  menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \
  settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \
  shell:SHELL table:TABLE \
diff --git a/data/sp/keymap.key b/data/sp/settings/keymap.key
similarity index 100%
rename from data/sp/keymap.key
rename to data/sp/settings/keymap.key
diff --git a/data/sp/lang.ini b/data/sp/settings/lang.ini
similarity index 100%
rename from data/sp/lang.ini
rename to data/sp/settings/lang.ini