diff --git a/Makefile b/Makefile
index 68c8c3d..d883eb7 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ ifeq ($(ENABLE_UART),1)
 OBJS += driver/aes.o
 endif
 ifeq ($(ENABLE_MESSENGER),1)
-	OBJS += app/messenger.o
+	OBJS += apps/messenger.o
 endif
 OBJS += driver/backlight.o
 ifeq ($(ENABLE_FMRADIO),1)
@@ -135,33 +135,33 @@ OBJS += driver/uart.o
 endif
 
 # Main
-OBJS += app/action.o
+OBJS += main/action.o
 ifeq ($(ENABLE_AM_FIX),1)
 OBJS += am_fix.o
 endif
 ifeq ($(ENABLE_AIRCOPY),1)
-OBJS += app/aircopy.o
+OBJS += main/aircopy.o
 endif
-OBJS += app/app.o
-OBJS += app/dtmf.o
-OBJS += app/finput.o
+OBJS += main/app.o
+OBJS += main/dtmf.o
+OBJS += main/finput.o
 ifeq ($(ENABLE_FMRADIO),1)
-OBJS += app/fm.o
+OBJS += main/fm.o
 endif
-OBJS += app/generic.o
-OBJS += app/main.o
-OBJS += app/menu.o
-OBJS += app/appmenu.o
-OBJS += app/scanner.o
+OBJS += main/generic.o
+OBJS += main/main.o
+OBJS += main/menu.o
+OBJS += main/appmenu.o
+OBJS += main/scanner.o
 ifeq ($(ENABLE_SPECTRUM), 1)
-OBJS += app/spectrum.o
+OBJS += main/spectrum.o
 endif
 ifeq ($(ENABLE_SPECTRUM_NUNU), 1)
-OBJS += app/spectrumnunu.o
+OBJS += main/spectrumnunu.o
 endif
 
 ifeq ($(ENABLE_UART),1)
-OBJS += app/uart.o
+OBJS += main/uart.o
 endif
 OBJS += audio.o
 OBJS += bitmaps.o
@@ -188,7 +188,7 @@ ifeq ($(ENABLE_MESSENGER),1)
 	OBJS += ui/messenger.o
 endif
 ifeq ($(ENABLE_LIVESEEK_MHZ_KEYPAD),1)
-OBJS += app/ceccommon.o
+OBJS += main/ceccommon.o
 endif
 OBJS += ui/helper.o
 OBJS += ui/inputbox.o
diff --git a/am_fix.c b/am_fix.c
index 4ddf932..494d03b 100644
--- a/am_fix.c
+++ b/am_fix.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "am_fix.h"
-#include "app/main.h"
+#include "main/main.h"
 #include "board.h"
 #include "driver/bk4819.h"
 #include "external/printf/printf.h"
diff --git a/app/messenger.c b/apps/messenger.c
similarity index 99%
rename from app/messenger.c
rename to apps/messenger.c
index ae549aa..d9323c2 100644
--- a/app/messenger.c
+++ b/apps/messenger.c
@@ -8,11 +8,11 @@
 #include "misc.h"
 #include "settings.h"
 #include "radio.h"
-#include "app.h"
+#include "main/app.h"
 #include "audio.h"
 #include "functions.h"
 #include "driver/system.h"
-#include "app/messenger.h"
+#include "apps/messenger.h"
 #include "ui/ui.h"
 #include "ui/status.h"
 #include "frequencies.h"
diff --git a/app/messenger.h b/apps/messenger.h
similarity index 100%
rename from app/messenger.h
rename to apps/messenger.h
diff --git a/audio.c b/audio.c
index 488a7d8..65076c4 100644
--- a/audio.c
+++ b/audio.c
@@ -15,7 +15,7 @@
  */
 
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "audio.h"
 #include "bsp/dp32g030/gpio.h"
diff --git a/board.c b/board.c
index 3049618..ec7d7e5 100644
--- a/board.c
+++ b/board.c
@@ -16,9 +16,9 @@
  */
 
 #include <string.h>
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "board.h"
 #include "bsp/dp32g030/gpio.h"
