diff --git a/Makefile b/Makefile
index 1d60988d4..41740d791 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ INCLUDE += $(BOARD_DIR)/Makefile.mk
 CFLAGS+=-I$(BOARD_DIR)/include -D__BOARD__=$(BOARD)
 include $(BOARD_DIR)/Makefile.mk
 SRC += $(foreach src, $(board-y), $(BOARD_DIR)/$(src))
-SRC += $(foreach src, $(board-common-y), $(SYSTEM76_COMMON_DIR)/$(src))
 SRC += $(foreach src, $(keyboard-y), $(KEYBOARD_DIR)/$(src))
 
 # The board will define the embedded controller
@@ -60,6 +59,13 @@ CFLAGS+=-I$(ARCH_DIR)/include -D__ARCH__=$(ARCH)
 include $(ARCH_DIR)/Makefile.mk
 SRC += $(foreach src, $(arch-y), $(ARCH_DIR)/$(src))
 
+# Add System76 EC app
+APP_DIR = src/app/main
+INCLUDE += $(APP_DIR)/Makefile.mk
+CFLAGS += -I$(APP_DIR)/include
+include $(APP_DIR)/Makefile.mk
+SRC += $(foreach src,$(app-y),$(APP_DIR)/$(src))
+
 include $(ARCH_DIR)/toolchain.mk
 
 # TODO: Generate config file as part of build.
diff --git a/docs/debugging.md b/docs/debugging.md
index 4904cf08a..887fe4dbd 100644
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -41,7 +41,7 @@ For details on configuring the Mega 2560 and breakout board, see
 #### Setup
 
 1. Enable parallel port debugging in the EC firmware
-    - Uncomment `PARALLEL_DEBUG` in `src/board/system76/common/Makefile.mk`
+    - Uncomment `PARALLEL_DEBUG` in `src/app/main/Makefile.mk`
     - Build and flash the firmware for the target
 2. Power off target
 3. Remove bottom panel
@@ -112,7 +112,7 @@ Requirements:
 - USB-C cable
 
 1. Enable I2C debugging in the EC firmware for the target
-    - Uncomment `I2C_DEBUGGER` in `src/board/system76/common/Makefile.mk`
+    - Uncomment `I2C_DEBUGGER` in `src/app/main/Makefile.mk`
     - Build and flash firmware
 2. Connect Trinket M0 to host
     - This will create an ACM device at `/dev/ttyACM*`
diff --git a/src/board/system76/common/Makefile.mk b/src/app/main/Makefile.mk
similarity index 75%
rename from src/board/system76/common/Makefile.mk
rename to src/app/main/Makefile.mk
index a817a64ab..4a328311f 100644
--- a/src/board/system76/common/Makefile.mk
+++ b/src/app/main/Makefile.mk
@@ -1,29 +1,29 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-board-common-y += acpi.c
-board-common-y += battery.c
-board-common-y += config.c
-board-common-$(CONFIG_HAVE_DGPU) += dgpu.c
-board-common-y += ecpm.c
-board-common-$(CONFIG_BUS_ESPI) += espi.c
-board-common-y += fan.c
-board-common-y += gctrl.c
-board-common-y += kbc.c
-board-common-y += kbscan.c
-board-common-y += keymap.c
-board-common-y += lid.c
-board-common-y += main.c
-board-common-y += parallel.c
-board-common-y += pmc.c
-board-common-y += pnp.c
-board-common-y += ps2.c
-board-common-y += pwm.c
-board-common-y += scratch.c
-board-common-$(CONFIG_SECURITY) += security.c
-board-common-y += smbus.c
-board-common-y += smfi.c
-board-common-y += stdio.c
-board-common-y += wireless.c
+app-y += acpi.c
+app-y += battery.c
+app-y += config.c
+app-$(CONFIG_HAVE_DGPU) += dgpu.c
+app-y += ecpm.c
+app-$(CONFIG_BUS_ESPI) += espi.c
+app-y += fan.c
+app-y += gctrl.c
+app-y += kbc.c
+app-y += kbscan.c
+app-y += keymap.c
+app-y += lid.c
+app-y += main.c
+app-y += parallel.c
+app-y += pmc.c
+app-y += pnp.c
+app-y += ps2.c
+app-y += pwm.c
+app-y += scratch.c
+app-$(CONFIG_SECURITY) += security.c
+app-y += smbus.c
+app-y += smfi.c
+app-y += stdio.c
+app-y += wireless.c
 
 # Set log level
 # 0 - NONE
@@ -46,11 +46,11 @@ CFLAGS+=-DCONFIG_SECURITY=1
 endif
 
 ifeq ($(CONFIG_PLATFORM_INTEL),y)
-board-common-y += peci.c
-board-common-y += power/intel.c
+app-y += peci.c
+app-y += power/intel.c
 CFLAGS += -DCONFIG_PLATFORM_INTEL=1
 else ifeq ($(CONFIG_PLATFORM_AMD),y)
-board-common-y += power/amd.c
+app-y += power/amd.c
 CFLAGS += -DCONFIG_PLATFORM_AMD=1
 else
 $(error PLATFORM not specified)
@@ -74,11 +74,6 @@ CFLAGS += -DCONFIG_HAVE_DGPU=1
 CFLAGS += -DI2C_DGPU=$(CONFIG_I2C_DGPU)
 endif
 
-# Include system76 common source
-SYSTEM76_COMMON_DIR=src/board/system76/common
-INCLUDE += $(SYSTEM76_COMMON_DIR)/Makefile.mk
-CFLAGS+=-I$(SYSTEM76_COMMON_DIR)/include
-
 # Fan configs
 ifneq ($(CONFIG_FAN1_PWM),)
 CFLAGS += -DFAN1_PWM=$(CONFIG_FAN1_PWM)
@@ -106,7 +101,7 @@ CFLAGS+=\
 
 # Add charger
 ifneq ($(CONFIG_CHARGER),)
-board-common-y += charger/$(CONFIG_CHARGER).c
+app-y += charger/$(CONFIG_CHARGER).c
 CFLAGS += -DCHARGER_ADAPTER_RSENSE=$(CONFIG_CHARGER_ADAPTER_RSENSE)
 CFLAGS += -DCHARGER_BATTERY_RSENSE=$(CONFIG_CHARGER_BATTERY_RSENSE)
 CFLAGS += -DCHARGER_CHARGE_CURRENT=$(CONFIG_CHARGER_CHARGE_CURRENT)
@@ -120,7 +115,7 @@ endif
 # Add USB-PD
 ifeq ($(CONFIG_HAVE_USBPD),y)
 CFLAGS += -DCONFIG_HAVE_USBPD=1
-board-common-$(CONFIG_USBPD_TPS65987) += usbpd/tps65987.c
+app-$(CONFIG_USBPD_TPS65987) += usbpd/tps65987.c
 CFLAGS += -DI2C_USBPD=$(CONFIG_I2C_USBPD)
 endif
 
@@ -134,8 +129,8 @@ include $(KEYBOARD_DIR)/Makefile.mk
 # Add kbled
 ifeq ($(CONFIG_HAVE_KBLED),y)
 CFLAGS += -DCONFIG_HAVE_KBLED=1
-board-common-y += kbled/common.c
-board-common-y += kbled/$(CONFIG_KBLED).c
+app-y += kbled/common.c
+app-y += kbled/$(CONFIG_KBLED).c
 ifneq ($(CONFIG_KBLED_DAC),)
 CFLAGS += -DKBLED_DAC=$(CONFIG_KBLED_DAC)
 endif
@@ -152,11 +147,11 @@ endif # CONFIG_HAVE_KBLED
 CFLAGS += -DPS2_TOUCHPAD=$(CONFIG_PS2_TOUCHPAD)
 
 # Add scratch ROM
-include $(SYSTEM76_COMMON_DIR)/scratch/Makefile.mk
+include $(APP_DIR)/scratch/Makefile.mk
 
 # Add scratch ROM for flash access
-include $(SYSTEM76_COMMON_DIR)/flash/Makefile.mk
-board-common-y += flash/wrapper.c
+include $(APP_DIR)/flash/Makefile.mk
+app-y += flash/wrapper.c
 
 # Set external programmer
 PROGRAMMER=$(wildcard /dev/serial/by-id/usb-Arduino*)
diff --git a/src/board/system76/common/acpi.c b/src/app/main/acpi.c
similarity index 96%
rename from src/board/system76/common/acpi.c
rename to src/app/main/acpi.c
index eac2f8046..42816843d 100644
--- a/src/board/system76/common/acpi.c
+++ b/src/app/main/acpi.c
@@ -1,18 +1,18 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/acpi.h>
-#include <board/battery.h>
-#include <board/dgpu.h>
-#include <board/fan.h>
+#include <app/acpi.h>
+#include <app/battery.h>
+#include <app/dgpu.h>
+#include <app/fan.h>
+#include <app/kbled.h>
+#include <app/lid.h>
+#include <app/pwm.h>
 #include <board/gpio.h>
-#include <board/kbled.h>
-#include <board/lid.h>
-#include <board/pwm.h>
 #include <common/debug.h>
 #include <common/macro.h>
 
 #if CONFIG_PLATFORM_INTEL
-#include <board/peci.h>
+#include <app/peci.h>
 #endif
 
 #ifndef HAVE_LED_AIRPLANE_N
diff --git a/src/board/system76/common/battery.c b/src/app/main/battery.c
similarity index 98%
rename from src/board/system76/common/battery.c
rename to src/app/main/battery.c
index f98a42a25..9a56bb1f0 100644
--- a/src/board/system76/common/battery.c
+++ b/src/app/main/battery.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/flash.h>
+#include <app/battery.h>
+#include <app/flash.h>
+#include <app/smbus.h>
 #include <board/gpio.h>
-#include <board/smbus.h>
 #include <common/debug.h>
 
 struct battery_info battery_info = { 0 };
