107 files changed, 54 insertions, 54 deletions

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 36c628c7c..c12aa0fce 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -388,7 +388,7 @@ VPATH += $(COMMON_VPATH)
 include common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(TMK_PATH)/protocol.mk
-include $(TMK_PATH)/common.mk
+include $(PLATFORM_PATH)/common.mk
 include $(BUILDDEFS_PATH)/bootloader.mk
 
 SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
@@ -404,13 +404,14 @@ ifneq ($(REQUIRE_PLATFORM_KEY),)
     endif
 endif
 
-include $(TMK_PATH)/$(PLATFORM_KEY).mk
+include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
+-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
+
 ifneq ($(strip $(PROTOCOL)),)
     include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
 else
     include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
 endif
--include $(TOP_DIR)/platforms/$(PLATFORM_KEY)/flash.mk
 
 # TODO: remove this bodge?
 PROJECT_DEFS := $(OPT_DEFS)
diff --git a/build_test.mk b/build_test.mk
index 6e4494d77..3553125a0 100644
--- a/build_test.mk
+++ b/build_test.mk
@@ -54,11 +54,11 @@ endif
 
 include common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
-include $(TMK_PATH)/common.mk
+include $(PLATFORM_PATH)/common.mk
 include $(TMK_PATH)/protocol.mk
 include $(QUANTUM_PATH)/debounce/tests/rules.mk
 include $(QUANTUM_PATH)/sequencer/tests/rules.mk
-include $(TMK_PATH)/common/test/rules.mk
+include $(PLATFORM_PATH)/test/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
 include build_full_test.mk
 endif
