diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/ba-BA.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/ba-BA.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/ba-BA.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/ba-BA.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/cz_CS.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/cz_CS.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/cz_CS.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/cz_CS.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/da-DA.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/da-DA.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/da-DA.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/da-DA.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/de-CH.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/de-CH.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/de-CH.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/de-CH.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/de-DE.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/de-DE.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/de-DE.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/de-DE.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/dvorak.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/dvorak.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/dvorak.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/dvorak.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/en-UK.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/en-UK.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/en-UK.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/en-UK.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/en-US.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/en-US.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/en-US.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/en-US.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/es-ES.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/es-ES.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/es-ES.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/es-ES.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-BE.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/fr-BE.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-BE.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/fr-BE.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-CA.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/fr-CA.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-CA.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/fr-CA.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-CH.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/fr-CH.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-CH.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/fr-CH.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-FR-mac.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR-mac.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-FR-mac.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR-mac.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-FR.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/fr-FR.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/fr-FR.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/hr-HR.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/hr-HR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/hr-HR.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/hr-HR.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/hu-HU.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/hu-HU.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/hu-HU.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/hu-HU.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/it-IT.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/it-IT.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/it-IT.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/it-IT.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/nb-NO.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/nb-NO.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/nb-NO.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/nb-NO.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/nl-NL.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/nl-NL.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/nl-NL.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/nl-NL.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/pt-BR.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/pt-BR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/pt-BR.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/pt-BR.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/pt-PT.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/pt-PT.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/pt-PT.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/pt-PT.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/si-SI.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/si-SI.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/si-SI.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/si-SI.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/sk-SK.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/sk-SK.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/sk-SK.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/sk-SK.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/sv-SE.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/sv-SE.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/sv-SE.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/sv-SE.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/assets/layouts/tr-TR.kl b/applications/main/bad_kb/resources/badkb/assets/layouts/tr-TR.kl
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/assets/layouts/tr-TR.kl
rename to applications/main/bad_kb/resources/badkb/assets/layouts/tr-TR.kl
diff --git a/applications/main/bad_kb/resources/bad_kb/demo_android.txt b/applications/main/bad_kb/resources/badkb/demo_android.txt
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/demo_android.txt
rename to applications/main/bad_kb/resources/badkb/demo_android.txt
diff --git a/applications/main/bad_kb/resources/bad_kb/demo_ios.txt b/applications/main/bad_kb/resources/badkb/demo_ios.txt
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/demo_ios.txt
rename to applications/main/bad_kb/resources/badkb/demo_ios.txt
diff --git a/applications/main/bad_kb/resources/bad_kb/demo_macos.txt b/applications/main/bad_kb/resources/badkb/demo_macos.txt
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/demo_macos.txt
rename to applications/main/bad_kb/resources/badkb/demo_macos.txt
diff --git a/applications/main/bad_kb/resources/bad_kb/demo_windows.txt b/applications/main/bad_kb/resources/badkb/demo_windows.txt
similarity index 100%
rename from applications/main/bad_kb/resources/bad_kb/demo_windows.txt
rename to applications/main/bad_kb/resources/badkb/demo_windows.txt