diff --git a/src/board/system76/common/charger/bq24780s.c b/src/app/main/charger/bq24780s.c
similarity index 99%
rename from src/board/system76/common/charger/bq24780s.c
rename to src/app/main/charger/bq24780s.c
index aa6c3ae2f..0d1b9a8ee 100644
--- a/src/board/system76/common/charger/bq24780s.c
+++ b/src/app/main/charger/bq24780s.c
@@ -3,8 +3,8 @@
 // TI BQ24780S Smart Charger
 // https://www.ti.com/lit/ds/symlink/bq24780s.pdf
 
-#include <board/battery.h>
-#include <board/smbus.h>
+#include <app/battery.h>
+#include <app/smbus.h>
 #include <common/macro.h>
 #include <common/debug.h>
 
diff --git a/src/board/system76/common/charger/oz26786.c b/src/app/main/charger/oz26786.c
similarity index 99%
rename from src/board/system76/common/charger/oz26786.c
rename to src/app/main/charger/oz26786.c
index 9f4ea793f..7e397660b 100644
--- a/src/board/system76/common/charger/oz26786.c
+++ b/src/app/main/charger/oz26786.c
@@ -3,8 +3,8 @@
 // O2 Micro OZ26786
 // No public datasheet
 
-#include <board/battery.h>
-#include <board/smbus.h>
+#include <app/battery.h>
+#include <app/smbus.h>
 #include <common/debug.h>
 #include <common/macro.h>
 
diff --git a/src/board/system76/common/config.c b/src/app/main/config.c
similarity index 84%
rename from src/board/system76/common/config.c
rename to src/app/main/config.c
index 399d133ed..311596e37 100644
--- a/src/board/system76/common/config.c
+++ b/src/app/main/config.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/config.h>
+#include <app/config.h>
 
-#include <board/battery.h>
-#include <board/kbscan.h>
+#include <app/battery.h>
+#include <app/kbscan.h>
 #include <board/keymap.h>
 #include <common/debug.h>
 
diff --git a/src/board/system76/common/dgpu.c b/src/app/main/dgpu.c
similarity index 96%
rename from src/board/system76/common/dgpu.c
rename to src/app/main/dgpu.c
index 8260534c3..85b749e33 100644
--- a/src/board/system76/common/dgpu.c
+++ b/src/app/main/dgpu.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/dgpu.h>
+#include <app/dgpu.h>
+#include <app/power.h>
 #include <board/gpio.h>