@@ -44,7 +44,7 @@
 #include "sram-overlay.h"
 #endif
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 
 static const uint32_t gDefaultFrequencyTable[5] = {
diff --git a/compile-with-docker.sh b/compile-with-docker.sh
index 028f6e9..0fb7c56 100755
--- a/compile-with-docker.sh
+++ b/compile-with-docker.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 docker build -t uvk5 .
-docker run --rm -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp firmware* compiled-firmware/"
\ No newline at end of file
+docker run --rm -v ${PWD}/compiled-firmware:/main/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp firmware* compiled-firmware/"
\ No newline at end of file
diff --git a/driver/bk4819old.c b/driver/bk4819old.c
index aa0f341..5baef22 100644
--- a/driver/bk4819old.c
+++ b/driver/bk4819old.c
@@ -23,7 +23,7 @@
 #include "../driver/uart.h"
 
 #ifdef ENABLE_CW
-#include "../app/scanner.h"
+#include "../main/scanner.h"
 #include "../audio.h"
 #include "../driver/bk4819.h"
 #include "../frequencies.h"
@@ -32,7 +32,7 @@
 #include "../settings.h"
 #include "../ui/inputbox.h"
 #include "../ui/ui.h"
-#include "../app/generic.h"
+#include "../main/generic.h"
 #endif
 
 #ifdef ENABLE_MDC
diff --git a/external/CMSIS_5/CMSIS/CoreValidation/Project/Bootloader.cproject.yml b/external/CMSIS_5/CMSIS/CoreValidation/Project/Bootloader.cproject.yml
index 3453694..8b77083 100644
--- a/external/CMSIS_5/CMSIS/CoreValidation/Project/Bootloader.cproject.yml
+++ b/external/CMSIS_5/CMSIS/CoreValidation/Project/Bootloader.cproject.yml
@@ -3,7 +3,7 @@
 project:
   layers:
     # App: CMSIS-Core Validation for Cortex-M (Bootloader part)
-    - layer: ../Layer/App/Bootloader_Cortex-M/App.clayer.yml
+    - layer: ../Layer/main/Bootloader_Cortex-M/App.clayer.yml
       for-context:
         - .AC6_low
         - .AC6_mid
diff --git a/external/CMSIS_5/CMSIS/CoreValidation/Project/Validation.cproject.yml b/external/CMSIS_5/CMSIS/CoreValidation/Project/Validation.cproject.yml
index 23e5b1a..7b5d31a 100644
--- a/external/CMSIS_5/CMSIS/CoreValidation/Project/Validation.cproject.yml
+++ b/external/CMSIS_5/CMSIS/CoreValidation/Project/Validation.cproject.yml
@@ -3,7 +3,7 @@
 project:
   layers:
     # App: CMSIS-Core Validation for Cortex-M
-    - layer: ../Layer/App/Validation_Cortex-M/App.clayer.yml
+    - layer: ../Layer/main/Validation_Cortex-M/App.clayer.yml
       for-context:
         - +CM0
         - +CM0plus
@@ -28,7 +28,7 @@ project:
         - +CM85NS
 
     # App: CMSIS-Core Validation for Cortex-A
-    - layer: ../Layer/App/Validation_Cortex-A/App.clayer.yml
+    - layer: ../Layer/main/Validation_Cortex-A/App.clayer.yml
       for-context:
         - +CA5
         - +CA7
diff --git a/functions.c b/functions.c
index 5cbcb9d..d6ee0d7 100644
--- a/functions.c
+++ b/functions.c
@@ -14,13 +14,13 @@
  *     limitations under the License.
  */
  
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #ifdef ENABLE_MESSENGER
-	#include "app/messenger.h"
+	#include "apps/messenger.h"
 #endif
 #include "bsp/dp32g030/gpio.h"
 #include "dcs.h"
diff --git a/helper/boot.c b/helper/boot.c
index 71e8a4d..237a347 100644
--- a/helper/boot.c
+++ b/helper/boot.c
@@ -14,7 +14,7 @@
  *     limitations under the License.
  */
 
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk4819.h"
 #include "driver/keyboard.h"
diff --git a/main.c b/main.c
index f6007c5..784d0ed 100644
--- a/main.c
+++ b/main.c
@@ -14,10 +14,10 @@
  *     limitations under the License.
  */
 
-#include "app/app.h"
-#include "app/dtmf.h"
+#include "main/app.h"
+#include "main/dtmf.h"
 #ifdef ENABLE_MESSENGER
-	#include "app/messenger.h"
+	#include "apps/messenger.h"
 #endif
 
 #include "audio.h"
@@ -52,7 +52,7 @@
 
 #include "driver/eeprom.h"
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 
 void _putchar(char c) {
diff --git a/app/action.c b/main/action.c
similarity index 97%
rename from app/action.c
rename to main/action.c
index 5872837..818d263 100644
--- a/app/action.c
+++ b/main/action.c
@@ -14,13 +14,13 @@
  *     limitations under the License.
  */
 
-#include "app/action.h"
-#include "app/app.h"
-#include "app/dtmf.h"
+#include "main/action.h"
+#include "main/app.h"
+#include "main/dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk1080.h"
diff --git a/app/action.h b/main/action.h
similarity index 100%
rename from app/action.h
rename to main/action.h
diff --git a/app/aircopy.c b/main/aircopy.c
similarity index 99%
rename from app/aircopy.c
rename to main/aircopy.c
index 1e75263..0f06423 100644
--- a/app/aircopy.c
+++ b/main/aircopy.c
@@ -14,7 +14,7 @@
  *     limitations under the License.
  */
 
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #include "audio.h"
 #include "driver/bk4819.h"
 #include "driver/crc.h"
diff --git a/app/aircopy.h b/main/aircopy.h
similarity index 100%
rename from app/aircopy.h
rename to main/aircopy.h
diff --git a/app/app.c b/main/app.c
similarity index 99%
rename from app/app.c
rename to main/app.c
index ae4048d..d141b8d 100644
--- a/app/app.c
+++ b/main/app.c
@@ -14,29 +14,29 @@
  *     limitations under the License.
  */
 
-#include "app/action.h"
+#include "main/action.h"
 #include <string.h>
 #if defined(ENABLE_AIRCOPY)
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #endif
 #if defined(ENABLE_AM_FIX)
 #include "am_fix.h"
 #endif
-#include "app/app.h"
+#include "main/app.h"
 #include "dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "appmenu.h"
-#include "app/generic.h"
-#include "app/main.h"
-#include "app/menu.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/main.h"
+#include "main/menu.h"
+#include "main/scanner.h"
 #if defined(ENABLE_UART)
-#include "app/uart.h"
+#include "main/uart.h"
 #endif
 #ifdef ENABLE_MESSENGER
-	#include "messenger.h"
+	#include "apps/messenger.h"
 #endif
 #include "../apps/scanlist.h"
 #include "ARMCM0.h"
diff --git a/app/app.h b/main/app.h
similarity index 100%
rename from app/app.h
rename to main/app.h
diff --git a/app/appmenu.c b/main/appmenu.c
similarity index 98%
rename from app/appmenu.c
rename to main/appmenu.c
index ec06982..2b1c64d 100644
--- a/app/appmenu.c
+++ b/main/appmenu.c
@@ -1,7 +1,7 @@
 #include "appmenu.h"
 #include "../ui/welcome.h"
 #ifdef ENABLE_MESSENGER
-	#include "../app/messenger.h"
+	#include "../apps/messenger.h"
   #include "frequencies.h"
   #include "external/printf/printf.h"
   #include "settings.h"
diff --git a/app/appmenu.h b/main/appmenu.h
similarity index 100%
rename from app/appmenu.h
rename to main/appmenu.h
diff --git a/app/ceccommon.c b/main/ceccommon.c
similarity index 99%
rename from app/ceccommon.c
rename to main/ceccommon.c
index 7225d13..a7b7c13 100644
--- a/app/ceccommon.c
+++ b/main/ceccommon.c
@@ -33,7 +33,7 @@ TADC_RANGE CW_KEY_ADC[3];
 
 //================================= For Reduce Use Memory ====================
 //gMR_ChannelAttributes[207]; -> function
-//resize to 7 byte and Move to app/ceccommon.c 
+//resize to 7 byte and Move to main/ceccommon.c 
 uint16_t CEC_GetRssi() 
 {
   int _wait_count = 0;
diff --git a/app/ceccommon.h b/main/ceccommon.h
similarity index 100%
rename from app/ceccommon.h
rename to main/ceccommon.h
diff --git a/app/chFrScanner.c b/main/chFrScanner.c
similarity index 99%
rename from app/chFrScanner.c
rename to main/chFrScanner.c
index 24d0f5e..5aa4beb 100644
--- a/app/chFrScanner.c
+++ b/main/chFrScanner.c
@@ -1,6 +1,6 @@
 
-#include "app/app.h"
-#include "app/chFrScanner.h"
+#include "main/app.h"
+#include "main/chFrScanner.h"
 #include "functions.h"
 #include "misc.h"
 #include "settings.h"
diff --git a/app/chFrScanner.h b/main/chFrScanner.h
similarity index 100%
rename from app/chFrScanner.h
rename to main/chFrScanner.h
diff --git a/app/dtmf.c b/main/dtmf.c
similarity index 99%
rename from app/dtmf.c
rename to main/dtmf.c
index c9dc0cf..6c10b6b 100644
--- a/app/dtmf.c
+++ b/main/dtmf.c
@@ -17,9 +17,9 @@
 
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "bsp/dp32g030/gpio.h"
 #include "driver/bk4819.h"
 #include "driver/eeprom.h"
diff --git a/app/dtmf.h b/main/dtmf.h
similarity index 100%
rename from app/dtmf.h
rename to main/dtmf.h
diff --git a/app/finput.c b/main/finput.c
similarity index 100%
rename from app/finput.c
rename to main/finput.c
diff --git a/app/finput.h b/main/finput.h
similarity index 100%
rename from app/finput.h
rename to main/finput.h
diff --git a/app/fm.c b/main/fm.c
similarity index 99%
rename from app/fm.c
rename to main/fm.c
index 6d748ec..546f95d 100644
--- a/app/fm.c
+++ b/main/fm.c
@@ -15,9 +15,9 @@
  */
 
 #include <string.h>
-#include "app/action.h"
-#include "app/fm.h"
-#include "app/generic.h"
+#include "main/action.h"
+#include "main/fm.h"
+#include "main/generic.h"
 #include "audio.h"
 #include "bsp/dp32g030/gpio.h"
 #if defined(ENABLE_FMRADIO)
diff --git a/app/fm.h b/main/fm.h
similarity index 100%
rename from app/fm.h
rename to main/fm.h
diff --git a/app/generic.c b/main/generic.c
similarity index 97%
rename from app/generic.c
rename to main/generic.c
index f1164a4..bfac70a 100644
--- a/app/generic.c
+++ b/main/generic.c
@@ -14,13 +14,13 @@
  *     limitations under the License.
  */
 
-#include "app/app.h"
+#include "main/app.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/generic.h"
-#include "app/menu.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/menu.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "driver/keyboard.h"
 #include "dtmf.h"
diff --git a/app/generic.h b/main/generic.h
similarity index 100%
rename from app/generic.h
rename to main/generic.h
diff --git a/app/main.c b/main/main.c
similarity index 98%
rename from app/main.c
rename to main/main.c
index cb34c76..562f287 100644
--- a/app/main.c
+++ b/main/main.c
@@ -14,24 +14,24 @@
  *     limitations under the License.
  */
 
-#include "app/action.h"
-#include "app/app.h"
+#include "main/action.h"
+#include "main/app.h"
 #include "finput.h"
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/generic.h"
-#include "app/main.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/main.h"
+#include "main/scanner.h"
 #if defined(ENABLE_SPECTRUM)
-#include "app/spectrum.h"
+#include "main/spectrum.h"
 #endif
 #if defined(ENABLE_SPECTRUM_NUNU)
-#include "app/spectrumnunu.h"
+#include "main/spectrumnunu.h"
 #endif
 #if defined(ENABLE_MESSENGER)
-#include "app/messenger.h"
+#include "apps/messenger.h"
 #endif
 #ifdef ENABLE_MESSENGER
 #include "../ui/messenger.h"
@@ -48,7 +48,7 @@
 #include "ui/inputbox.h"
 #include "ui/ui.h"
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 
 static void SwitchActiveVFO() {
diff --git a/app/main.h b/main/main.h
similarity index 100%
rename from app/main.h
rename to main/main.h
diff --git a/app/menu.c b/main/menu.c
similarity index 99%
rename from app/menu.c
rename to main/menu.c
index e5a6fa1..a44401b 100644
--- a/app/menu.c
+++ b/main/menu.c
@@ -20,11 +20,11 @@
 #include "ARMCM0.h"
 #endif
 #ifdef ENABLE_DTMF_CALLING
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #endif
-#include "app/generic.h"
-#include "app/menu.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/menu.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "board.h"
 #include "bsp/dp32g030/gpio.h"
@@ -44,7 +44,7 @@
 #include "ui/menu.h"
 #include "ui/ui.h"
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 
 /*#ifndef ARRAY_SIZE
diff --git a/app/menu.h b/main/menu.h
similarity index 100%
rename from app/menu.h
rename to main/menu.h
diff --git a/app/scanner.c b/main/scanner.c
similarity index 99%
rename from app/scanner.c
rename to main/scanner.c
index eda1ead..7169e60 100644
--- a/app/scanner.c
+++ b/main/scanner.c
@@ -14,8 +14,8 @@
  *     limitations under the License.
  */
 
-#include "app/generic.h"
-#include "app/scanner.h"
+#include "main/generic.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "driver/bk4819.h"
 #include "frequencies.h"
diff --git a/app/scanner.h b/main/scanner.h
similarity index 100%
rename from app/scanner.h
rename to main/scanner.h
diff --git a/app/spectrum.c b/main/spectrum.c
similarity index 99%
rename from app/spectrum.c
rename to main/spectrum.c
index 1d33a11..915a182 100644
--- a/app/spectrum.c
+++ b/main/spectrum.c
@@ -14,7 +14,7 @@
  *     limitations under the License.
  */
 
-#include "../app/spectrum.h"
+#include "../main/spectrum.h"
 #include "finput.h"
 #include <string.h>
 #define F_MIN FrequencyBandTable[0].lower
diff --git a/app/spectrum.h b/main/spectrum.h
similarity index 99%
rename from app/spectrum.h
rename to main/spectrum.h
index adbd989..7aa7303 100644
--- a/app/spectrum.h
+++ b/main/spectrum.h
@@ -18,8 +18,8 @@
 #define SPECTRUM_H
 
 #include "../am_fix.h"
-#include "../app/finput.h"
-#include "../app/uart.h"
+#include "../main/finput.h"
+#include "../main/uart.h"
 #include "../bitmaps.h"
 #include "../board.h"
 #include "../bsp/dp32g030/gpio.h"
diff --git a/app/uart.c b/main/uart.c
similarity index 99%
rename from app/uart.c
rename to main/uart.c
index 779216a..7f60089 100644
--- a/app/uart.c
+++ b/main/uart.c
@@ -19,13 +19,13 @@
 #include "ARMCM0.h"
 #endif
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #ifdef ENABLE_MESSENGER
-#include "app/messenger.h"
+#include "apps/messenger.h"
 #include "external/printf/printf.h"
 #endif
-#include "app/uart.h"
+#include "main/uart.h"
 #include "board.h"
 #include "bsp/dp32g030/dma.h"
 #include "bsp/dp32g030/gpio.h"
diff --git a/app/uart.h b/main/uart.h
similarity index 100%
rename from app/uart.h
rename to main/uart.h
diff --git a/radio.c b/radio.c
index 3c1accb..c0a3d72 100644
--- a/radio.c
+++ b/radio.c
@@ -13,14 +13,14 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #include "helper/measurements.h"
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #ifdef ENABLE_MESSENGER
-	#include "app/messenger.h"
+	#include "apps/messenger.h"
 #endif
 
 #include "audio.h"
diff --git a/scheduler.c b/scheduler.c
index a88aed0..02b5c60 100644
--- a/scheduler.c
+++ b/scheduler.c
@@ -15,9 +15,9 @@
  */
 
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "audio.h"
 #include "functions.h"
 #include "helper/battery.h"
diff --git a/settings.c b/settings.c
index 66f6ec0..c056ff0 100644
--- a/settings.c
+++ b/settings.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "driver/eeprom.h"
 #if defined(ENABLE_UART)
@@ -25,7 +25,7 @@
 #include "misc.h"
 #include "settings.h"
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 EEPROM_Config_t gEeprom;
 
diff --git a/ui/aircopy.c b/ui/aircopy.c
index be33ea0..63e38aa 100644
--- a/ui/aircopy.c
+++ b/ui/aircopy.c
@@ -15,7 +15,7 @@
  */
 
 #include <string.h>
-#include "app/aircopy.h"
+#include "main/aircopy.h"
 #include "driver/st7565.h"
 #include "external/printf/printf.h"
 #include "misc.h"
diff --git a/ui/fmradio.c b/ui/fmradio.c
index 5f58e6d..91dc4a4 100644
--- a/ui/fmradio.c
+++ b/ui/fmradio.c
@@ -15,7 +15,7 @@
  */
 
 #include <string.h>
-#include "../app/fm.h"
+#include "../main/fm.h"
 #include "../driver/st7565.h"
 #include "../external/printf/printf.h"
 #include "../misc.h"
diff --git a/ui/lock.c b/ui/lock.c
index 7187d13..63633e6 100644
--- a/ui/lock.c
+++ b/ui/lock.c
@@ -17,7 +17,7 @@
 #include "ARMCM0.h"
 #include <string.h>
 #if defined(ENABLE_UART)
-#include "../app/uart.h"
+#include "../main/uart.h"
 #endif
 #include "../audio.h"
 #include "../driver/keyboard.h"
diff --git a/ui/main.c b/ui/main.c
index 467013e..3baf4b4 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -16,8 +16,8 @@
  */
 
 #include "../ui/main.h"
-#include "../app/dtmf.h"
-#include "../app/finput.h"
+#include "../main/dtmf.h"
+#include "../main/finput.h"
 #include "../bitmaps.h"
 #include "../driver/bk4819.h"
 #include "../driver/st7565.h"
@@ -33,7 +33,7 @@
 #include "../ui/rssi.h"
 #include "../ui/ui.h"
 #ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
-#include "app/ceccommon.h"
+#include "main/ceccommon.h"
 #endif
 #include <string.h>
 
diff --git a/ui/menu.c b/ui/menu.c
index beeed24..f1aca2c 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -16,7 +16,7 @@
 
 #include "menu.h"
 #ifdef ENABLE_DTMF_CALLING
-#include "../app/dtmf.h"
+#include "../main/dtmf.h"
 #endif
 #include "../bitmaps.h"
 #include "../dcs.h"
diff --git a/ui/messenger.c b/ui/messenger.c
index fad34cd..5df2a69 100644
--- a/ui/messenger.c
+++ b/ui/messenger.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include <string.h>
-#include "app/messenger.h"
+#include "apps/messenger.h"
 #include "driver/st7565.h"
 #include "external/printf/printf.h"
 #include "misc.h"
diff --git a/ui/scanner.c b/ui/scanner.c
index 672c345..87dd853 100644
--- a/ui/scanner.c
+++ b/ui/scanner.c
@@ -16,7 +16,7 @@
 
 #include <stdbool.h>
 #include <string.h>
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "dcs.h"
 #include "driver/st7565.h"
 #include "external/printf/printf.h"
diff --git a/ui/status.c b/ui/status.c
index 0fc9cbb..254fb96 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -17,10 +17,10 @@
 #include "battery.h"
 #include <string.h>
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #ifdef ENABLE_MESSENGER
-	#include "app/messenger.h"
+	#include "apps/messenger.h"
 #endif
 #include "../bitmaps.h"
 #include "../driver/keyboard.h"
diff --git a/ui/ui.c b/ui/ui.c
index c1a17be..c1a605d 100644
--- a/ui/ui.c
+++ b/ui/ui.c
@@ -15,12 +15,12 @@
  */
 
 #include <string.h>
-#include "app/dtmf.h"
+#include "main/dtmf.h"
 #if defined(ENABLE_FMRADIO)
-#include "app/fm.h"
+#include "main/fm.h"
 #endif
 #include "appmenu.h"
-#include "app/scanner.h"
+#include "main/scanner.h"
 #include "driver/keyboard.h"
 #include "misc.h"
 #if defined(ENABLE_AIRCOPY)