diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 2798f57c..112fa97d 100755
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -16,40 +16,40 @@ if(CONFIG_BOARD_TYPE_BREAD_COMPACT_WIFI)
     # add all files from boards/bread-compact-wifi
     set(BOARD_TYPE "bread-compact-wifi")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "wifi_board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
 elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ML307)
     # add all files from boards/bread-compact-ml307
     set(BOARD_TYPE "bread-compact-ml307")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "ml307_board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "boards/ml307_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
 elseif(CONFIG_BOARD_TYPE_ESP_BOX_3)
     # add all files from boards/esp-box-3
     set(BOARD_TYPE "esp-box-3")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "wifi_board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
     list(APPEND SOURCES "box_audio_device.cc")
 elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_0)
     # add all files from boards/kevin-box-0
     set(BOARD_TYPE "kevin-box-0")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "ml307_board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
     list(APPEND SOURCES "box_audio_device.cc")
 elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_1)
     # add all files from boards/kevin-box-1
     set(BOARD_TYPE "kevin-box-1")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "ml307_board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "boards/ml307_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
     list(APPEND SOURCES "box_audio_device.cc")
 elseif(CONFIG_BOARD_TYPE_LICHUANG_DEV)
     # add all files from boards/lichuang-dev
     set(BOARD_TYPE "lichuang-dev")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "wifi_board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "boards/wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
     list(APPEND SOURCES "box_audio_device.cc")
 endif()
diff --git a/main/board.h b/main/board.h
index 666f53af..e570a604 100644
--- a/main/board.h
+++ b/main/board.h
@@ -9,6 +9,7 @@
 
 void* create_board();
 class AudioDevice;
+class Display;
 
 class Board {
 private:
diff --git a/main/boards/bread-compact-ml307/compact_ml307_board.cc b/main/boards/bread-compact-ml307/compact_ml307_board.cc
index 9fa1f7ac..756cbab6 100644
--- a/main/boards/bread-compact-ml307/compact_ml307_board.cc
+++ b/main/boards/bread-compact-ml307/compact_ml307_board.cc
@@ -1,4 +1,4 @@
-#include "ml307_board.h"
+#include "boards/ml307_board.h"
 #include "system_reset.h"
 #include "audio_device.h"
 
diff --git a/main/boards/bread-compact-wifi/compact_wifi_board.cc b/main/boards/bread-compact-wifi/compact_wifi_board.cc
index f53754c8..b5620ff6 100644
--- a/main/boards/bread-compact-wifi/compact_wifi_board.cc
+++ b/main/boards/bread-compact-wifi/compact_wifi_board.cc
@@ -1,4 +1,4 @@
-#include "wifi_board.h"
+#include "boards/wifi_board.h"
 #include "system_reset.h"
 #include "audio_device.h"
 
diff --git a/main/boards/esp-box-3/esp_box3_board.cc b/main/boards/esp-box-3/esp_box3_board.cc
index 458d91ab..3604bacb 100644
--- a/main/boards/esp-box-3/esp_box3_board.cc
+++ b/main/boards/esp-box-3/esp_box3_board.cc
@@ -1,4 +1,4 @@
-#include "wifi_board.h"
+#include "boards/wifi_board.h"
 #include "box_audio_device.h"
 
 #include <esp_log.h>
diff --git a/main/boards/kevin-box-0/kevin_box_board.cc b/main/boards/kevin-box-0/kevin_box_board.cc
index b3a025e7..192df605 100644
--- a/main/boards/kevin-box-0/kevin_box_board.cc
+++ b/main/boards/kevin-box-0/kevin_box_board.cc
@@ -1,4 +1,4 @@
-#include "ml307_board.h"
+#include "boards/ml307_board.h"
 #include "box_audio_device.h"
 
 #include <esp_log.h>
diff --git a/main/boards/kevin-box-1/kevin_box_board.cc b/main/boards/kevin-box-1/kevin_box_board.cc
index a2497d1d..d29d08ad 100644
--- a/main/boards/kevin-box-1/kevin_box_board.cc
+++ b/main/boards/kevin-box-1/kevin_box_board.cc
@@ -1,4 +1,4 @@
-#include "ml307_board.h"
+#include "boards/ml307_board.h"
 #include "box_audio_device.h"
 
 #include <esp_log.h>
diff --git a/main/boards/lichuang-dev/lichuang_dev_board.cc b/main/boards/lichuang-dev/lichuang_dev_board.cc
index cd660ae5..78de9448 100644
--- a/main/boards/lichuang-dev/lichuang_dev_board.cc
+++ b/main/boards/lichuang-dev/lichuang_dev_board.cc
@@ -1,4 +1,4 @@
-#include "wifi_board.h"
+#include "boards/wifi_board.h"
 #include "box_audio_device.h"
 
 #include <esp_log.h>
diff --git a/main/ml307_board.cc b/main/boards/ml307_board.cc
similarity index 100%
rename from main/ml307_board.cc
rename to main/boards/ml307_board.cc
diff --git a/main/ml307_board.h b/main/boards/ml307_board.h
similarity index 100%
rename from main/ml307_board.h
rename to main/boards/ml307_board.h
diff --git a/main/wifi_board.cc b/main/boards/wifi_board.cc
similarity index 100%
rename from main/wifi_board.cc
rename to main/boards/wifi_board.cc
diff --git a/main/wifi_board.h b/main/boards/wifi_board.h
similarity index 100%
rename from main/wifi_board.h
rename to main/boards/wifi_board.h