diff --git a/applications/archive/helpers/archive_browser.h b/applications/archive/helpers/archive_browser.h
index 0f8130c4024..d6c79817a27 100644
--- a/applications/archive/helpers/archive_browser.h
+++ b/applications/archive/helpers/archive_browser.h
@@ -26,7 +26,6 @@ static const char* known_ext[] = {
     [ArchiveFileTypeLFRFID] = ".rfid",
     [ArchiveFileTypeInfrared] = ".ir",
     [ArchiveFileTypeBadUsb] = ".txt",
-    [ArchiveFileTypeKeyboard] = ".kl",
     [ArchiveFileTypeU2f] = "?",
     [ArchiveFileTypeUpdateManifest] = ".fuf",
     [ArchiveFileTypeFolder] = "?",
diff --git a/applications/archive/helpers/archive_files.h b/applications/archive/helpers/archive_files.h
index cb65f8fdc1d..84b7e24a62f 100644
--- a/applications/archive/helpers/archive_files.h
+++ b/applications/archive/helpers/archive_files.h
@@ -16,7 +16,6 @@ typedef enum {
     ArchiveFileTypeFolder,
     ArchiveFileTypeUnknown,
     ArchiveFileTypeLoading,
-    ArchiveFileTypeKeyboard,
 } ArchiveFileTypeEnum;
 
 typedef struct {
diff --git a/applications/archive/views/archive_browser_view.c b/applications/archive/views/archive_browser_view.c
index 43d53539d38..810d5c8f787 100644
--- a/applications/archive/views/archive_browser_view.c
+++ b/applications/archive/views/archive_browser_view.c
@@ -29,7 +29,6 @@ static const Icon* ArchiveItemIcons[] = {
     [ArchiveFileTypeFolder] = &I_dir_10px,
     [ArchiveFileTypeUnknown] = &I_unknown_10px,
     [ArchiveFileTypeLoading] = &I_loading_10px,
-    [ArchiveFileTypeKeyboard] = &I_keyboard_10px,
 };
 
 void archive_browser_set_callback(
diff --git a/applications/bad_usb/bad_usb_app_i.h b/applications/bad_usb/bad_usb_app_i.h
index 329aae343e8..24a057cbcb6 100644
--- a/applications/bad_usb/bad_usb_app_i.h
+++ b/applications/bad_usb/bad_usb_app_i.h
@@ -15,8 +15,8 @@
 #include "views/bad_usb_view.h"
 
 #define BAD_USB_APP_BASE_FOLDER ANY_PATH("badusb")
-#define BAD_USB_APP_PATH_SCRIPT_FOLDER BAD_USB_APP_BASE_FOLDER "/scripts"
-#define BAD_USB_APP_PATH_LAYOUT_FOLDER BAD_USB_APP_BASE_FOLDER "/layouts"
+#define BAD_USB_APP_PATH_SCRIPT_FOLDER BAD_USB_APP_BASE_FOLDER
+#define BAD_USB_APP_PATH_LAYOUT_FOLDER BAD_USB_APP_BASE_FOLDER
 #define BAD_USB_APP_SCRIPT_EXTENSION ".txt"
 #define BAD_USB_APP_LAYOUT_EXTENSION ".kl"
 
diff --git a/assets/resources/badusb/layouts/da-DA.kl b/assets/resources/badusb/da-DA.kl
similarity index 100%
rename from assets/resources/badusb/layouts/da-DA.kl
rename to assets/resources/badusb/da-DA.kl
diff --git a/assets/resources/badusb/layouts/de-CH.kl b/assets/resources/badusb/de-CH.kl
similarity index 100%
rename from assets/resources/badusb/layouts/de-CH.kl
rename to assets/resources/badusb/de-CH.kl
diff --git a/assets/resources/badusb/layouts/de-DE.kl b/assets/resources/badusb/de-DE.kl
similarity index 100%
rename from assets/resources/badusb/layouts/de-DE.kl
rename to assets/resources/badusb/de-DE.kl
diff --git a/assets/resources/badusb/scripts/demo_macos.txt b/assets/resources/badusb/demo_macos.txt
similarity index 100%
rename from assets/resources/badusb/scripts/demo_macos.txt
rename to assets/resources/badusb/demo_macos.txt
diff --git a/assets/resources/badusb/scripts/demo_windows.txt b/assets/resources/badusb/demo_windows.txt
similarity index 100%
rename from assets/resources/badusb/scripts/demo_windows.txt
rename to assets/resources/badusb/demo_windows.txt
diff --git a/assets/resources/badusb/layouts/dvorak.kl b/assets/resources/badusb/dvorak.kl
similarity index 100%
rename from assets/resources/badusb/layouts/dvorak.kl
rename to assets/resources/badusb/dvorak.kl
diff --git a/assets/resources/badusb/layouts/en-UK.kl b/assets/resources/badusb/en-UK.kl
similarity index 100%
rename from assets/resources/badusb/layouts/en-UK.kl
rename to assets/resources/badusb/en-UK.kl
diff --git a/assets/resources/badusb/layouts/en-US.kl b/assets/resources/badusb/en-US.kl
similarity index 100%
rename from assets/resources/badusb/layouts/en-US.kl
rename to assets/resources/badusb/en-US.kl
diff --git a/assets/resources/badusb/layouts/es-ES.kl b/assets/resources/badusb/es-ES.kl
similarity index 100%
rename from assets/resources/badusb/layouts/es-ES.kl
rename to assets/resources/badusb/es-ES.kl
diff --git a/assets/resources/badusb/layouts/fr-BE.kl b/assets/resources/badusb/fr-BE.kl
similarity index 100%
rename from assets/resources/badusb/layouts/fr-BE.kl
rename to assets/resources/badusb/fr-BE.kl
diff --git a/assets/resources/badusb/layouts/fr-CH.kl b/assets/resources/badusb/fr-CH.kl
similarity index 100%
rename from assets/resources/badusb/layouts/fr-CH.kl
rename to assets/resources/badusb/fr-CH.kl
diff --git a/assets/resources/badusb/layouts/fr-FR.kl b/assets/resources/badusb/fr-FR.kl
similarity index 100%
rename from assets/resources/badusb/layouts/fr-FR.kl
rename to assets/resources/badusb/fr-FR.kl
diff --git a/assets/resources/badusb/layouts/hu-HU.kl b/assets/resources/badusb/hu-HU.kl
similarity index 100%
rename from assets/resources/badusb/layouts/hu-HU.kl
rename to assets/resources/badusb/hu-HU.kl
diff --git a/assets/resources/badusb/layouts/it-IT.kl b/assets/resources/badusb/it-IT.kl
similarity index 100%
rename from assets/resources/badusb/layouts/it-IT.kl
rename to assets/resources/badusb/it-IT.kl
diff --git a/assets/resources/badusb/layouts/nl-NL.kl b/assets/resources/badusb/nl-NL.kl
similarity index 100%
rename from assets/resources/badusb/layouts/nl-NL.kl
rename to assets/resources/badusb/nl-NL.kl
diff --git a/assets/resources/badusb/layouts/pt-PT.kl b/assets/resources/badusb/pt-PT.kl
similarity index 100%
rename from assets/resources/badusb/layouts/pt-PT.kl
rename to assets/resources/badusb/pt-PT.kl
diff --git a/assets/resources/badusb/layouts/sv-SE.kl b/assets/resources/badusb/sv-SE.kl
similarity index 100%
rename from assets/resources/badusb/layouts/sv-SE.kl
rename to assets/resources/badusb/sv-SE.kl