-#include <board/power.h>
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/i2c.h>
diff --git a/src/board/system76/common/ecpm.c b/src/app/main/ecpm.c
similarity index 92%
rename from src/board/system76/common/ecpm.c
rename to src/app/main/ecpm.c
index 48b8a565a..165741a0f 100644
--- a/src/board/system76/common/ecpm.c
+++ b/src/app/main/ecpm.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/ecpm.h>
+#include <app/ecpm.h>
 #include <common/macro.h>
 
 void ecpm_init(void) {
diff --git a/src/board/system76/common/espi.c b/src/app/main/espi.c
similarity index 99%
rename from src/board/system76/common/espi.c
rename to src/app/main/espi.c
index 010d4a6b8..70351c4a1 100644
--- a/src/board/system76/common/espi.c
+++ b/src/app/main/espi.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/espi.h>
+#include <app/espi.h>
 
+#include <app/power.h>
 #include <arch/delay.h>
-#include <board/power.h>
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/ecpm.h>
diff --git a/src/board/system76/common/fan.c b/src/app/main/fan.c
similarity index 98%
rename from src/board/system76/common/fan.c
rename to src/app/main/fan.c
index 15f005ae4..7adb04602 100644
--- a/src/board/system76/common/fan.c
+++ b/src/app/main/fan.c
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/fan.h>
-#include <board/dgpu.h>
-#include <board/power.h>
+#include <app/fan.h>
+#include <app/dgpu.h>
+#include <app/power.h>
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/pwm.h>
 
 #if CONFIG_PLATFORM_INTEL
-#include <board/peci.h>
+#include <app/peci.h>
 #endif
 
 bool fan_max = false;
diff --git a/src/board/system76/common/flash/Makefile.mk b/src/app/main/flash/Makefile.mk
similarity index 97%
rename from src/board/system76/common/flash/Makefile.mk
rename to src/app/main/flash/Makefile.mk
index ca9e11ab3..8ffa0fb08 100644
--- a/src/board/system76/common/flash/Makefile.mk
+++ b/src/app/main/flash/Makefile.mk
@@ -12,7 +12,7 @@ FLASH_INCLUDE=$(INCLUDE)
 FLASH_CFLAGS=$(CFLAGS)
 
 # Include flash source.
-FLASH_DIR=$(SYSTEM76_COMMON_DIR)/flash
+FLASH_DIR = $(APP_DIR)/flash
 # Note: main.c *must* be first to ensure that flash_start is at the correct address
 FLASH_INCLUDE += $(FLASH_DIR)/Makefile.mk
 FLASH_CFLAGS+=-I$(FLASH_DIR)/include -D__FLASH__
diff --git a/src/board/system76/common/flash/include/flash/entry.h b/src/app/main/flash/include/flash/entry.h
similarity index 100%
rename from src/board/system76/common/flash/include/flash/entry.h
rename to src/app/main/flash/include/flash/entry.h
diff --git a/src/board/system76/common/flash/main.c b/src/app/main/flash/main.c
similarity index 99%
rename from src/board/system76/common/flash/main.c
rename to src/app/main/flash/main.c
index be84a864c..79fe4cbf0 100644
--- a/src/board/system76/common/flash/main.c
+++ b/src/app/main/flash/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include <stdint.h>
-#include <board/flash.h>
+#include <app/flash.h>
 #include <flash/entry.h>
+#include <stdint.h>
 
 // EC indirect flash access
 volatile uint8_t __xdata __at(0x103B) ECINDAR0;
diff --git a/src/board/system76/common/flash/wrapper.c b/src/app/main/flash/wrapper.c
similarity index 98%
rename from src/board/system76/common/flash/wrapper.c
rename to src/app/main/flash/wrapper.c
index 824d4afac..dc904187d 100644
--- a/src/board/system76/common/flash/wrapper.c
+++ b/src/app/main/flash/wrapper.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include <stdint.h>
-#include <stddef.h>
-#include <board/flash.h>
+#include <app/flash.h>
 #include <ec/scratch.h>
 #include "include/flash/entry.h"
+#include <stdint.h>
+#include <stddef.h>
 
 // Include flash ROM
 uint8_t __code __at(FLASH_OFFSET) flash_rom[] = {
diff --git a/src/board/system76/common/gctrl.c b/src/app/main/gctrl.c
similarity index 86%
rename from src/board/system76/common/gctrl.c
rename to src/app/main/gctrl.c
index da196cea0..e721a4df6 100644
--- a/src/board/system76/common/gctrl.c
+++ b/src/app/main/gctrl.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/gctrl.h>
+#include <app/gctrl.h>
 
 void gctrl_init(void) {
     // Set I2EC as R/W
diff --git a/src/board/system76/common/include/board/acpi.h b/src/app/main/include/app/acpi.h
similarity index 84%
rename from src/board/system76/common/include/board/acpi.h
rename to src/app/main/include/app/acpi.h
index 722aaa556..d92764f28 100644
--- a/src/board/system76/common/include/board/acpi.h
+++ b/src/app/main/include/app/acpi.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_ACPI_H
-#define _BOARD_ACPI_H
+#ifndef _APP_ACPI_H
+#define _APP_ACPI_H
 
 #include <stdint.h>
 
@@ -19,4 +19,4 @@ void acpi_reset(void);
 uint8_t acpi_read(uint8_t addr);
 void acpi_write(uint8_t addr, uint8_t data);
 
-#endif // _BOARD_ACPI_H
+#endif // _APP_ACPI_H
diff --git a/src/board/system76/common/include/board/battery.h b/src/app/main/include/app/battery.h
similarity index 94%
rename from src/board/system76/common/include/board/battery.h
rename to src/app/main/include/app/battery.h
index 850420910..244e4e99d 100644
--- a/src/board/system76/common/include/board/battery.h
+++ b/src/app/main/include/app/battery.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_BATTERY_H
-#define _BOARD_BATTERY_H
+#ifndef _APP_BATTERY_H
+#define _APP_BATTERY_H
 
 #include <common/macro.h>
 
@@ -56,4 +56,4 @@ int16_t battery_charger_enable(void);
 void battery_charger_event(void);
 void battery_debug(void);
 
-#endif // _BOARD_BATTERY_H
+#endif // _APP_BATTERY_H
diff --git a/src/board/system76/common/include/board/board.h b/src/app/main/include/app/board.h
similarity index 61%
rename from src/board/system76/common/include/board/board.h
rename to src/app/main/include/app/board.h
index 41541264b..2d9b2fcd5 100644
--- a/src/board/system76/common/include/board/board.h
+++ b/src/app/main/include/app/board.h
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_BOARD_H
-#define _BOARD_BOARD_H
+#ifndef _APP_BOARD_H
+#define _APP_BOARD_H
 
 #include <stdbool.h>
 
 void board_init(void);
 void board_event(void);
 
-#endif // _BOARD_BOARD_H
+#endif // _APP_BOARD_H
diff --git a/src/board/system76/common/include/board/config.h b/src/app/main/include/app/config.h
similarity index 62%
rename from src/board/system76/common/include/board/config.h
rename to src/app/main/include/app/config.h
index fa97cc9b0..113b1c0cb 100644
--- a/src/board/system76/common/include/board/config.h
+++ b/src/app/main/include/app/config.h
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_CONFIG_H
-#define _BOARD_CONFIG_H
+#ifndef _APP_CONFIG_H
+#define _APP_CONFIG_H
 
 #include <stdbool.h>
 
 bool config_should_reset(void);
 void config_reset(void);
 
-#endif // _BOARD_CONFIG_H
+#endif // _APP_CONFIG_H
diff --git a/src/board/system76/common/include/board/dgpu.h b/src/app/main/include/app/dgpu.h
similarity index 86%
rename from src/board/system76/common/include/board/dgpu.h
rename to src/app/main/include/app/dgpu.h
index cffa2fb50..18ab0a4a0 100644
--- a/src/board/system76/common/include/board/dgpu.h
+++ b/src/app/main/include/app/dgpu.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_DGPU_H
-#define _BOARD_DGPU_H
+#ifndef _APP_DGPU_H
+#define _APP_DGPU_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -27,4 +27,4 @@ static inline void dgpu_read_temp(void) {}
 
 #endif // CONFIG_HAVE_DGPU
 
-#endif // _BOARD_DGPU_H
+#endif // _APP_DGPU_H
diff --git a/src/board/system76/common/include/board/ecpm.h b/src/app/main/include/app/ecpm.h
similarity index 56%
rename from src/board/system76/common/include/board/ecpm.h
rename to src/app/main/include/app/ecpm.h
index fc267194f..7a1e99534 100644
--- a/src/board/system76/common/include/board/ecpm.h
+++ b/src/app/main/include/app/ecpm.h
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_ECPM_H
-#define _BOARD_ECPM_H
+#ifndef _APP_ECPM_H
+#define _APP_ECPM_H
 
 #include <ec/ecpm.h>
 
 void ecpm_init(void);
 
-#endif // _BOARD_ECPM_H
+#endif // _APP_ECPM_H
diff --git a/src/board/system76/common/include/board/espi.h b/src/app/main/include/app/espi.h
similarity index 73%
rename from src/board/system76/common/include/board/espi.h
rename to src/app/main/include/app/espi.h
index f1bd91dd0..30e51ab18 100644
--- a/src/board/system76/common/include/board/espi.h
+++ b/src/app/main/include/app/espi.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_ESPI_H
-#define _BOARD_ESPI_H
+#ifndef _APP_ESPI_H
+#define _APP_ESPI_H
 
 #include <stdbool.h>
 
@@ -13,4 +13,4 @@ void espi_init(void);
 void espi_reset(void);
 void espi_event(void);
 
-#endif // _BOARD_ESPI_H
+#endif // _APP_ESPI_H
diff --git a/src/board/system76/common/include/board/fan.h b/src/app/main/include/app/fan.h
similarity index 93%
rename from src/board/system76/common/include/board/fan.h
rename to src/app/main/include/app/fan.h
index 25a84bc75..2516c40e6 100644
--- a/src/board/system76/common/include/board/fan.h
+++ b/src/app/main/include/app/fan.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_FAN_H
-#define _BOARD_FAN_H
+#ifndef _APP_FAN_H
+#define _APP_FAN_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -46,4 +46,4 @@ void fan_update_target(void);
 enum FanMode fan_get_mode(void);
 void fan_set_mode(enum FanMode);
 
-#endif // _BOARD_FAN_H
+#endif // _APP_FAN_H
diff --git a/src/board/system76/common/include/board/flash.h b/src/app/main/include/app/flash.h
similarity index 96%
rename from src/board/system76/common/include/board/flash.h
rename to src/app/main/include/app/flash.h
index e2cb84fa4..4bcf3339e 100644
--- a/src/board/system76/common/include/board/flash.h
+++ b/src/app/main/include/app/flash.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#ifndef _BOARD_FLASH_H
-#define _BOARD_FLASH_H
+#ifndef _APP_FLASH_H
+#define _APP_FLASH_H
 
 #include <stdint.h>
 
@@ -93,4 +93,4 @@ void flash_write_u32(uint32_t addr, uint32_t data);
  */
 void flash_erase(uint32_t addr);
 
-#endif // _BOARD_FLASH_H
+#endif // _APP_FLASH_H
diff --git a/src/board/system76/common/include/board/gctrl.h b/src/app/main/include/app/gctrl.h
similarity index 55%
rename from src/board/system76/common/include/board/gctrl.h
rename to src/app/main/include/app/gctrl.h
index d3ea4a193..98f457135 100644
--- a/src/board/system76/common/include/board/gctrl.h
+++ b/src/app/main/include/app/gctrl.h
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_GCTRL_H
-#define _BOARD_GCTRL_H
+#ifndef _APP_GCTRL_H
+#define _APP_GCTRL_H
 
 #include <ec/gctrl.h>
 
 void gctrl_init(void);
 
-#endif // _BOARD_GCTRL_H
+#endif // _APP_GCTRL_H
diff --git a/src/board/system76/common/include/board/kbc.h b/src/app/main/include/app/kbc.h
similarity index 78%
rename from src/board/system76/common/include/board/kbc.h
rename to src/app/main/include/app/kbc.h
index 9cdbc5ffe..0ba0b7d3d 100644
--- a/src/board/system76/common/include/board/kbc.h
+++ b/src/app/main/include/app/kbc.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_KBC_H
-#define _BOARD_KBC_H
+#ifndef _APP_KBC_H
+#define _APP_KBC_H
 
 #include <stdbool.h>
 
@@ -14,4 +14,4 @@ void kbc_reset(void);
 bool kbc_scancode(uint16_t key, bool pressed);
 void kbc_event(struct Kbc *const kbc);
 
-#endif // _BOARD_KBC_H
+#endif // _APP_KBC_H
diff --git a/src/board/system76/common/include/board/kbled.h b/src/app/main/include/app/kbled.h
similarity index 94%
rename from src/board/system76/common/include/board/kbled.h
rename to src/app/main/include/app/kbled.h
index f9a56502c..1e4db749b 100644
--- a/src/board/system76/common/include/board/kbled.h
+++ b/src/app/main/include/app/kbled.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_KBLED_H
-#define _BOARD_KBLED_H
+#ifndef _APP_KBLED_H
+#define _APP_KBLED_H
 
 #include <stdint.h>
 
@@ -63,4 +63,4 @@ static inline void kbled_hotkey_step(void) {}
 
 #endif // CONFIG_HAVE_KBLED
 
-#endif // _BOARD_KBLED_H
+#endif // _APP_KBLED_H
diff --git a/src/board/system76/common/include/board/kbscan.h b/src/app/main/include/app/kbscan.h
similarity index 87%
rename from src/board/system76/common/include/board/kbscan.h
rename to src/app/main/include/app/kbscan.h
index 516d734bf..55db29d23 100644
--- a/src/board/system76/common/include/board/kbscan.h
+++ b/src/app/main/include/app/kbscan.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_KBSCAN_H
-#define _BOARD_KBSCAN_H
+#ifndef _APP_KBSCAN_H
+#define _APP_KBSCAN_H
 
 #include <stdbool.h>
 
@@ -25,4 +25,4 @@ extern uint8_t kbscan_matrix[KM_OUT];
 void kbscan_init(void);
 void kbscan_event(void);
 
-#endif // _BOARD_KBSCAN_H
+#endif // _APP_KBSCAN_H
diff --git a/src/board/system76/common/include/board/lid.h b/src/app/main/include/app/lid.h
similarity index 67%
rename from src/board/system76/common/include/board/lid.h
rename to src/app/main/include/app/lid.h
index 1ef64b1f0..b0b454c91 100644
--- a/src/board/system76/common/include/board/lid.h
+++ b/src/app/main/include/app/lid.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_LID_H
-#define _BOARD_LID_H
+#ifndef _APP_LID_H
+#define _APP_LID_H
 
 #include <stdbool.h>
 
@@ -10,4 +10,4 @@ extern bool lid_wake;
 
 void lid_event(void);
 
-#endif // _BOARD_LID_H
+#endif // _APP_LID_H
diff --git a/src/board/system76/common/include/board/parallel.h b/src/app/main/include/app/parallel.h
similarity index 72%
rename from src/board/system76/common/include/board/parallel.h
rename to src/app/main/include/app/parallel.h
index 7f075ee44..55257b223 100644
--- a/src/board/system76/common/include/board/parallel.h
+++ b/src/app/main/include/app/parallel.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_PARALLEL_H
-#define _BOARD_PARALLEL_H
+#ifndef _APP_PARALLEL_H
+#define _APP_PARALLEL_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -10,4 +10,4 @@ extern bool parallel_debug;
 bool parallel_init(void);
 int16_t parallel_write(const uint8_t *const data, uint16_t length);
 
-#endif // _BOARD_PARALLEL_H
+#endif // _APP_PARALLEL_H
diff --git a/src/board/system76/common/include/board/peci.h b/src/app/main/include/app/peci.h
similarity index 87%
rename from src/board/system76/common/include/board/peci.h
rename to src/app/main/include/app/peci.h
index 4a6ceebce..87217cf5c 100644
--- a/src/board/system76/common/include/board/peci.h
+++ b/src/app/main/include/app/peci.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_PECI_H
-#define _BOARD_PECI_H
+#ifndef _APP_PECI_H
+#define _APP_PECI_H
 
 #include <ec/peci.h>
 #include <stdbool.h>
@@ -23,4 +23,4 @@ bool peci_available(void);
 int16_t peci_wr_pkg_config(uint8_t index, uint16_t param, uint32_t data);
 void peci_read_temp(void);
 
-#endif // _BOARD_PECI_H
+#endif // _APP_PECI_H
diff --git a/src/board/system76/common/include/board/pmc.h b/src/app/main/include/app/pmc.h
similarity index 75%
rename from src/board/system76/common/include/board/pmc.h
rename to src/app/main/include/app/pmc.h
index c60d01044..cb45b1762 100644
--- a/src/board/system76/common/include/board/pmc.h
+++ b/src/app/main/include/app/pmc.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_PMC_H
-#define _BOARD_PMC_H
+#ifndef _APP_PMC_H
+#define _APP_PMC_H
 
 #include <ec/pmc.h>
 
@@ -10,4 +10,4 @@ bool pmc_sci(struct Pmc *const pmc, uint8_t sci);
 void pmc_swi(void);
 void pmc_event(struct Pmc *const pmc);
 
-#endif // _BOARD_PMC_H
+#endif // _APP_PMC_H
diff --git a/src/board/system76/common/include/board/pnp.h b/src/app/main/include/app/pnp.h
similarity index 71%
rename from src/board/system76/common/include/board/pnp.h
rename to src/app/main/include/app/pnp.h
index a0decf44e..5aaec8258 100644
--- a/src/board/system76/common/include/board/pnp.h
+++ b/src/app/main/include/app/pnp.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_PNP_H
-#define _BOARD_PNP_H
+#ifndef _APP_PNP_H
+#define _APP_PNP_H
 
 #include <stdint.h>
 
@@ -9,4 +9,4 @@ uint8_t pnp_read(uint8_t reg);
 void pnp_write(uint8_t reg, uint8_t data);
 void pnp_enable(void);
 
-#endif // _BOARD_PNP_H
+#endif // _APP_PNP_H
diff --git a/src/board/system76/common/include/board/power.h b/src/app/main/include/app/power.h
similarity index 91%
rename from src/board/system76/common/include/board/power.h
rename to src/app/main/include/app/power.h
index 5f07c6cad..3f5fc8cc4 100644
--- a/src/board/system76/common/include/board/power.h
+++ b/src/app/main/include/app/power.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_POWER_H
-#define _BOARD_POWER_H
+#ifndef _APP_POWER_H
+#define _APP_POWER_H
 
 enum PowerState {
     POWER_STATE_OFF,
@@ -34,4 +34,4 @@ void power_off(void);
 void power_cpu_reset(void);
 void power_event(void);
 
-#endif // _BOARD_POWER_H
+#endif // _APP_POWER_H
diff --git a/src/board/system76/common/include/board/ps2.h b/src/app/main/include/app/ps2.h
similarity index 56%
rename from src/board/system76/common/include/board/ps2.h
rename to src/app/main/include/app/ps2.h
index 5b4023925..3287d8c33 100644
--- a/src/board/system76/common/include/board/ps2.h
+++ b/src/app/main/include/app/ps2.h
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_PS2_H
-#define _BOARD_PS2_H
+#ifndef _APP_PS2_H
+#define _APP_PS2_H
 
 #include <ec/ps2.h>
 
 void ps2_init(void);
 
-#endif // _BOARD_PS2_H
+#endif // _APP_PS2_H
diff --git a/src/board/system76/common/include/board/pwm.h b/src/app/main/include/app/pwm.h
similarity index 50%
rename from src/board/system76/common/include/board/pwm.h
rename to src/app/main/include/app/pwm.h
index 1be5b816a..8f563df29 100644
--- a/src/board/system76/common/include/board/pwm.h
+++ b/src/app/main/include/app/pwm.h
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_PWM_H
-#define _BOARD_PWM_H
+#ifndef _APP_PWM_H
+#define _APP_PWM_H
 
 void pwm_init(void);
 
-#endif // _BOARD_PWM_H
+#endif // _APP_PWM_H
diff --git a/src/app/main/include/app/scratch.h b/src/app/main/include/app/scratch.h
new file mode 100644
index 000000000..7ab455eed
--- /dev/null
+++ b/src/app/main/include/app/scratch.h
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+#ifndef _APP_SCRATCH_H
+#define _APP_SCRATCH_H
+
+void scratch_trampoline(void);
+
+#endif // _APP_SCRATCH_H
diff --git a/src/board/system76/common/include/board/security.h b/src/app/main/include/app/security.h
similarity index 71%
rename from src/board/system76/common/include/board/security.h
rename to src/app/main/include/app/security.h
index aecca0777..caafb79f0 100644
--- a/src/board/system76/common/include/board/security.h
+++ b/src/app/main/include/app/security.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_SECURITY_H
-#define _BOARD_SECURITY_H
+#ifndef _APP_SECURITY_H
+#define _APP_SECURITY_H
 
 #include <stdbool.h>
 #include <common/command.h>
@@ -10,4 +10,4 @@ enum SecurityState security_get(void);
 bool security_set(enum SecurityState state);
 bool security_power(void);
 
-#endif // _BOARD_SECURITY_H
+#endif // _APP_SECURITY_H
diff --git a/src/board/system76/common/include/board/smbus.h b/src/app/main/include/app/smbus.h
similarity index 76%
rename from src/board/system76/common/include/board/smbus.h
rename to src/app/main/include/app/smbus.h
index 421d5e7d3..d3c735c29 100644
--- a/src/board/system76/common/include/board/smbus.h
+++ b/src/app/main/include/app/smbus.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_SMBUS_H
-#define _BOARD_SMBUS_H
+#ifndef _APP_SMBUS_H
+#define _APP_SMBUS_H
 
 #include <ec/smbus.h>
 
@@ -9,4 +9,4 @@ void smbus_init(void);
 int16_t smbus_read(uint8_t address, uint8_t command, uint16_t *const data);
 int16_t smbus_write(uint8_t address, uint8_t command, uint16_t data);
 
-#endif // _BOARD_SMBUS_H
+#endif // _APP_SMBUS_H
diff --git a/src/board/system76/common/include/board/smfi.h b/src/app/main/include/app/smfi.h
similarity index 71%
rename from src/board/system76/common/include/board/smfi.h
rename to src/app/main/include/app/smfi.h
index 56b4a119d..1c2089cc0 100644
--- a/src/board/system76/common/include/board/smfi.h
+++ b/src/app/main/include/app/smfi.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_SMFI_H
-#define _BOARD_SMFI_H
+#ifndef _APP_SMFI_H
+#define _APP_SMFI_H
 
 #include <stdint.h>
 
@@ -10,4 +10,4 @@ void smfi_watchdog(void);
 void smfi_event(void);
 void smfi_debug(uint8_t byte);
 
-#endif // _BOARD_SMFI_H
+#endif // _APP_SMFI_H
diff --git a/src/board/system76/common/include/board/usbpd.h b/src/app/main/include/app/usbpd.h
similarity index 84%
rename from src/board/system76/common/include/board/usbpd.h
rename to src/app/main/include/app/usbpd.h
index 2b38e84a8..47fd5a037 100644
--- a/src/board/system76/common/include/board/usbpd.h
+++ b/src/app/main/include/app/usbpd.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_USBPD_H
-#define _BOARD_USBPD_H
+#ifndef _APP_USBPD_H
+#define _APP_USBPD_H
 
 #if CONFIG_HAVE_USBPD
 
@@ -19,4 +19,4 @@ static inline void usbpd_enable_charging(void) {}
 
 #endif
 
-#endif // _BOARD_USBPD_H
+#endif // _APP_USBPD_H
diff --git a/src/board/system76/common/include/board/wireless.h b/src/app/main/include/app/wireless.h
similarity index 53%
rename from src/board/system76/common/include/board/wireless.h
rename to src/app/main/include/app/wireless.h
index 3dd124559..c66049740 100644
--- a/src/board/system76/common/include/board/wireless.h
+++ b/src/app/main/include/app/wireless.h
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#ifndef _BOARD_WIRELESS_H
-#define _BOARD_WIRELESS_H
+#ifndef _APP_WIRELESS_H
+#define _APP_WIRELESS_H
 
 #include <stdbool.h>
 
 void wireless_power(bool);
 
-#endif // _BOARD_WIRELESS_H
+#endif // _APP_WIRELESS_H
diff --git a/src/board/system76/common/kbc.c b/src/app/main/kbc.c
similarity index 99%
rename from src/board/system76/common/kbc.c
rename to src/app/main/kbc.c
index 47e06c869..3ad324d25 100644
--- a/src/board/system76/common/kbc.c
+++ b/src/app/main/kbc.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/kbc.h>
-#include <board/kbscan.h>
+#include <app/kbc.h>
+#include <app/kbscan.h>
 #include <board/keymap.h>
 #include <common/debug.h>
 #include <common/macro.h>
diff --git a/src/board/system76/common/kbled/bonw14.c b/src/app/main/kbled/bonw14.c
similarity index 97%
rename from src/board/system76/common/kbled/bonw14.c
rename to src/app/main/kbled/bonw14.c
index a881ee846..6383cf901 100644
--- a/src/board/system76/common/kbled/bonw14.c
+++ b/src/app/main/kbled/bonw14.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/kbled.h>
+#include <app/kbled.h>
 #include <common/debug.h>
 #include <ec/i2c.h>
 #include <ec/pwm.h>
diff --git a/src/board/system76/common/kbled/common.c b/src/app/main/kbled/common.c
similarity index 98%
rename from src/board/system76/common/kbled/common.c
rename to src/app/main/kbled/common.c
index 2cff8ab85..5bd8c20f7 100644
--- a/src/board/system76/common/kbled/common.c
+++ b/src/app/main/kbled/common.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/kbled.h>
+#include <app/kbled.h>
 #include <common/macro.h>
 
 enum KbledKind kbled_kind = KBLED_NONE;
diff --git a/src/board/system76/common/kbled/rgb_i2c.c b/src/app/main/kbled/rgb_i2c.c
similarity index 99%
rename from src/board/system76/common/kbled/rgb_i2c.c
rename to src/app/main/kbled/rgb_i2c.c
index f8ad6f171..50c888a26 100644
--- a/src/board/system76/common/kbled/rgb_i2c.c
+++ b/src/app/main/kbled/rgb_i2c.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/kbled.h>
 #include <arch/delay.h>
 #include <board/gpio.h>
-#include <board/kbled.h>
 #include <common/macro.h>
 #include <ec/i2c.h>
 
diff --git a/src/board/system76/common/kbled/rgb_pwm.c b/src/app/main/kbled/rgb_pwm.c
similarity index 97%
rename from src/board/system76/common/kbled/rgb_pwm.c
rename to src/app/main/kbled/rgb_pwm.c
index 41a8c1bfa..691ebbfa2 100644
--- a/src/board/system76/common/kbled/rgb_pwm.c
+++ b/src/app/main/kbled/rgb_pwm.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/kbled.h>
 #include <board/gpio.h>
-#include <board/kbled.h>
 #include <ec/pwm.h>
 
 void kbled_init(void) {
diff --git a/src/board/system76/common/kbled/white_dac.c b/src/app/main/kbled/white_dac.c
similarity index 96%
rename from src/board/system76/common/kbled/white_dac.c
rename to src/app/main/kbled/white_dac.c
index 62d30e604..d309da1a9 100644
--- a/src/board/system76/common/kbled/white_dac.c
+++ b/src/app/main/kbled/white_dac.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/kbled.h>
+#include <app/kbled.h>
 #include <common/macro.h>
 #include <ec/dac.h>
 
diff --git a/src/board/system76/common/kbscan.c b/src/app/main/kbscan.c
similarity index 98%
rename from src/board/system76/common/kbscan.c
rename to src/app/main/kbscan.c
index f6e3a9a9a..d3e42bdc6 100644
--- a/src/board/system76/common/kbscan.c
+++ b/src/app/main/kbscan.c
@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/kbscan.h>
+#include <app/acpi.h>
+#include <app/fan.h>
+#include <app/kbc.h>
+#include <app/kbled.h>
+#include <app/lid.h>
+#include <app/pmc.h>
+#include <app/power.h>
 #include <arch/delay.h>
 #include <arch/time.h>
-#include <board/acpi.h>
-#include <board/fan.h>
 #include <board/gpio.h>
 #include <board/keymap.h>
-#include <board/kbc.h>
-#include <board/kbled.h>
-#include <board/kbscan.h>
-#include <board/lid.h>
-#include <board/pmc.h>
-#include <board/power.h>
-#include <common/macro.h>
 #include <common/debug.h>
+#include <common/macro.h>
 
 // Default to not n-key rollover
 #ifndef KM_NKEY
diff --git a/src/board/system76/common/keymap.c b/src/app/main/keymap.c
similarity index 98%
rename from src/board/system76/common/keymap.c
rename to src/app/main/keymap.c
index 228388d8e..134274139 100644
--- a/src/board/system76/common/keymap.c
+++ b/src/app/main/keymap.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/flash.h>
+#include <app/flash.h>
 #include <board/keymap.h>
 
 bool keymap_fnlock = false;
diff --git a/src/board/system76/common/lid.c b/src/app/main/lid.c
similarity index 93%
rename from src/board/system76/common/lid.c
rename to src/app/main/lid.c
index e3dd12b19..41638a57b 100644
--- a/src/board/system76/common/lid.c
+++ b/src/app/main/lid.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/lid.h>
+#include <app/acpi.h>
+#include <app/pmc.h>
 #include <arch/delay.h>
-#include <board/acpi.h>
 #include <board/gpio.h>
-#include <board/lid.h>
-#include <board/pmc.h>
 #include <common/debug.h>
 
 // Default closed to prevent spurious power on
diff --git a/src/board/system76/common/main.c b/src/app/main/main.c
similarity index 88%
rename from src/board/system76/common/main.c
rename to src/app/main/main.c
index 4d79566ce..d5aaf4fd9 100644
--- a/src/board/system76/common/main.c
+++ b/src/app/main/main.c
@@ -1,43 +1,43 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <8051.h>
-#include <stdio.h>
-
+#include <app/battery.h>
+#include <app/board.h>
+#include <app/dgpu.h>
+#include <app/ecpm.h>
+#include <app/fan.h>
+#include <app/gctrl.h>
+#include <app/kbc.h>
+#include <app/kbled.h>
+#include <app/kbscan.h>
+#include <app/lid.h>
+#include <app/pmc.h>
+#include <app/power.h>
+#include <app/ps2.h>
+#include <app/pwm.h>
+#include <app/smbus.h>
+#include <app/smfi.h>
+#include <app/usbpd.h>
 #include <arch/arch.h>
 #include <arch/delay.h>
 #include <arch/time.h>
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/dgpu.h>
-#include <board/ecpm.h>
-#include <board/fan.h>
 #include <board/gpio.h>
-#include <board/gctrl.h>
-#include <board/kbc.h>
-#include <board/kbled.h>
-#include <board/kbscan.h>
 #include <board/keymap.h>
-#include <board/lid.h>
-#include <board/pmc.h>
-#include <board/power.h>
-#include <board/ps2.h>
-#include <board/pwm.h>
-#include <board/smbus.h>
-#include <board/smfi.h>
-#include <board/usbpd.h>
 #include <common/debug.h>
 #include <common/macro.h>
 #include <common/version.h>
 #include <ec/ec.h>
 
 #if CONFIG_PLATFORM_INTEL
-#include <board/peci.h>
+#include <app/peci.h>
 #endif
 
 #ifdef PARALLEL_DEBUG
-#include <board/parallel.h>
+#include <app/parallel.h>
 #endif // PARALLEL_DEBUG
 
+#include <8051.h>
+#include <stdio.h>
+
 void external_0(void) __interrupt(0) {}
 // timer_0 is in time.c
 void timer_0(void) __interrupt(1);
diff --git a/src/board/system76/common/parallel.c b/src/app/main/parallel.c
similarity index 99%
rename from src/board/system76/common/parallel.c
rename to src/app/main/parallel.c
index 01c2525ae..f45a2ed34 100644
--- a/src/board/system76/common/parallel.c
+++ b/src/app/main/parallel.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/parallel.h>
 #include <arch/delay.h>
 #include <arch/time.h>
-#include <board/parallel.h>
 #include <common/macro.h>
 #include <ec/kbscan.h>
 
diff --git a/src/board/system76/common/peci.c b/src/app/main/peci.c
similarity index 99%
rename from src/board/system76/common/peci.c
rename to src/app/main/peci.c
index c17f81d99..2ab233099 100644
--- a/src/board/system76/common/peci.c
+++ b/src/app/main/peci.c
@@ -3,12 +3,12 @@
 // PECI information can be found here:
 // https://www.intel.com/content/dam/www/public/us/en/documents/design-guides/core-i7-lga-2011-guide.pdf
 
+#include <app/peci.h>
+#include <app/espi.h>
+#include <app/fan.h>
+#include <app/power.h>
 #include <arch/time.h>
-#include <board/espi.h>
-#include <board/fan.h>
 #include <board/gpio.h>
-#include <board/peci.h>
-#include <board/power.h>
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/gpio.h>
diff --git a/src/board/system76/common/pmc.c b/src/app/main/pmc.c
similarity index 99%
rename from src/board/system76/common/pmc.c
rename to src/app/main/pmc.c
index e97ebfd3b..a77cf0b29 100644
--- a/src/board/system76/common/pmc.c
+++ b/src/app/main/pmc.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/pmc.h>
+#include <app/acpi.h>
 #include <arch/time.h>
 #include <arch/delay.h>
-#include <board/acpi.h>
 #include <board/gpio.h>
-#include <board/pmc.h>
 #include <common/macro.h>
 #include <common/debug.h>
 #include <ec/espi.h>
diff --git a/src/board/system76/common/pnp.c b/src/app/main/pnp.c
similarity index 98%
rename from src/board/system76/common/pnp.c
rename to src/app/main/pnp.c
index abdf6635a..6135544e4 100644
--- a/src/board/system76/common/pnp.c
+++ b/src/app/main/pnp.c
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <stdint.h>
-
-#include <board/pnp.h>
+#include <app/pnp.h>
 #include <common/macro.h>
 #include <common/debug.h>
 #include <ec/espi.h>
+#include <stdint.h>
 
 volatile uint8_t __xdata __at(0x1200) IHIOA;
 volatile uint8_t __xdata __at(0x1201) IHD;
diff --git a/src/board/system76/common/power/amd.c b/src/app/main/power/amd.c
similarity index 90%
rename from src/board/system76/common/power/amd.c
rename to src/app/main/power/amd.c
index 52e8c0cd3..789f15107 100644
--- a/src/board/system76/common/power/amd.c
+++ b/src/app/main/power/amd.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/power.h>
+#include <app/power.h>
 
 enum PowerState power_state = POWER_STATE_OFF;
 
diff --git a/src/board/system76/common/power/intel.c b/src/app/main/power/intel.c
similarity index 97%
rename from src/board/system76/common/power/intel.c
rename to src/app/main/power/intel.c
index 4de74dab4..6af2614f8 100644
--- a/src/board/system76/common/power/intel.c
+++ b/src/app/main/power/intel.c
@@ -1,32 +1,32 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/power.h>
-
+#include <app/power.h>
+
+#include <app/acpi.h>
+#include <app/battery.h>
+#include <app/board.h>
+#include <app/config.h>
+#include <app/fan.h>
+#include <app/kbc.h>
+#include <app/kbled.h>
+#include <app/lid.h>
+#include <app/peci.h>
+#include <app/pmc.h>
+#include <app/pnp.h>
+#include <app/usbpd.h>
+#include <app/wireless.h>
 #include <arch/delay.h>
 #include <arch/time.h>
-#include <board/acpi.h>
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/config.h>
-#include <board/fan.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
-#include <board/kbled.h>
-#include <board/lid.h>
-#include <board/peci.h>
-#include <board/pmc.h>
-#include <board/pnp.h>
-#include <board/wireless.h>
-#include <board/usbpd.h>
 #include <common/debug.h>
 
 #if CONFIG_BUS_ESPI
 #include <ec/espi.h>
-#include <board/espi.h>
+#include <app/espi.h>
 #endif
 
 #if CONFIG_SECURITY
-#include <board/security.h>
+#include <app/security.h>
 #endif // CONFIG_SECURITY
 
 #define GPIO_SET_DEBUG(G, V) \
diff --git a/src/board/system76/common/ps2.c b/src/app/main/ps2.c
similarity index 85%
rename from src/board/system76/common/ps2.c
rename to src/app/main/ps2.c
index da0c561c9..c909b53b4 100644
--- a/src/board/system76/common/ps2.c
+++ b/src/app/main/ps2.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/ps2.h>
+#include <app/ps2.h>
 
 void ps2_init(void) {
     ps2_reset(&PS2_1);
diff --git a/src/board/system76/common/pwm.c b/src/app/main/pwm.c
similarity index 96%
rename from src/board/system76/common/pwm.c
rename to src/app/main/pwm.c
index 684f28f04..21beab02a 100644
--- a/src/board/system76/common/pwm.c
+++ b/src/app/main/pwm.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/pwm.h>
+#include <app/pwm.h>
 #include <ec/pwm.h>
 #include <common/macro.h>
 
diff --git a/src/board/system76/common/scratch.c b/src/app/main/scratch.c
similarity index 91%
rename from src/board/system76/common/scratch.c
rename to src/app/main/scratch.c
index e7e9ed023..4d89686e5 100644
--- a/src/board/system76/common/scratch.c
+++ b/src/app/main/scratch.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/dgpu.h>
-#include <board/fan.h>
-#include <board/smfi.h>
+#include <app/dgpu.h>
+#include <app/fan.h>
+#include <app/smfi.h>
 #include <common/macro.h>
 #include <ec/pwm.h>
 #include <ec/scratch.h>
diff --git a/src/board/system76/common/scratch/Makefile.mk b/src/app/main/scratch/Makefile.mk
similarity index 97%
rename from src/board/system76/common/scratch/Makefile.mk
rename to src/app/main/scratch/Makefile.mk
index a63212844..7ed2c841a 100644
--- a/src/board/system76/common/scratch/Makefile.mk
+++ b/src/app/main/scratch/Makefile.mk
@@ -14,7 +14,7 @@ SCRATCH_INCLUDE=$(INCLUDE)
 SCRATCH_CFLAGS=$(CFLAGS)
 
 # Include scratch source
-SCRATCH_DIR=$(SYSTEM76_COMMON_DIR)/scratch
+SCRATCH_DIR = $(APP_DIR)/scratch
 SCRATCH_INCLUDE += $(SCRATCH_DIR)/Makefile.mk
 SCRATCH_CFLAGS+=-I$(SCRATCH_DIR)/include -D__SCRATCH__
 SCRATCH_SRC += $(foreach src, $(scratch-y), $(SCRATCH_DIR)/$(src))
diff --git a/src/board/system76/common/scratch/main.c b/src/app/main/scratch/main.c
similarity index 86%
rename from src/board/system76/common/scratch/main.c
rename to src/app/main/scratch/main.c
index 498c720ba..33bdb8430 100644
--- a/src/board/system76/common/scratch/main.c
+++ b/src/app/main/scratch/main.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/smfi.h>
+#include <app/smfi.h>
 
 // Main program while running in scratch ROM
 void main(void) {
diff --git a/src/board/system76/common/scratch/stdio.c b/src/app/main/scratch/stdio.c
similarity index 87%
rename from src/board/system76/common/scratch/stdio.c
rename to src/app/main/scratch/stdio.c
index 9ca2f8bb2..b6737d427 100644
--- a/src/board/system76/common/scratch/stdio.c
+++ b/src/app/main/scratch/stdio.c
@@ -2,7 +2,7 @@
 
 #include <stdio.h>
 
-#include <board/smfi.h>
+#include <app/smfi.h>
 
 int putchar(int c) {
     uint8_t byte = (uint8_t)c;
diff --git a/src/board/system76/common/security.c b/src/app/main/security.c
similarity index 97%
rename from src/board/system76/common/security.c
rename to src/app/main/security.c
index f81198c90..edb1bae0e 100644
--- a/src/board/system76/common/security.c
+++ b/src/app/main/security.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/security.h>
 #include <board/gpio.h>
-#include <board/security.h>
 
 static enum SecurityState security_state = SECURITY_STATE_LOCK;
 
diff --git a/src/board/system76/common/smbus.c b/src/app/main/smbus.c
similarity index 96%
rename from src/board/system76/common/smbus.c
rename to src/app/main/smbus.c
index 896cef46c..ddfa8a416 100644
--- a/src/board/system76/common/smbus.c
+++ b/src/app/main/smbus.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/smbus.h>
+#include <app/smbus.h>
 #include <ec/i2c.h>
 
 void smbus_init(void) {
diff --git a/src/board/system76/common/smfi.c b/src/app/main/smfi.c
similarity index 98%
rename from src/board/system76/common/smfi.c
rename to src/app/main/smfi.c
index c2ece637f..4ec73ffec 100644
--- a/src/board/system76/common/smfi.c
+++ b/src/app/main/smfi.c
@@ -13,16 +13,16 @@
 // the command is complete and the result is available. The client should only
 // read the SMFI_CMD_RES value when SMFI_CMD_CMD is set to CMD_NONE.
 
-#include <board/smfi.h>
+#include <app/smfi.h>
 
 #if !defined(__SCRATCH__)
-#include <board/fan.h>
-#include <board/kbled.h>
-#include <board/kbscan.h>
-#include <board/scratch.h>
+#include <app/fan.h>
+#include <app/kbled.h>
+#include <app/kbscan.h>
+#include <app/scratch.h>
 
 #if CONFIG_SECURITY
-#include <board/security.h>
+#include <app/security.h>
 #endif // CONFIG_SECURITY
 #endif // !defined(__SCRATCH__)
 
diff --git a/src/board/system76/common/stdio.c b/src/app/main/stdio.c
similarity index 91%
rename from src/board/system76/common/stdio.c
rename to src/app/main/stdio.c
index 46058aa74..c19225827 100644
--- a/src/board/system76/common/stdio.c
+++ b/src/app/main/stdio.c
@@ -2,7 +2,7 @@
 
 #include <stdio.h>
 
-#include <board/smfi.h>
+#include <app/smfi.h>
 
 #ifdef SERIAL_DEBUGGER
 #include <mcs51/8051.h>
@@ -13,7 +13,7 @@
 #endif
 
 #ifdef PARALLEL_DEBUG
-#include <board/parallel.h>
+#include <app/parallel.h>
 #endif // PARALLEL_DEBUG
 
 int putchar(int c) {
diff --git a/src/board/system76/common/usbpd/tps65987.c b/src/app/main/usbpd/tps65987.c
similarity index 98%
rename from src/board/system76/common/usbpd/tps65987.c
rename to src/app/main/usbpd/tps65987.c
index 487d1544e..5260408e7 100644
--- a/src/board/system76/common/usbpd/tps65987.c
+++ b/src/app/main/usbpd/tps65987.c
@@ -3,10 +3,10 @@
 // USB-PD driver for TPS65987 and the mostly compatible TPS65993 and TPS65994.
 // I2C register reference: https://www.ti.com/lit/ug/slvubh2b/slvubh2b.pdf
 
-#include <board/battery.h>
+#include <app/usbpd.h>
+#include <app/battery.h>
+#include <app/power.h>
 #include <board/gpio.h>
-#include <board/power.h>
-#include <board/usbpd.h>
 #include <common/debug.h>
 #include <ec/i2c.h>
 
diff --git a/src/board/system76/common/wireless.c b/src/app/main/wireless.c
similarity index 94%
rename from src/board/system76/common/wireless.c
rename to src/app/main/wireless.c
index c3755d056..edb06a26f 100644
--- a/src/board/system76/common/wireless.c
+++ b/src/app/main/wireless.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <app/wireless.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 
 #ifndef HAVE_BT_EN
 #define HAVE_BT_EN 1
diff --git a/src/board/system76/addw1/Makefile.mk b/src/board/system76/addw1/Makefile.mk
index e66a78635..69b85e81b 100644
--- a/src/board/system76/addw1/Makefile.mk
+++ b/src/board/system76/addw1/Makefile.mk
@@ -57,6 +57,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/addw1/board.c b/src/board/system76/addw1/board.c
index 169445806..2bdd1a255 100644
--- a/src/board/system76/addw1/board.c
+++ b/src/board/system76/addw1/board.c
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
+#include <app/board.h>
+#include <app/kbc.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
-#include <common/debug.h>
 
 void board_init(void) {
     // Allow CPU to boot
diff --git a/src/board/system76/addw2/Makefile.mk b/src/board/system76/addw2/Makefile.mk
index 3d2b44b96..b3dbb4935 100644
--- a/src/board/system76/addw2/Makefile.mk
+++ b/src/board/system76/addw2/Makefile.mk
@@ -57,6 +57,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/addw2/board.c b/src/board/system76/addw2/board.c
index 02d6eacf6..a589086ae 100644
--- a/src/board/system76/addw2/board.c
+++ b/src/board/system76/addw2/board.c
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/kbc.h>
 #include <board/gpio.h>
-#include <board/kbc.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/addw3/Makefile.mk b/src/board/system76/addw3/Makefile.mk
index bb92c62f5..118bae85b 100644
--- a/src/board/system76/addw3/Makefile.mk
+++ b/src/board/system76/addw3/Makefile.mk
@@ -63,6 +63,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/addw3/board.c b/src/board/system76/addw3/board.c
index 36214afcd..c5d50815f 100644
--- a/src/board/system76/addw3/board.c
+++ b/src/board/system76/addw3/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/battery.h>
+#include <app/board.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/addw4/Makefile.mk b/src/board/system76/addw4/Makefile.mk
index 01eed25b4..1ddd87e0b 100644
--- a/src/board/system76/addw4/Makefile.mk
+++ b/src/board/system76/addw4/Makefile.mk
@@ -63,6 +63,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/addw4/board.c b/src/board/system76/addw4/board.c
index 36214afcd..d2ea8e909 100644
--- a/src/board/system76/addw4/board.c
+++ b/src/board/system76/addw4/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/bonw14/Makefile.mk b/src/board/system76/bonw14/Makefile.mk
index b33d53abb..2353dbd1a 100644
--- a/src/board/system76/bonw14/Makefile.mk
+++ b/src/board/system76/bonw14/Makefile.mk
@@ -57,6 +57,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/bonw14/board.c b/src/board/system76/bonw14/board.c
index 1933e2336..0baacc16b 100644
--- a/src/board/system76/bonw14/board.c
+++ b/src/board/system76/bonw14/board.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/gctrl.h>
+#include <app/board.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/bonw15-b/Makefile.mk b/src/board/system76/bonw15-b/Makefile.mk
index e30add7b0..d1da7b8bf 100644
--- a/src/board/system76/bonw15-b/Makefile.mk
+++ b/src/board/system76/bonw15-b/Makefile.mk
@@ -70,6 +70,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/bonw15/Makefile.mk b/src/board/system76/bonw15/Makefile.mk
index 160b03171..3fa519475 100644
--- a/src/board/system76/bonw15/Makefile.mk
+++ b/src/board/system76/bonw15/Makefile.mk
@@ -67,6 +67,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/bonw15/board.c b/src/board/system76/bonw15/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/bonw15/board.c
+++ b/src/board/system76/bonw15/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/common/include/board/scratch.h b/src/board/system76/common/include/board/scratch.h
deleted file mode 100644
index f93e778cd..000000000
--- a/src/board/system76/common/include/board/scratch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#ifndef _BOARD_SCRATCH_H
-#define _BOARD_SCRATCH_H
-
-void scratch_trampoline(void);
-
-#endif // _BOARD_SCRATCH_H
diff --git a/src/board/system76/darp10-b/Makefile.mk b/src/board/system76/darp10-b/Makefile.mk
index 2d210387f..df9a11686 100644
--- a/src/board/system76/darp10-b/Makefile.mk
+++ b/src/board/system76/darp10-b/Makefile.mk
@@ -65,6 +65,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(87, 75), \
 	FAN_POINT(89, 77), \
 "
-
-# Add common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp10-b/board.c b/src/board/system76/darp10-b/board.c
index f069c42e5..934866b55 100644
--- a/src/board/system76/darp10-b/board.c
+++ b/src/board/system76/darp10-b/board.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/battery.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <board/espi.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/darp10/Makefile.mk b/src/board/system76/darp10/Makefile.mk
index 4ba880144..9dc8c28cb 100644
--- a/src/board/system76/darp10/Makefile.mk
+++ b/src/board/system76/darp10/Makefile.mk
@@ -64,6 +64,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(87, 75), \
 	FAN_POINT(89, 77), \
 "
-
-# Add common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp10/board.c b/src/board/system76/darp10/board.c
index f069c42e5..934866b55 100644
--- a/src/board/system76/darp10/board.c
+++ b/src/board/system76/darp10/board.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/battery.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <board/espi.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/darp11-b/Makefile.mk b/src/board/system76/darp11-b/Makefile.mk
index 2d210387f..df9a11686 100644
--- a/src/board/system76/darp11-b/Makefile.mk
+++ b/src/board/system76/darp11-b/Makefile.mk
@@ -65,6 +65,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(87, 75), \
 	FAN_POINT(89, 77), \
 "
-
-# Add common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp11-b/board.c b/src/board/system76/darp11-b/board.c
index f069c42e5..934866b55 100644
--- a/src/board/system76/darp11-b/board.c
+++ b/src/board/system76/darp11-b/board.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/battery.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <board/espi.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/darp11/Makefile.mk b/src/board/system76/darp11/Makefile.mk
index 4ba880144..9dc8c28cb 100644
--- a/src/board/system76/darp11/Makefile.mk
+++ b/src/board/system76/darp11/Makefile.mk
@@ -64,6 +64,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(87, 75), \
 	FAN_POINT(89, 77), \
 "
-
-# Add common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp11/board.c b/src/board/system76/darp11/board.c
index f069c42e5..934866b55 100644
--- a/src/board/system76/darp11/board.c
+++ b/src/board/system76/darp11/board.c
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/battery.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <board/espi.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/darp5/Makefile.mk b/src/board/system76/darp5/Makefile.mk
index 0a8ea7593..771338933 100644
--- a/src/board/system76/darp5/Makefile.mk
+++ b/src/board/system76/darp5/Makefile.mk
@@ -46,6 +46,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp5/board.c b/src/board/system76/darp5/board.c
index 5a73494c7..9e4073a5f 100644
--- a/src/board/system76/darp5/board.c
+++ b/src/board/system76/darp5/board.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
+#include <app/board.h>
 #include <board/gpio.h>
 
 void board_init(void) {
diff --git a/src/board/system76/darp6/Makefile.mk b/src/board/system76/darp6/Makefile.mk
index c3cf447e6..c373f529a 100644
--- a/src/board/system76/darp6/Makefile.mk
+++ b/src/board/system76/darp6/Makefile.mk
@@ -49,6 +49,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp7/Makefile.mk b/src/board/system76/darp7/Makefile.mk
index 20806a347..758c610ad 100644
--- a/src/board/system76/darp7/Makefile.mk
+++ b/src/board/system76/darp7/Makefile.mk
@@ -45,6 +45,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp7/board.c b/src/board/system76/darp7/board.c
index f5766427d..1e0a5f891 100644
--- a/src/board/system76/darp7/board.c
+++ b/src/board/system76/darp7/board.c
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/darp8/Makefile.mk b/src/board/system76/darp8/Makefile.mk
index ff072de60..5579a0d5a 100644
--- a/src/board/system76/darp8/Makefile.mk
+++ b/src/board/system76/darp8/Makefile.mk
@@ -45,6 +45,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp8/board.c b/src/board/system76/darp8/board.c
index 304ca584b..3315c9284 100644
--- a/src/board/system76/darp8/board.c
+++ b/src/board/system76/darp8/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/darp9/Makefile.mk b/src/board/system76/darp9/Makefile.mk
index 0fc25a1c8..b70db80d1 100644
--- a/src/board/system76/darp9/Makefile.mk
+++ b/src/board/system76/darp9/Makefile.mk
@@ -48,6 +48,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/darp9/board.c b/src/board/system76/darp9/board.c
index c1325000a..490ec7a98 100644
--- a/src/board/system76/darp9/board.c
+++ b/src/board/system76/darp9/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/galp3-c/Makefile.mk b/src/board/system76/galp3-c/Makefile.mk
index 319cde71e..2353c9aae 100644
--- a/src/board/system76/galp3-c/Makefile.mk
+++ b/src/board/system76/galp3-c/Makefile.mk
@@ -46,6 +46,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/galp3-c/board.c b/src/board/system76/galp3-c/board.c
index 5a73494c7..9e4073a5f 100644
--- a/src/board/system76/galp3-c/board.c
+++ b/src/board/system76/galp3-c/board.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
+#include <app/board.h>
 #include <board/gpio.h>
 
 void board_init(void) {
diff --git a/src/board/system76/galp4/Makefile.mk b/src/board/system76/galp4/Makefile.mk
index 75bd2f17a..8681dce40 100644
--- a/src/board/system76/galp4/Makefile.mk
+++ b/src/board/system76/galp4/Makefile.mk
@@ -49,6 +49,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/galp5/Makefile.mk b/src/board/system76/galp5/Makefile.mk
index a91d3bfd8..c06f60fa1 100644
--- a/src/board/system76/galp5/Makefile.mk
+++ b/src/board/system76/galp5/Makefile.mk
@@ -60,6 +60,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/galp5/board.c b/src/board/system76/galp5/board.c
index e8ea6816b..200175f4f 100644
--- a/src/board/system76/galp5/board.c
+++ b/src/board/system76/galp5/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/galp6/Makefile.mk b/src/board/system76/galp6/Makefile.mk
index 873b031d5..74a805116 100644
--- a/src/board/system76/galp6/Makefile.mk
+++ b/src/board/system76/galp6/Makefile.mk
@@ -51,6 +51,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/galp6/board.c b/src/board/system76/galp6/board.c
index 6809b7f3f..f23b3318d 100644
--- a/src/board/system76/galp6/board.c
+++ b/src/board/system76/galp6/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/galp7/Makefile.mk b/src/board/system76/galp7/Makefile.mk
index 1eee1dac7..c75bbb075 100644
--- a/src/board/system76/galp7/Makefile.mk
+++ b/src/board/system76/galp7/Makefile.mk
@@ -54,6 +54,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze15/Makefile.mk b/src/board/system76/gaze15/Makefile.mk
index 689ca67fe..4bfeeafef 100644
--- a/src/board/system76/gaze15/Makefile.mk
+++ b/src/board/system76/gaze15/Makefile.mk
@@ -57,6 +57,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze15/board.c b/src/board/system76/gaze15/board.c
index 981a5e7dc..f21483604 100644
--- a/src/board/system76/gaze15/board.c
+++ b/src/board/system76/gaze15/board.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/gctrl.h>
+#include <app/board.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/gaze16-3050/Makefile.mk b/src/board/system76/gaze16-3050/Makefile.mk
index f64ae2a93..148fb1130 100644
--- a/src/board/system76/gaze16-3050/Makefile.mk
+++ b/src/board/system76/gaze16-3050/Makefile.mk
@@ -59,6 +59,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze16-3050/board.c b/src/board/system76/gaze16-3050/board.c
index 36214afcd..d2ea8e909 100644
--- a/src/board/system76/gaze16-3050/board.c
+++ b/src/board/system76/gaze16-3050/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/gaze16-3060-b/Makefile.mk b/src/board/system76/gaze16-3060-b/Makefile.mk
index 1efef465f..6f5fa5790 100644
--- a/src/board/system76/gaze16-3060-b/Makefile.mk
+++ b/src/board/system76/gaze16-3060-b/Makefile.mk
@@ -62,6 +62,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze16-3060/Makefile.mk b/src/board/system76/gaze16-3060/Makefile.mk
index 546b14f0e..1db875caa 100644
--- a/src/board/system76/gaze16-3060/Makefile.mk
+++ b/src/board/system76/gaze16-3060/Makefile.mk
@@ -59,6 +59,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze16-3060/board.c b/src/board/system76/gaze16-3060/board.c
index 36214afcd..d2ea8e909 100644
--- a/src/board/system76/gaze16-3060/board.c
+++ b/src/board/system76/gaze16-3060/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/gaze17-3050/Makefile.mk b/src/board/system76/gaze17-3050/Makefile.mk
index 928b2fd4e..865958057 100644
--- a/src/board/system76/gaze17-3050/Makefile.mk
+++ b/src/board/system76/gaze17-3050/Makefile.mk
@@ -66,6 +66,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze17-3050/board.c b/src/board/system76/gaze17-3050/board.c
index 36214afcd..d2ea8e909 100644
--- a/src/board/system76/gaze17-3050/board.c
+++ b/src/board/system76/gaze17-3050/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/gaze17-3060-b/Makefile.mk b/src/board/system76/gaze17-3060-b/Makefile.mk
index 16c71d17c..8d36d7920 100644
--- a/src/board/system76/gaze17-3060-b/Makefile.mk
+++ b/src/board/system76/gaze17-3060-b/Makefile.mk
@@ -63,6 +63,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze17-3060/Makefile.mk b/src/board/system76/gaze17-3060/Makefile.mk
index ed3ab59ef..3d5e39cd2 100644
--- a/src/board/system76/gaze17-3060/Makefile.mk
+++ b/src/board/system76/gaze17-3060/Makefile.mk
@@ -60,6 +60,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze17-3060/board.c b/src/board/system76/gaze17-3060/board.c
index 36214afcd..d2ea8e909 100644
--- a/src/board/system76/gaze17-3060/board.c
+++ b/src/board/system76/gaze17-3060/board.c
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/gaze18/Makefile.mk b/src/board/system76/gaze18/Makefile.mk
index 560c286af..fe1fb1b76 100644
--- a/src/board/system76/gaze18/Makefile.mk
+++ b/src/board/system76/gaze18/Makefile.mk
@@ -62,6 +62,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze18/board.c b/src/board/system76/gaze18/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/gaze18/board.c
+++ b/src/board/system76/gaze18/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/gaze20/Makefile.mk b/src/board/system76/gaze20/Makefile.mk
index ed22181a8..5a70b0683 100644
--- a/src/board/system76/gaze20/Makefile.mk
+++ b/src/board/system76/gaze20/Makefile.mk
@@ -62,6 +62,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/gaze20/board.c b/src/board/system76/gaze20/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/gaze20/board.c
+++ b/src/board/system76/gaze20/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/lemp10/Makefile.mk b/src/board/system76/lemp10/Makefile.mk
index 4d2760c3c..0161d9487 100644
--- a/src/board/system76/lemp10/Makefile.mk
+++ b/src/board/system76/lemp10/Makefile.mk
@@ -46,6 +46,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/lemp10/board.c b/src/board/system76/lemp10/board.c
index 85496a3b0..e8583d3eb 100644
--- a/src/board/system76/lemp10/board.c
+++ b/src/board/system76/lemp10/board.c
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/lemp11/Makefile.mk b/src/board/system76/lemp11/Makefile.mk
index 3923d4dd2..13b9b7926 100644
--- a/src/board/system76/lemp11/Makefile.mk
+++ b/src/board/system76/lemp11/Makefile.mk
@@ -46,6 +46,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/lemp11/board.c b/src/board/system76/lemp11/board.c
index 7a154acfa..d77595570 100644
--- a/src/board/system76/lemp11/board.c
+++ b/src/board/system76/lemp11/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/lemp12/Makefile.mk b/src/board/system76/lemp12/Makefile.mk
index 603db01ac..c187c961d 100644
--- a/src/board/system76/lemp12/Makefile.mk
+++ b/src/board/system76/lemp12/Makefile.mk
@@ -51,6 +51,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/lemp12/board.c b/src/board/system76/lemp12/board.c
index dbd93dfd3..247b0abce 100644
--- a/src/board/system76/lemp12/board.c
+++ b/src/board/system76/lemp12/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/lemp13-b/Makefile.mk b/src/board/system76/lemp13-b/Makefile.mk
index 95b0d9bb1..f204af49b 100644
--- a/src/board/system76/lemp13-b/Makefile.mk
+++ b/src/board/system76/lemp13-b/Makefile.mk
@@ -49,6 +49,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/lemp13-b/board.c b/src/board/system76/lemp13-b/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/lemp13-b/board.c
+++ b/src/board/system76/lemp13-b/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/lemp13/Makefile.mk b/src/board/system76/lemp13/Makefile.mk
index 8a7158de8..aaffff81e 100644
--- a/src/board/system76/lemp13/Makefile.mk
+++ b/src/board/system76/lemp13/Makefile.mk
@@ -48,6 +48,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/lemp13/board.c b/src/board/system76/lemp13/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/lemp13/board.c
+++ b/src/board/system76/lemp13/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/lemp9/Makefile.mk b/src/board/system76/lemp9/Makefile.mk
index 2d17496ef..ca127494a 100644
--- a/src/board/system76/lemp9/Makefile.mk
+++ b/src/board/system76/lemp9/Makefile.mk
@@ -45,6 +45,3 @@ CONFIG_FAN1_POINTS = " \
 	FAN_POINT(85, 65), \
 	FAN_POINT(90, 65), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/lemp9/board.c b/src/board/system76/lemp9/board.c
index d14810976..1b87792ab 100644
--- a/src/board/system76/lemp9/board.c
+++ b/src/board/system76/lemp9/board.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
+#include <app/board.h>
 #include <board/gpio.h>
 
 void board_init(void) {
diff --git a/src/board/system76/oryp10/Makefile.mk b/src/board/system76/oryp10/Makefile.mk
index d0109079a..795850244 100644
--- a/src/board/system76/oryp10/Makefile.mk
+++ b/src/board/system76/oryp10/Makefile.mk
@@ -67,6 +67,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(56, 40), \
 	FAN_POINT(72, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp11/Makefile.mk b/src/board/system76/oryp11/Makefile.mk
index c97115233..3f7c7bea2 100644
--- a/src/board/system76/oryp11/Makefile.mk
+++ b/src/board/system76/oryp11/Makefile.mk
@@ -74,6 +74,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp11/board.c b/src/board/system76/oryp11/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/oryp11/board.c
+++ b/src/board/system76/oryp11/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/oryp12/Makefile.mk b/src/board/system76/oryp12/Makefile.mk
index 7e0214a82..672c5dd8a 100644
--- a/src/board/system76/oryp12/Makefile.mk
+++ b/src/board/system76/oryp12/Makefile.mk
@@ -69,6 +69,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp12/board.c b/src/board/system76/oryp12/board.c
index 2cb8a23c9..d2ea8e909 100644
--- a/src/board/system76/oryp12/board.c
+++ b/src/board/system76/oryp12/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/oryp5/Makefile.mk b/src/board/system76/oryp5/Makefile.mk
index 7c2fb37ca..980d9aa4e 100644
--- a/src/board/system76/oryp5/Makefile.mk
+++ b/src/board/system76/oryp5/Makefile.mk
@@ -59,6 +59,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(75, 90), \
 	FAN_POINT(80, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp5/board.c b/src/board/system76/oryp5/board.c
index 17bfdfda2..d40252547 100644
--- a/src/board/system76/oryp5/board.c
+++ b/src/board/system76/oryp5/board.c
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
+#include <app/board.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 
 void board_init(void) {
     // Allow CPU to boot
diff --git a/src/board/system76/oryp6/Makefile.mk b/src/board/system76/oryp6/Makefile.mk
index bf777b6a0..08d276c36 100644
--- a/src/board/system76/oryp6/Makefile.mk
+++ b/src/board/system76/oryp6/Makefile.mk
@@ -63,6 +63,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp6/board.c b/src/board/system76/oryp6/board.c
index 1933e2336..0baacc16b 100644
--- a/src/board/system76/oryp6/board.c
+++ b/src/board/system76/oryp6/board.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/gctrl.h>
+#include <app/board.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/oryp7/Makefile.mk b/src/board/system76/oryp7/Makefile.mk
index bf777b6a0..08d276c36 100644
--- a/src/board/system76/oryp7/Makefile.mk
+++ b/src/board/system76/oryp7/Makefile.mk
@@ -63,6 +63,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp7/board.c b/src/board/system76/oryp7/board.c
index 1933e2336..0baacc16b 100644
--- a/src/board/system76/oryp7/board.c
+++ b/src/board/system76/oryp7/board.c
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/gctrl.h>
+#include <app/board.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/oryp8/Makefile.mk b/src/board/system76/oryp8/Makefile.mk
index 2e5ef5f09..33754ed9a 100644
--- a/src/board/system76/oryp8/Makefile.mk
+++ b/src/board/system76/oryp8/Makefile.mk
@@ -64,6 +64,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(85, 90), \
 	FAN_POINT(90, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp8/board.c b/src/board/system76/oryp8/board.c
index 6e7b52874..96f709237 100644
--- a/src/board/system76/oryp8/board.c
+++ b/src/board/system76/oryp8/board.c
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/board.h>
-#include <board/espi.h>
-#include <board/gctrl.h>
+#include <app/board.h>
+#include <app/espi.h>
 #include <board/gpio.h>
-#include <common/debug.h>
 #include <ec/ec.h>
 
 void board_init(void) {
diff --git a/src/board/system76/oryp9/Makefile.mk b/src/board/system76/oryp9/Makefile.mk
index fda24d2c2..7e77ed34d 100644
--- a/src/board/system76/oryp9/Makefile.mk
+++ b/src/board/system76/oryp9/Makefile.mk
@@ -64,6 +64,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(56, 40), \
 	FAN_POINT(72, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/oryp9/board.c b/src/board/system76/oryp9/board.c
index 7951c2825..4741765b4 100644
--- a/src/board/system76/oryp9/board.c
+++ b/src/board/system76/oryp9/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>
 
diff --git a/src/board/system76/serw13/Makefile.mk b/src/board/system76/serw13/Makefile.mk
index 131df9484..716673974 100644
--- a/src/board/system76/serw13/Makefile.mk
+++ b/src/board/system76/serw13/Makefile.mk
@@ -71,6 +71,3 @@ CONFIG_FAN2_POINTS = " \
 	FAN_POINT(73, 50), \
 	FAN_POINT(87, 100), \
 "
-
-# Add system76 common code
-include src/board/system76/common/Makefile.mk
diff --git a/src/board/system76/serw13/board.c b/src/board/system76/serw13/board.c
index 7951c2825..4741765b4 100644
--- a/src/board/system76/serw13/board.c
+++ b/src/board/system76/serw13/board.c
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-#include <board/battery.h>
-#include <board/board.h>
-#include <board/espi.h>
+#include <app/board.h>
+#include <app/battery.h>
+#include <app/espi.h>
 #include <board/gpio.h>
 #include <ec/ec.h>