@@ -73,7 +73,7 @@ $(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
 $(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
 $(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
 
-include $(TMK_PATH)/native.mk
+include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 include $(TMK_PATH)/rules.mk
 
 
diff --git a/common_features.mk b/common_features.mk
index 896fbb012..8c593024f 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -33,8 +33,10 @@ QUANTUM_SRC += \
 
 VPATH += $(QUANTUM_DIR)/logging
 # Fall back to lib/printf if there is no platform provided print
-ifeq ("$(wildcard $(TMK_PATH)/common/$(PLATFORM_KEY)/printf.mk)","")
+ifeq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk)","")
     include $(QUANTUM_PATH)/logging/print.mk
+else
+    include $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk
 endif
 
 ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
diff --git a/docs/feature_layers.md b/docs/feature_layers.md
index 78d950dc4..e30c540a7 100644
--- a/docs/feature_layers.md
+++ b/docs/feature_layers.md
@@ -45,7 +45,7 @@ Once you have a good feel for how layers work and what you can do, you can get m
 
 Layers stack on top of each other in numerical order. When determining what a keypress does, QMK scans the layers from the top down, stopping when it reaches the first active layer that is not set to `KC_TRNS`. As a result if you activate a layer that is numerically lower than your current layer, and your current layer (or another layer that is active and higher than your target layer) has something other than `KC_TRNS`, that is the key that will be sent, not the key on the layer you just activated. This is the cause of most people's "why doesn't my layer get switched" problem.
 
-Sometimes, you might want to switch between layers in a macro or as part of a tap dance routine. `layer_on` activates a layer, and `layer_off` deactivates it. More layer-related functions can be found in [action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/action_layer.h).
+Sometimes, you might want to switch between layers in a macro or as part of a tap dance routine. `layer_on` activates a layer, and `layer_off` deactivates it. More layer-related functions can be found in [action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/action_layer.h).
 
 ## Functions :id=functions
 
diff --git a/docs/fr-fr/faq_keymap.md b/docs/fr-fr/faq_keymap.md
index 374a00522..cc0700ab8 100644
--- a/docs/fr-fr/faq_keymap.md
+++ b/docs/fr-fr/faq_keymap.md
@@ -6,7 +6,7 @@ Cette page couvre les questions souvent posées à propos des keymaps. Si vous n
 
 Regardez [Keycodes](keycodes.md) pour une liste des keycodes disponibles. Certains keycodes spécifiques ont des documentations plus complètes de disponible.
 
-Les keycodes sont définies dans [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/keycode.h).
+Les keycodes sont définies dans [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h).
 
 ## Quels sont les keycodes par défaut ?
 
diff --git a/docs/internals_gpio_control.md b/docs/internals_gpio_control.md
index 21a3bd661..ccd3f8c74 100644
--- a/docs/internals_gpio_control.md
+++ b/docs/internals_gpio_control.md
@@ -4,7 +4,7 @@ QMK has a GPIO control abstraction layer which is microcontroller agnostic. This
 
 ## Functions :id=functions
 
-The following functions provide basic control of GPIOs and are found in `tmk_core/common/<platform>/gpio.h`.
+The following functions provide basic control of GPIOs and are found in `platforms/<platform>/gpio.h`.
 
 |Function                |Description                                       | Old AVR Examples                                | Old ChibiOS/ARM Examples                        |
 |------------------------|--------------------------------------------------|-------------------------------------------------|-------------------------------------------------|
diff --git a/docs/ja/faq_keymap.md b/docs/ja/faq_keymap.md
index fb44e316b..59c7d206a 100644
--- a/docs/ja/faq_keymap.md
+++ b/docs/ja/faq_keymap.md
@@ -10,7 +10,7 @@
 ## ��キーコードを使����？
 ����利用�能�キーコード�インデックス������[キーコード](ja/keycodes.md)を見�����。より広範�ドキュメント��る場������らリンク���り��。
 
-キーコード�実際�� [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/keycode.h) �定義�れ����。
+キーコード�実際�� [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h) �定義�れ����。
 
 ## デフォルト�キーコード��何�？
 
diff --git a/docs/ja/feature_layers.md b/docs/ja/feature_layers.md
index 011f0e0ef..ca3e05583 100644
--- a/docs/ja/feature_layers.md
+++ b/docs/ja/feature_layers.md
@@ -50,7 +50,7 @@ QMK を使ã�„始ã‚�ã�Ÿã�°ã�‹ã‚Šã�®å ´å�ˆã�¯ã€�å…¨ã�¦ã‚’å�˜ç´”ã�«ã�—ã�Ÿã�„ã�§ã�—ã
 
 レイヤー�番�順�上����������。キー�押下�動作を決定�る時��QMK �上�ら順�レイヤーを走査��`KC_TRNS` �設定�れ����最��アクティブ�レイヤー�到��る��止���。�果�����在�レイヤーよりも数値的�低�レイヤーをアクティブ����在�レイヤー(�る��アクティブ�ターゲットレイヤーよりも高�別�レイヤー)� `KC_TRNS` 以外�も���る場���れ��信�れるキー��り�アクティブ化����り�レイヤー上�キー���り��ん。�れ����ん��人� "��レイヤー�切り替�ら����" �題�原因��。
 
-場��よ����マクロ内�る��タップダンスルー�ン�一部���レイヤーを切り替����良��も�れ��ん。`layer_on` �レイヤーをアクティブ���`layer_off` ��れを�アクティブ����。も��多��レイヤー�関�る関数��[action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/action_layer.h) �見��る�������。
+場��よ����マクロ内�る��タップダンスルー�ン�一部���レイヤーを切り替����良��も�れ��ん。`layer_on` �レイヤーをアクティブ���`layer_off` ��れを�アクティブ����。も��多��レイヤー�関�る関数��[action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/action_layer.h) �見��る�������。
 
 ## 関数 :id=functions
 
diff --git a/docs/ja/pr_checklist.md b/docs/ja/pr_checklist.md
index 18dbecceb..caab2b4d5 100644
--- a/docs/ja/pr_checklist.md
+++ b/docs/ja/pr_checklist.md
@@ -27,7 +27,7 @@
     - 「旧��� GPIO/I2C/SPI 関数を使用��� - 正当��由����り�QMK �抽象化を使用���れ��り��ん (怠惰�正当��由���り��ん)
     - タイミング�抽象化�も従�必���り��:
         - `_delay_ms()` ���り� `wait_ms()` を。(`#include <util/delay.h>` も消���)
-        - `timer_read()` � `timer_read32()` ��。 -- タイミング API � [timer.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/timer.h) を�照������
+        - `timer_read()` � `timer_read32()` ��。 -- タイミング API � [timer.h](https://github.com/qmk/qmk_firmware/blob/master/platforms/timer.h) を�照������
     - 新��抽象化�有用����場���次���を�勧����:
         - 機能�完��る��自分�キーボード�プロトタイプを作��る
         - Discord � QMK コラボレータ�話���
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 94c62c653..2a2b0f1e7 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -24,7 +24,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr
     - no "old-school" or other low-level GPIO/I2C/SPI functions may be used -- must use QMK abstractions unless justifiable (and laziness is not valid justification)
     - timing abstractions should be followed too:
         - `wait_ms()` instead of `_delay_ms()` (remove `#include <util/delay.h>` too)
-        - `timer_read()` and `timer_read32()` etc. -- see [timer.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/timer.h) for the timing APIs
+        - `timer_read()` and `timer_read32()` etc. -- see [timer.h](https://github.com/qmk/qmk_firmware/blob/master/platforms/timer.h) for the timing APIs
     - if you think a new abstraction is useful, you're encouraged to:
         - prototype it in your own keyboard until it's feature-complete
         - discuss it with QMK Collaborators on Discord
diff --git a/docs/zh-cn/faq_keymap.md b/docs/zh-cn/faq_keymap.md
index fdfa25ad9..ff38f3889 100644
--- a/docs/zh-cn/faq_keymap.md
+++ b/docs/zh-cn/faq_keymap.md
@@ -5,7 +5,7 @@
 ## 我能用什么键�?
 看[键�](keycodes.md)你�以找到你能用的键�索引。�以的�这些链接�以连接到更广泛的文档。
 
-键�实际上定义在[common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/keycode.h).
+键�实际上定义在[common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h).
 
 ## 默认的键�什么样?
 
diff --git a/keyboards/ai03/orbit/split_util.c b/keyboards/ai03/orbit/split_util.c
index a83ff5bc6..2352e5a11 100644
--- a/keyboards/ai03/orbit/split_util.c
+++ b/keyboards/ai03/orbit/split_util.c
@@ -8,7 +8,7 @@
 #include "quantum.h"
 
 #ifdef EE_HANDS
-#   include "tmk_core/common/eeprom.h"
+#   include "eeprom.h"
 #   include "eeconfig.h"
 #endif
 
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index 8b5016437..bd7eaf188 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -9,7 +9,7 @@
 
 #include "raw_hid.h"
 #include "dynamic_keymap.h"
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic
 
 /* Artificial delay added to get media keys to work in the encoder*/
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
index cefdbc5f9..0d2fdc359 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
@@ -1,5 +1,5 @@
 #include "satisfaction75.h"
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 
 void pre_encoder_mode_change(){
   if(encoder_mode == ENC_MODE_CLOCK_SET){
diff --git a/keyboards/mxss/mxss.c b/keyboards/mxss/mxss.c
index f591d39e6..21beee232 100644
--- a/keyboards/mxss/mxss.c
+++ b/keyboards/mxss/mxss.c
@@ -17,7 +17,7 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 #include "action_layer.h"
 #include "rgblight.h"
 #include "via.h"
diff --git a/keyboards/mxss/mxss_frontled.c b/keyboards/mxss/mxss_frontled.c
index 3c4309f07..f5e4613df 100644
--- a/keyboards/mxss/mxss_frontled.c
+++ b/keyboards/mxss/mxss_frontled.c
@@ -17,7 +17,7 @@
  */
 
 #include "mxss_frontled.h"
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 #include "rgblight.h"
 #include "via.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index d5e136e06..a8ad79544 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -27,7 +27,7 @@
 #include "via.h"
 
 #ifndef VIA_ENABLE
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 #include "version.h" // for QMK_BUILDDATE used in EEPROM magic
 #endif
 
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 77cee34ca..5e2fde810 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -24,7 +24,7 @@
 
 #include "progmem.h"
 #include "quantum/color.h"
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 
 #include "via.h" // uses EEPROM address, lighting value IDs
 #define MONO_BACKLIGHT_CONFIG_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 82b1fb2fb..63763c6c9 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -68,7 +68,7 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL];
 
 #include "progmem.h"
 #include "quantum/color.h"
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 
 #include "via.h" // uses EEPROM address, lighting value IDs
 #define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
diff --git a/paths.mk b/paths.mk
index 7be1b2ce0..5a39d00ec 100644
--- a/paths.mk
+++ b/paths.mk
@@ -13,6 +13,9 @@ DRIVER_PATH = $(DRIVER_DIR)
 PLATFORM_DIR = platforms
 PLATFORM_PATH = $(PLATFORM_DIR)
 
+PROTOCOL_DIR = protocol
+PROTOCOL_PATH = $(TMK_DIR)/$(PROTOCOL_DIR)
+
 BUILDDEFS_DIR = builddefs
 BUILDDEFS_PATH = $(BUILDDEFS_DIR)
 
diff --git a/tmk_core/common/arm_atsam/_timer.h b/platforms/arm_atsam/_timer.h
index 77402b612..77402b612 100644
--- a/tmk_core/common/arm_atsam/_timer.h
+++ b/platforms/arm_atsam/_timer.h
diff --git a/tmk_core/common/arm_atsam/_wait.h b/platforms/arm_atsam/_wait.h
index 41b686b56..41b686b56 100644
--- a/tmk_core/common/arm_atsam/_wait.h
+++ b/platforms/arm_atsam/_wait.h
diff --git a/tmk_core/common/arm_atsam/atomic_util.h b/platforms/arm_atsam/atomic_util.h
index 848542d23..848542d23 100644
--- a/tmk_core/common/arm_atsam/atomic_util.h
+++ b/platforms/arm_atsam/atomic_util.h
diff --git a/tmk_core/common/arm_atsam/bootloader.c b/platforms/arm_atsam/bootloader.c
index 9015b00aa..9015b00aa 100644
--- a/tmk_core/common/arm_atsam/bootloader.c
+++ b/platforms/arm_atsam/bootloader.c
diff --git a/tmk_core/common/arm_atsam/eeprom.c b/platforms/arm_atsam/eeprom.c
index ff1a69262..ff1a69262 100644
--- a/tmk_core/common/arm_atsam/eeprom.c
+++ b/platforms/arm_atsam/eeprom.c
diff --git a/tmk_core/common/arm_atsam/gpio.h b/platforms/arm_atsam/gpio.h
index 915ed0ef4..915ed0ef4 100644
--- a/tmk_core/common/arm_atsam/gpio.h
+++ b/platforms/arm_atsam/gpio.h
diff --git a/tmk_core/common/arm_atsam/pin_defs.h b/platforms/arm_atsam/pin_defs.h
index 5b50b2391..5b50b2391 100644
--- a/tmk_core/common/arm_atsam/pin_defs.h
+++ b/platforms/arm_atsam/pin_defs.h
diff --git a/tmk_core/common/arm_atsam/platform.c b/platforms/arm_atsam/platform.c
index 3e35b4fe4..3e35b4fe4 100644
--- a/tmk_core/common/arm_atsam/platform.c
+++ b/platforms/arm_atsam/platform.c
diff --git a/tmk_core/arm_atsam.mk b/platforms/arm_atsam/platform.mk
index b49bf764d..b49bf764d 100644
--- a/tmk_core/arm_atsam.mk
+++ b/platforms/arm_atsam/platform.mk
diff --git a/tmk_core/common/arm_atsam/platform_deps.h b/platforms/arm_atsam/platform_deps.h
index f296d1d53..f296d1d53 100644
--- a/tmk_core/common/arm_atsam/platform_deps.h
+++ b/platforms/arm_atsam/platform_deps.h
diff --git a/tmk_core/common/arm_atsam/suspend.c b/platforms/arm_atsam/suspend.c
index e51426128..e51426128 100644
--- a/tmk_core/common/arm_atsam/suspend.c
+++ b/platforms/arm_atsam/suspend.c
diff --git a/tmk_core/common/arm_atsam/timer.c b/platforms/arm_atsam/timer.c
index b835dd5e7..b835dd5e7 100644
--- a/tmk_core/common/arm_atsam/timer.c
+++ b/platforms/arm_atsam/timer.c
diff --git a/tmk_core/common/atomic_util.h b/platforms/atomic_util.h
index 2c95302a1..2c95302a1 100644
--- a/tmk_core/common/atomic_util.h
+++ b/platforms/atomic_util.h
diff --git a/tmk_core/common/avr/_print.h b/platforms/avr/_print.h
index 5c1fdd26d..5c1fdd26d 100644
--- a/tmk_core/common/avr/_print.h
+++ b/platforms/avr/_print.h
diff --git a/tmk_core/common/avr/_timer.h b/platforms/avr/_timer.h
index b81e0f68b..b81e0f68b 100644
--- a/tmk_core/common/avr/_timer.h
+++ b/platforms/avr/_timer.h
diff --git a/tmk_core/common/avr/_wait.h b/platforms/avr/_wait.h
index 683db6ae5..683db6ae5 100644
--- a/tmk_core/common/avr/_wait.h
+++ b/platforms/avr/_wait.h
diff --git a/tmk_core/common/avr/atomic_util.h b/platforms/avr/atomic_util.h
index 7c5d2e7dc..7c5d2e7dc 100644
--- a/tmk_core/common/avr/atomic_util.h
+++ b/platforms/avr/atomic_util.h
diff --git a/tmk_core/common/avr/bootloader.c b/platforms/avr/bootloader.c
index c0272903b..c0272903b 100644
--- a/tmk_core/common/avr/bootloader.c
+++ b/platforms/avr/bootloader.c
diff --git a/tmk_core/common/avr/bootloader_size.c b/platforms/avr/bootloader_size.c
index a029f9321..a029f9321 100644
--- a/tmk_core/common/avr/bootloader_size.c
+++ b/platforms/avr/bootloader_size.c
diff --git a/tmk_core/common/avr/gpio.h b/platforms/avr/gpio.h
index e9be68491..e9be68491 100644
--- a/tmk_core/common/avr/gpio.h
+++ b/platforms/avr/gpio.h
diff --git a/tmk_core/common/avr/pin_defs.h b/platforms/avr/pin_defs.h
index 23d948041..23d948041 100644
--- a/tmk_core/common/avr/pin_defs.h
+++ b/platforms/avr/pin_defs.h
diff --git a/tmk_core/common/avr/platform.c b/platforms/avr/platform.c
index 3e35b4fe4..3e35b4fe4 100644
--- a/tmk_core/common/avr/platform.c
+++ b/platforms/avr/platform.c
diff --git a/tmk_core/avr.mk b/platforms/avr/platform.mk
index c52262273..b45108736 100644
--- a/tmk_core/avr.mk
+++ b/platforms/avr/platform.mk
@@ -163,7 +163,7 @@ ifeq ($(strip $(QMK_BOOTLOADER_TYPE)),)
 else
         make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean
         $(QMK_BIN) generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Keyboard.h
-        $(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
+        $(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
         $(eval PROGRAM_SIZE_KB=$(shell n=`expr $(MAX_SIZE) / 1024` && echo $$(($$n)) || echo 0))
         $(eval BOOT_SECTION_SIZE_KB=$(shell n=`expr  $(BOOTLOADER_SIZE) / 1024` && echo $$(($$n)) || echo 0))
         $(eval FLASH_SIZE_KB=$(shell n=`expr $(PROGRAM_SIZE_KB) + $(BOOT_SECTION_SIZE_KB)` && echo $$(($$n)) || echo 0))
diff --git a/tmk_core/common/avr/platform_deps.h b/platforms/avr/platform_deps.h
index 45d9dcebf..45d9dcebf 100644
--- a/tmk_core/common/avr/platform_deps.h
+++ b/platforms/avr/platform_deps.h
diff --git a/tmk_core/common/avr/printf.c b/platforms/avr/printf.c
index 9ad7a3869..9ad7a3869 100644
--- a/tmk_core/common/avr/printf.c
+++ b/platforms/avr/printf.c
diff --git a/tmk_core/common/avr/printf.mk b/platforms/avr/printf.mk
index 060ad88c5..060ad88c5 100644
--- a/tmk_core/common/avr/printf.mk
+++ b/platforms/avr/printf.mk
diff --git a/tmk_core/common/avr/sleep_led.c b/platforms/avr/sleep_led.c
index 9a3b52abe..9a3b52abe 100644
--- a/tmk_core/common/avr/sleep_led.c
+++ b/platforms/avr/sleep_led.c
diff --git a/tmk_core/common/avr/suspend.c b/platforms/avr/suspend.c
index b614746e6..b614746e6 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/platforms/avr/suspend.c
diff --git a/tmk_core/common/avr/timer.c b/platforms/avr/timer.c
index c2e6c6e08..c2e6c6e08 100644
--- a/tmk_core/common/avr/timer.c
+++ b/platforms/avr/timer.c
diff --git a/tmk_core/common/avr/timer_avr.h b/platforms/avr/timer_avr.h
index c1b726bd0..c1b726bd0 100644
--- a/tmk_core/common/avr/timer_avr.h
+++ b/platforms/avr/timer_avr.h
diff --git a/tmk_core/common/avr/xprintf.S b/platforms/avr/xprintf.S
index c5a414c35..c5a414c35 100644
--- a/tmk_core/common/avr/xprintf.S
+++ b/platforms/avr/xprintf.S
diff --git a/tmk_core/common/avr/xprintf.h b/platforms/avr/xprintf.h
index 80834f171..80834f171 100644
--- a/tmk_core/common/avr/xprintf.h
+++ b/platforms/avr/xprintf.h
diff --git a/tmk_core/common/bootloader.h b/platforms/bootloader.h
index 25ebd9528..25ebd9528 100644
--- a/tmk_core/common/bootloader.h
+++ b/platforms/bootloader.h
diff --git a/tmk_core/common/chibios/_timer.h b/platforms/chibios/_timer.h
index 77402b612..77402b612 100644
--- a/tmk_core/common/chibios/_timer.h
+++ b/platforms/chibios/_timer.h
diff --git a/tmk_core/common/chibios/_wait.c b/platforms/chibios/_wait.c
index 1fbea2dd5..1fbea2dd5 100644
--- a/tmk_core/common/chibios/_wait.c
+++ b/platforms/chibios/_wait.c
diff --git a/tmk_core/common/chibios/_wait.h b/platforms/chibios/_wait.h
index 2f36c64a2..2f36c64a2 100644
--- a/tmk_core/common/chibios/_wait.h
+++ b/platforms/chibios/_wait.h
diff --git a/tmk_core/common/chibios/atomic_util.h b/platforms/chibios/atomic_util.h
index 897504515..897504515 100644
--- a/tmk_core/common/chibios/atomic_util.h
+++ b/platforms/chibios/atomic_util.h
diff --git a/tmk_core/common/chibios/bootloader.c b/platforms/chibios/bootloader.c
index 5cadadeee..5cadadeee 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/platforms/chibios/bootloader.c
diff --git a/tmk_core/common/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index ad2f808a9..ad2f808a9 100644
--- a/tmk_core/common/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
diff --git a/tmk_core/common/chibios/eeprom_stm32.c b/platforms/chibios/eeprom_stm32.c
index acc6a4851..acc6a4851 100644
--- a/tmk_core/common/chibios/eeprom_stm32.c
+++ b/platforms/chibios/eeprom_stm32.c
diff --git a/tmk_core/common/chibios/eeprom_stm32.h b/platforms/chibios/eeprom_stm32.h
index 8fcfb556b..8fcfb556b 100644
--- a/tmk_core/common/chibios/eeprom_stm32.h
+++ b/platforms/chibios/eeprom_stm32.h
diff --git a/tmk_core/common/chibios/eeprom_stm32_defs.h b/platforms/chibios/eeprom_stm32_defs.h
index 66904f247..66904f247 100644
--- a/tmk_core/common/chibios/eeprom_stm32_defs.h
+++ b/platforms/chibios/eeprom_stm32_defs.h
diff --git a/tmk_core/common/chibios/eeprom_teensy.c b/platforms/chibios/eeprom_teensy.c
index 97da6f9e1..97da6f9e1 100644
--- a/tmk_core/common/chibios/eeprom_teensy.c
+++ b/platforms/chibios/eeprom_teensy.c
diff --git a/tmk_core/common/chibios/flash_stm32.c b/platforms/chibios/flash_stm32.c
index 72c41b8b7..72c41b8b7 100644
--- a/tmk_core/common/chibios/flash_stm32.c
+++ b/platforms/chibios/flash_stm32.c
diff --git a/tmk_core/common/chibios/flash_stm32.h b/platforms/chibios/flash_stm32.h
index 6c66642ec..6c66642ec 100644
--- a/tmk_core/common/chibios/flash_stm32.h
+++ b/platforms/chibios/flash_stm32.h
diff --git a/tmk_core/common/chibios/gd32v_compatibility.h b/platforms/chibios/gd32v_compatibility.h
index f4dcfd8c5..f4dcfd8c5 100644
--- a/tmk_core/common/chibios/gd32v_compatibility.h
+++ b/platforms/chibios/gd32v_compatibility.h
diff --git a/tmk_core/common/chibios/gpio.h b/platforms/chibios/gpio.h
index 4d057f1ca..4d057f1ca 100644
--- a/tmk_core/common/chibios/gpio.h
+++ b/platforms/chibios/gpio.h
diff --git a/tmk_core/common/chibios/pin_defs.h b/platforms/chibios/pin_defs.h
index c03f8de0c..c03f8de0c 100644
--- a/tmk_core/common/chibios/pin_defs.h
+++ b/platforms/chibios/pin_defs.h
diff --git a/tmk_core/common/chibios/platform.c b/platforms/chibios/platform.c
index d4a229f27..d4a229f27 100644
--- a/tmk_core/common/chibios/platform.c
+++ b/platforms/chibios/platform.c
diff --git a/tmk_core/chibios.mk b/platforms/chibios/platform.mk
index 6b298732c..6b298732c 100644
--- a/tmk_core/chibios.mk
+++ b/platforms/chibios/platform.mk
diff --git a/tmk_core/common/chibios/platform_deps.h b/platforms/chibios/platform_deps.h
index 8243dcec5..8243dcec5 100644
--- a/tmk_core/common/chibios/platform_deps.h
+++ b/platforms/chibios/platform_deps.h
diff --git a/tmk_core/common/chibios/sleep_led.c b/platforms/chibios/sleep_led.c
index 477056a45..477056a45 100644
--- a/tmk_core/common/chibios/sleep_led.c
+++ b/platforms/chibios/sleep_led.c
diff --git a/tmk_core/common/chibios/suspend.c b/platforms/chibios/suspend.c
index 9310a9992..9310a9992 100644
--- a/tmk_core/common/chibios/suspend.c
+++ b/platforms/chibios/suspend.c
diff --git a/tmk_core/common/chibios/syscall-fallbacks.c b/platforms/chibios/syscall-fallbacks.c
index 4569879c7..4569879c7 100644
--- a/tmk_core/common/chibios/syscall-fallbacks.c
+++ b/platforms/chibios/syscall-fallbacks.c
diff --git a/tmk_core/common/chibios/timer.c b/platforms/chibios/timer.c
index 9f664e1f7..9f664e1f7 100644
--- a/tmk_core/common/chibios/timer.c
+++ b/platforms/chibios/timer.c
diff --git a/tmk_core/common/chibios/wait.c b/platforms/chibios/wait.c
index 56fd6ffce..56fd6ffce 100644
--- a/tmk_core/common/chibios/wait.c
+++ b/platforms/chibios/wait.c
diff --git a/platforms/common.mk b/platforms/common.mk
new file mode 100644
index 000000000..f7a0fc702
--- /dev/null
+++ b/platforms/common.mk
@@ -0,0 +1,12 @@
+PLATFORM_COMMON_DIR = $(PLATFORM_PATH)/$(PLATFORM_KEY)
+
+TMK_COMMON_SRC +=       \
+        $(PLATFORM_COMMON_DIR)/platform.c \
+        $(PLATFORM_COMMON_DIR)/suspend.c \
+        $(PLATFORM_COMMON_DIR)/timer.c \
+        $(PLATFORM_COMMON_DIR)/bootloader.c \
+
+# Search Path
+VPATH += $(PLATFORM_PATH)
+VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)
+VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)
diff --git a/tmk_core/common/eeprom.h b/platforms/eeprom.h
index f5b3f0ad5..f5b3f0ad5 100644
--- a/tmk_core/common/eeprom.h
+++ b/platforms/eeprom.h
diff --git a/tmk_core/common/gpio.h b/platforms/gpio.h
index b47f6f8e4..b47f6f8e4 100644
--- a/tmk_core/common/gpio.h
+++ b/platforms/gpio.h
diff --git a/tmk_core/common/pin_defs.h b/platforms/pin_defs.h
index ea730138f..ea730138f 100644
--- a/tmk_core/common/pin_defs.h
+++ b/platforms/pin_defs.h
diff --git a/tmk_core/common/progmem.h b/platforms/progmem.h
index a70d8e299..a70d8e299 100644
--- a/tmk_core/common/progmem.h
+++ b/platforms/progmem.h
diff --git a/tmk_core/common/sleep_led.h b/platforms/sleep_led.h
index 38f80a660..38f80a660 100644
--- a/tmk_core/common/sleep_led.h
+++ b/platforms/sleep_led.h
diff --git a/tmk_core/common/suspend.h b/platforms/suspend.h
index 081735f90..081735f90 100644
--- a/tmk_core/common/suspend.h
+++ b/platforms/suspend.h
diff --git a/tmk_core/common/test/_wait.h b/platforms/test/_wait.h
index 4e22f593b..4e22f593b 100644
--- a/tmk_core/common/test/_wait.h
+++ b/platforms/test/_wait.h
diff --git a/tmk_core/common/test/bootloader.c b/platforms/test/bootloader.c
index 5155d9ff0..5155d9ff0 100644
--- a/tmk_core/common/test/bootloader.c
+++ b/platforms/test/bootloader.c
diff --git a/tmk_core/common/test/eeprom.c b/platforms/test/eeprom.c
index 5c8e69dae..5c8e69dae 100644
--- a/tmk_core/common/test/eeprom.c
+++ b/platforms/test/eeprom.c
diff --git a/tmk_core/common/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_stm32_tests.cpp
index 5bc8d8790..5bc8d8790 100644
--- a/tmk_core/common/test/eeprom_stm32_tests.cpp
+++ b/platforms/test/eeprom_stm32_tests.cpp
diff --git a/tmk_core/common/test/flash_stm32_mock.c b/platforms/test/flash_stm32_mock.c
index 222a004bc..222a004bc 100644
--- a/tmk_core/common/test/flash_stm32_mock.c
+++ b/platforms/test/flash_stm32_mock.c
diff --git a/tmk_core/common/test/hal.h b/platforms/test/hal.h
index 2d268ad54..2d268ad54 100644
--- a/tmk_core/common/test/hal.h
+++ b/platforms/test/hal.h
diff --git a/tmk_core/common/test/platform.c b/platforms/test/platform.c
index 8ddceeda8..8ddceeda8 100644
--- a/tmk_core/common/test/platform.c
+++ b/platforms/test/platform.c
diff --git a/tmk_core/common/test/platform.h b/platforms/test/platform.h
index f296d1d53..f296d1d53 100644
--- a/tmk_core/common/test/platform.h
+++ b/platforms/test/platform.h
diff --git a/tmk_core/native.mk b/platforms/test/platform.mk
index eb2424ec5..eb2424ec5 100644
--- a/tmk_core/native.mk
+++ b/platforms/test/platform.mk
diff --git a/tmk_core/common/test/platform_deps.h b/platforms/test/platform_deps.h
index f296d1d53..f296d1d53 100644
--- a/tmk_core/common/test/platform_deps.h
+++ b/platforms/test/platform_deps.h
diff --git a/tmk_core/common/test/rules.mk b/platforms/test/rules.mk
index 73d2302da..66b853d8e 100644
--- a/tmk_core/common/test/rules.mk
+++ b/platforms/test/rules.mk
@@ -11,14 +11,14 @@ eeprom_stm32_large_DEFS := $(eeprom_stm32_DEFS) \
         -DFEE_PAGE_COUNT=16
 
 eeprom_stm32_INC := \
-        $(TMK_PATH)/common/chibios/
+        $(PLATFORM_PATH)/chibios/
 eeprom_stm32_tiny_INC := $(eeprom_stm32_INC)
 eeprom_stm32_large_INC := $(eeprom_stm32_INC)
 
 eeprom_stm32_SRC := \
         $(TOP_DIR)/drivers/eeprom/eeprom_driver.c \
-        $(TMK_PATH)/common/test/eeprom_stm32_tests.cpp \
-        $(TMK_PATH)/common/test/flash_stm32_mock.c \
-        $(TMK_PATH)/common/chibios/eeprom_stm32.c
+        $(PLATFORM_PATH)/$(PLATFORM_KEY)/eeprom_stm32_tests.cpp \
+        $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash_stm32_mock.c \
+        $(PLATFORM_PATH)/chibios/eeprom_stm32.c
 eeprom_stm32_tiny_SRC := $(eeprom_stm32_SRC)
 eeprom_stm32_large_SRC := $(eeprom_stm32_SRC)
diff --git a/tmk_core/common/test/suspend.c b/platforms/test/suspend.c
index 76b705967..76b705967 100644
--- a/tmk_core/common/test/suspend.c
+++ b/platforms/test/suspend.c
diff --git a/tmk_core/common/test/testlist.mk b/platforms/test/testlist.mk
index 51a9638bb..51a9638bb 100644
--- a/tmk_core/common/test/testlist.mk
+++ b/platforms/test/testlist.mk
diff --git a/tmk_core/common/test/timer.c b/platforms/test/timer.c
index 61c3a0020..61c3a0020 100644
--- a/tmk_core/common/test/timer.c
+++ b/platforms/test/timer.c
diff --git a/tmk_core/common/timer.h b/platforms/timer.h
index 02e39e79e..02e39e79e 100644
--- a/tmk_core/common/timer.h
+++ b/platforms/timer.h
diff --git a/tmk_core/common/wait.h b/platforms/wait.h
index cf7180fb0..cf7180fb0 100644
--- a/tmk_core/common/wait.h
+++ b/platforms/wait.h
diff --git a/quantum/debounce/tests/rules.mk b/quantum/debounce/tests/rules.mk
index 66928d7eb..e908dd6f6 100644
--- a/quantum/debounce/tests/rules.mk
+++ b/quantum/debounce/tests/rules.mk
@@ -16,7 +16,7 @@
 DEBOUNCE_COMMON_DEFS := -DMATRIX_ROWS=4 -DMATRIX_COLS=10 -DDEBOUNCE=5
 
 DEBOUNCE_COMMON_SRC := $(QUANTUM_PATH)/debounce/tests/debounce_test_common.cpp \
-        $(TMK_PATH)/common/test/timer.c
+        $(PLATFORM_PATH)/$(PLATFORM_KEY)/timer.c
 
 debounce_sym_defer_g_DEFS := $(DEBOUNCE_COMMON_DEFS)
 debounce_sym_defer_g_SRC := $(DEBOUNCE_COMMON_SRC) \
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index b7a9f2662..f5525576d 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -16,7 +16,7 @@
 
 #include "config.h"
 #include "keymap.h"  // to get keymaps[][][]
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 #include "progmem.h"  // to read default from flash
 #include "quantum.h"  // for send_string()
 #include "dynamic_keymap.h"
diff --git a/quantum/sequencer/tests/rules.mk b/quantum/sequencer/tests/rules.mk
index 87a204669..a3bbd8051 100644
--- a/quantum/sequencer/tests/rules.mk
+++ b/quantum/sequencer/tests/rules.mk
@@ -8,4 +8,4 @@ sequencer_SRC := \
         $(QUANTUM_PATH)/sequencer/tests/midi_mock.c \
         $(QUANTUM_PATH)/sequencer/tests/sequencer_tests.cpp \
         $(QUANTUM_PATH)/sequencer/sequencer.c \
-        $(TMK_PATH)/common/test/timer.c
+        $(PLATFORM_PATH)/$(PLATFORM_KEY)/timer.c
diff --git a/quantum/via.c b/quantum/via.c
index 1b2dbcf08..7c8aa753e 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -44,7 +44,7 @@
 
 #include "raw_hid.h"
 #include "dynamic_keymap.h"
-#include "tmk_core/common/eeprom.h"
+#include "eeprom.h"
 #include "version.h"  // for QMK_BUILDDATE used in EEPROM magic
 #include "via_ensure_keycode.h"
 
diff --git a/testlist.mk b/testlist.mk
index 364fb339c..faff4d201 100644
--- a/testlist.mk
+++ b/testlist.mk
@@ -1,9 +1,9 @@
 TEST_LIST = $(notdir $(patsubst %/rules.mk,%,$(wildcard $(ROOT_DIR)/tests/*/rules.mk)))
 FULL_TESTS := $(TEST_LIST)
 
-include $(ROOT_DIR)/quantum/debounce/tests/testlist.mk
-include $(ROOT_DIR)/quantum/sequencer/tests/testlist.mk
-include $(ROOT_DIR)/tmk_core/common/test/testlist.mk
+include $(QUANTUM_PATH)/debounce/tests/testlist.mk
+include $(QUANTUM_PATH)/sequencer/tests/testlist.mk
+include $(PLATFORM_PATH)/test/testlist.mk
 
 define VALIDATE_TEST_LIST
     ifneq ($1,)
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
deleted file mode 100644
index 555b942c9..000000000
--- a/tmk_core/common.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-COMMON_DIR = common
-PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY)
-
-TMK_COMMON_SRC +=       \
-        $(PLATFORM_COMMON_DIR)/platform.c \
-        $(PLATFORM_COMMON_DIR)/suspend.c \
-        $(PLATFORM_COMMON_DIR)/timer.c \
-        $(PLATFORM_COMMON_DIR)/bootloader.c \
-
-# Use platform provided print if it exists
--include $(TMK_PATH)/$(PLATFORM_COMMON_DIR)/printf.mk
-
-# Search Path
-VPATH += $(TMK_PATH)/$(COMMON_DIR)
-VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR)
-VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index a8723e6b2..31a6de76f 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -1,5 +1,3 @@
-PROTOCOL_DIR = protocol
-
 TMK_COMMON_SRC +=       \
         $(PROTOCOL_DIR)/host.c \
         $(PROTOCOL_DIR)/report.c \
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index e657af3f4..6767a8e4a 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -479,7 +479,7 @@ ifeq ($(findstring avr-gcc,$(CC)),avr-gcc)
 SIZE_MARGIN = 1024
 
 check-size:
-        $(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
+        $(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
         $(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi))
         $(eval FREE_SIZE=$(shell expr $(MAX_SIZE) - $(CURRENT_SIZE)))
         $(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE)))