diff --git a/keyboards/0_sixty/base/info.json b/keyboards/0_sixty/base/keyboard.json
similarity index 100%
rename from keyboards/0_sixty/base/info.json
rename to keyboards/0_sixty/base/keyboard.json
diff --git a/keyboards/0_sixty/base/rules.mk b/keyboards/0_sixty/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/keyboard.json
similarity index 100%
rename from keyboards/0_sixty/underglow/info.json
rename to keyboards/0_sixty/underglow/keyboard.json
diff --git a/keyboards/0_sixty/underglow/rules.mk b/keyboards/0_sixty/underglow/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/1upocarina/info.json
rename to keyboards/1upkeyboards/1upocarina/keyboard.json
diff --git a/keyboards/1upkeyboards/1upocarina/rules.mk b/keyboards/1upkeyboards/1upocarina/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/1upkeyboards/1upocarina/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/1upkeyboards/1upsuper16v3/info.json b/keyboards/1upkeyboards/1upsuper16v3/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/1upsuper16v3/info.json
rename to keyboards/1upkeyboards/1upsuper16v3/keyboard.json
diff --git a/keyboards/1upkeyboards/1upsuper16v3/rules.mk b/keyboards/1upkeyboards/1upsuper16v3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi40/grid_v1_1/info.json
rename to keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi40/mit_v1_0/info.json
rename to keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi40/mit_v1_1/info.json
rename to keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi50/grid/info.json b/keyboards/1upkeyboards/pi50/grid/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi50/grid/info.json
rename to keyboards/1upkeyboards/pi50/grid/keyboard.json
diff --git a/keyboards/1upkeyboards/pi50/grid/rules.mk b/keyboards/1upkeyboards/pi50/grid/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi50/mit/info.json b/keyboards/1upkeyboards/pi50/mit/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi50/mit/info.json
rename to keyboards/1upkeyboards/pi50/mit/keyboard.json
diff --git a/keyboards/1upkeyboards/pi50/mit/rules.mk b/keyboards/1upkeyboards/pi50/mit/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi60/info.json
rename to keyboards/1upkeyboards/pi60/keyboard.json
diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi60_hse/info.json
rename to keyboards/1upkeyboards/pi60_hse/keyboard.json
diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi60_rgb/info.json
rename to keyboards/1upkeyboards/pi60_rgb/keyboard.json
diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/info.json b/keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/pi60_rgb_v2/info.json
rename to keyboards/1upkeyboards/pi60_rgb_v2/keyboard.json
diff --git a/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk b/keyboards/1upkeyboards/pi60_rgb_v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/sweet16v2/kb2040/info.json
rename to keyboards/1upkeyboards/sweet16v2/kb2040/keyboard.json
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
rename to keyboards/1upkeyboards/sweet16v2/pro_micro/keyboard.json
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk b/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/keyboard.json
similarity index 100%
rename from keyboards/40percentclub/i75/promicro/info.json
rename to keyboards/40percentclub/i75/promicro/keyboard.json
diff --git a/keyboards/40percentclub/i75/promicro/rules.mk b/keyboards/40percentclub/i75/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/keyboard.json
similarity index 100%
rename from keyboards/40percentclub/i75/teensy2/info.json
rename to keyboards/40percentclub/i75/teensy2/keyboard.json
diff --git a/keyboards/40percentclub/i75/teensy2/rules.mk b/keyboards/40percentclub/i75/teensy2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/keyboard.json
similarity index 100%
rename from keyboards/40percentclub/polyandry/promicro/info.json
rename to keyboards/40percentclub/polyandry/promicro/keyboard.json
diff --git a/keyboards/40percentclub/polyandry/promicro/rules.mk b/keyboards/40percentclub/polyandry/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/keyboard.json
similarity index 100%
rename from keyboards/40percentclub/polyandry/teensy2/info.json
rename to keyboards/40percentclub/polyandry/teensy2/keyboard.json
diff --git a/keyboards/40percentclub/polyandry/teensy2/rules.mk b/keyboards/40percentclub/polyandry/teensy2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/keyboard.json
similarity index 100%
rename from keyboards/8pack/rev11/info.json
rename to keyboards/8pack/rev11/keyboard.json
diff --git a/keyboards/8pack/rev11/rules.mk b/keyboards/8pack/rev11/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/keyboard.json
similarity index 100%
rename from keyboards/8pack/rev12/info.json
rename to keyboards/8pack/rev12/keyboard.json
diff --git a/keyboards/8pack/rev12/rules.mk b/keyboards/8pack/rev12/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/keyboard.json
similarity index 100%
rename from keyboards/a_dux/info.json
rename to keyboards/a_dux/keyboard.json
diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/a_dux/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/abatskeyboardclub/nayeon/info.json b/keyboards/abatskeyboardclub/nayeon/keyboard.json
similarity index 100%
rename from keyboards/abatskeyboardclub/nayeon/info.json
rename to keyboards/abatskeyboardclub/nayeon/keyboard.json
diff --git a/keyboards/abatskeyboardclub/nayeon/rules.mk b/keyboards/abatskeyboardclub/nayeon/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/abatskeyboardclub/nayeon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/abko/ak84bt/info.json b/keyboards/abko/ak84bt/keyboard.json
similarity index 100%
rename from keyboards/abko/ak84bt/info.json
rename to keyboards/abko/ak84bt/keyboard.json
diff --git a/keyboards/abko/ak84bt/rules.mk b/keyboards/abko/ak84bt/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/abko/ak84bt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/keyboard.json
similarity index 100%
rename from keyboards/acheron/themis/87h/info.json
rename to keyboards/acheron/themis/87h/keyboard.json
diff --git a/keyboards/acheron/themis/87h/rules.mk b/keyboards/acheron/themis/87h/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/keyboard.json
similarity index 100%
rename from keyboards/acheron/themis/87htsc/info.json
rename to keyboards/acheron/themis/87htsc/keyboard.json
diff --git a/keyboards/acheron/themis/87htsc/rules.mk b/keyboards/acheron/themis/87htsc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/keyboard.json
similarity index 100%
rename from keyboards/acheron/themis/88htsc/info.json
rename to keyboards/acheron/themis/88htsc/keyboard.json
diff --git a/keyboards/acheron/themis/88htsc/rules.mk b/keyboards/acheron/themis/88htsc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/adm42/rev4/info.json b/keyboards/adm42/rev4/keyboard.json
similarity index 100%
rename from keyboards/adm42/rev4/info.json
rename to keyboards/adm42/rev4/keyboard.json
diff --git a/keyboards/adm42/rev4/rules.mk b/keyboards/adm42/rev4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/adm42/rev4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ah/haven60/info.json b/keyboards/ah/haven60/keyboard.json
similarity index 100%
rename from keyboards/ah/haven60/info.json
rename to keyboards/ah/haven60/keyboard.json
diff --git a/keyboards/ah/haven60/rules.mk b/keyboards/ah/haven60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ah/haven60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ah/haven65/info.json b/keyboards/ah/haven65/keyboard.json
similarity index 100%
rename from keyboards/ah/haven65/info.json
rename to keyboards/ah/haven65/keyboard.json
diff --git a/keyboards/ah/haven65/rules.mk b/keyboards/ah/haven65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ah/haven65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/keyboard.json
similarity index 100%
rename from keyboards/ah/haven80/hotswap/info.json
rename to keyboards/ah/haven80/hotswap/keyboard.json
diff --git a/keyboards/ah/haven80/hotswap/rules.mk b/keyboards/ah/haven80/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ah/haven80/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/keyboard.json
similarity index 100%
rename from keyboards/ah/haven80/solder/info.json
rename to keyboards/ah/haven80/solder/keyboard.json
diff --git a/keyboards/ah/haven80/solder/rules.mk b/keyboards/ah/haven80/solder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ah/haven80/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ai/info.json b/keyboards/ai/keyboard.json
similarity index 100%
rename from keyboards/ai/info.json
rename to keyboards/ai/keyboard.json
diff --git a/keyboards/ai/rules.mk b/keyboards/ai/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ai/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ai03/duet/info.json b/keyboards/ai03/duet/keyboard.json
similarity index 100%
rename from keyboards/ai03/duet/info.json
rename to keyboards/ai03/duet/keyboard.json
diff --git a/keyboards/ai03/duet/rules.mk b/keyboards/ai03/duet/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ai03/duet/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/keyboard.json
similarity index 100%
rename from keyboards/aidansmithdotdev/fine40/info.json
rename to keyboards/aidansmithdotdev/fine40/keyboard.json
diff --git a/keyboards/aidansmithdotdev/fine40/rules.mk b/keyboards/aidansmithdotdev/fine40/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/keyboard.json
similarity index 100%
rename from keyboards/akb/ogr/info.json
rename to keyboards/akb/ogr/keyboard.json
diff --git a/keyboards/akb/ogr/rules.mk b/keyboards/akb/ogr/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akb/ogr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/akb/ogrn/info.json b/keyboards/akb/ogrn/keyboard.json
similarity index 100%
rename from keyboards/akb/ogrn/info.json
rename to keyboards/akb/ogrn/keyboard.json
diff --git a/keyboards/akb/ogrn/rules.mk b/keyboards/akb/ogrn/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akb/ogrn/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/keyboard.json
similarity index 100%
rename from keyboards/akb/vero/info.json
rename to keyboards/akb/vero/keyboard.json
diff --git a/keyboards/akb/vero/rules.mk b/keyboards/akb/vero/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akb/vero/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/akko/5087/info.json b/keyboards/akko/5087/keyboard.json
similarity index 100%
rename from keyboards/akko/5087/info.json
rename to keyboards/akko/5087/keyboard.json
diff --git a/keyboards/akko/5087/rules.mk b/keyboards/akko/5087/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akko/5087/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/keyboard.json
similarity index 100%
rename from keyboards/akko/5108/info.json
rename to keyboards/akko/5108/keyboard.json
diff --git a/keyboards/akko/5108/rules.mk b/keyboards/akko/5108/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akko/5108/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/keyboard.json
similarity index 100%
rename from keyboards/akko/acr87/info.json
rename to keyboards/akko/acr87/keyboard.json
diff --git a/keyboards/akko/acr87/rules.mk b/keyboards/akko/acr87/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akko/acr87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/keyboard.json
similarity index 100%
rename from keyboards/akko/top40/info.json
rename to keyboards/akko/top40/keyboard.json
diff --git a/keyboards/akko/top40/rules.mk b/keyboards/akko/top40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/akko/top40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/keyboard.json
similarity index 100%
rename from keyboards/alhenkb/macropad5x4/info.json
rename to keyboards/alhenkb/macropad5x4/keyboard.json
diff --git a/keyboards/alhenkb/macropad5x4/rules.mk b/keyboards/alhenkb/macropad5x4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/alhenkb/macropad5x4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/alpaca/wfeclipse/info.json b/keyboards/alpaca/wfeclipse/keyboard.json
similarity index 100%
rename from keyboards/alpaca/wfeclipse/info.json
rename to keyboards/alpaca/wfeclipse/keyboard.json
diff --git a/keyboards/alpaca/wfeclipse/rules.mk b/keyboards/alpaca/wfeclipse/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/alpaca/wfeclipse/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/keyboard.json
similarity index 100%
rename from keyboards/an_achronism/tetromino/info.json
rename to keyboards/an_achronism/tetromino/keyboard.json
diff --git a/keyboards/an_achronism/tetromino/rules.mk b/keyboards/an_achronism/tetromino/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/anavi/arrows/info.json b/keyboards/anavi/arrows/keyboard.json
similarity index 100%
rename from keyboards/anavi/arrows/info.json
rename to keyboards/anavi/arrows/keyboard.json
diff --git a/keyboards/anavi/arrows/rules.mk b/keyboards/anavi/arrows/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/anavi/arrows/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/anavi/macropad10/info.json b/keyboards/anavi/macropad10/keyboard.json
similarity index 100%
rename from keyboards/anavi/macropad10/info.json
rename to keyboards/anavi/macropad10/keyboard.json
diff --git a/keyboards/anavi/macropad10/rules.mk b/keyboards/anavi/macropad10/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/anavi/macropad12/info.json b/keyboards/anavi/macropad12/keyboard.json
similarity index 100%
rename from keyboards/anavi/macropad12/info.json
rename to keyboards/anavi/macropad12/keyboard.json
diff --git a/keyboards/anavi/macropad12/rules.mk b/keyboards/anavi/macropad12/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/anavi/macropad12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/andean_condor/info.json b/keyboards/andean_condor/keyboard.json
similarity index 100%
rename from keyboards/andean_condor/info.json
rename to keyboards/andean_condor/keyboard.json
diff --git a/keyboards/andean_condor/rules.mk b/keyboards/andean_condor/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/andean_condor/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/archetype/minervalx/info.json b/keyboards/archetype/minervalx/keyboard.json
similarity index 100%
rename from keyboards/archetype/minervalx/info.json
rename to keyboards/archetype/minervalx/keyboard.json
diff --git a/keyboards/archetype/minervalx/rules.mk b/keyboards/archetype/minervalx/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/archetype/minervalx/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/keyboard.json
similarity index 100%
rename from keyboards/argo_works/ishi/80/mk0_avr/info.json
rename to keyboards/argo_works/ishi/80/mk0_avr/keyboard.json
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/artemis/paragon/hotswap/info.json b/keyboards/artemis/paragon/hotswap/keyboard.json
similarity index 100%
rename from keyboards/artemis/paragon/hotswap/info.json
rename to keyboards/artemis/paragon/hotswap/keyboard.json
diff --git a/keyboards/artemis/paragon/hotswap/rules.mk b/keyboards/artemis/paragon/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/artemis/paragon/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/artemis/paragon/soldered/info.json b/keyboards/artemis/paragon/soldered/keyboard.json
similarity index 100%
rename from keyboards/artemis/paragon/soldered/info.json
rename to keyboards/artemis/paragon/soldered/keyboard.json
diff --git a/keyboards/artemis/paragon/soldered/rules.mk b/keyboards/artemis/paragon/soldered/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/artemis/paragon/soldered/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ask55/info.json b/keyboards/ask55/keyboard.json
similarity index 100%
rename from keyboards/ask55/info.json
rename to keyboards/ask55/keyboard.json
diff --git a/keyboards/ask55/rules.mk b/keyboards/ask55/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/ask55/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/atreus/astar/info.json b/keyboards/atreus/astar/keyboard.json
similarity index 100%
rename from keyboards/atreus/astar/info.json
rename to keyboards/atreus/astar/keyboard.json
diff --git a/keyboards/atreus/astar/rules.mk b/keyboards/atreus/astar/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/atreus/astar_mirrored/info.json b/keyboards/atreus/astar_mirrored/keyboard.json
similarity index 100%
rename from keyboards/atreus/astar_mirrored/info.json
rename to keyboards/atreus/astar_mirrored/keyboard.json
diff --git a/keyboards/atreus/astar_mirrored/rules.mk b/keyboards/atreus/astar_mirrored/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/atreus/promicro/info.json b/keyboards/atreus/promicro/keyboard.json
similarity index 100%
rename from keyboards/atreus/promicro/info.json
rename to keyboards/atreus/promicro/keyboard.json
diff --git a/keyboards/atreus/promicro/rules.mk b/keyboards/atreus/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/atreus/teensy2/info.json b/keyboards/atreus/teensy2/keyboard.json
similarity index 100%
rename from keyboards/atreus/teensy2/info.json
rename to keyboards/atreus/teensy2/keyboard.json
diff --git a/keyboards/atreus/teensy2/rules.mk b/keyboards/atreus/teensy2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/keyboard.json
similarity index 100%
rename from keyboards/atreyu/rev1/info.json
rename to keyboards/atreyu/rev1/keyboard.json
diff --git a/keyboards/atreyu/rev1/rules.mk b/keyboards/atreyu/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/keyboard.json
similarity index 100%
rename from keyboards/atreyu/rev2/info.json
rename to keyboards/atreyu/rev2/keyboard.json
diff --git a/keyboards/atreyu/rev2/rules.mk b/keyboards/atreyu/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/atreyu/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/automata02/alisaie/info.json b/keyboards/automata02/alisaie/keyboard.json
similarity index 100%
rename from keyboards/automata02/alisaie/info.json
rename to keyboards/automata02/alisaie/keyboard.json
diff --git a/keyboards/automata02/alisaie/rules.mk b/keyboards/automata02/alisaie/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/automata02/alisaie/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/bahm/aster_ergo/info.json b/keyboards/bahm/aster_ergo/keyboard.json
similarity index 100%
rename from keyboards/bahm/aster_ergo/info.json
rename to keyboards/bahm/aster_ergo/keyboard.json
diff --git a/keyboards/bahm/aster_ergo/rules.mk b/keyboards/bahm/aster_ergo/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/bahm/aster_ergo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/balloondogcaps/tr90/info.json b/keyboards/balloondogcaps/tr90/keyboard.json
similarity index 100%
rename from keyboards/balloondogcaps/tr90/info.json
rename to keyboards/balloondogcaps/tr90/keyboard.json
diff --git a/keyboards/balloondogcaps/tr90/rules.mk b/keyboards/balloondogcaps/tr90/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/balloondogcaps/tr90pm/info.json b/keyboards/balloondogcaps/tr90pm/keyboard.json
similarity index 100%
rename from keyboards/balloondogcaps/tr90pm/info.json
rename to keyboards/balloondogcaps/tr90pm/keyboard.json
diff --git a/keyboards/balloondogcaps/tr90pm/rules.mk b/keyboards/balloondogcaps/tr90pm/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/balloondogcaps/tr90pm/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/bear_face/v1/info.json b/keyboards/bear_face/v1/keyboard.json
similarity index 100%
rename from keyboards/bear_face/v1/info.json
rename to keyboards/bear_face/v1/keyboard.json
diff --git a/keyboards/bear_face/v1/rules.mk b/keyboards/bear_face/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/bear_face/v2/info.json b/keyboards/bear_face/v2/keyboard.json
similarity index 100%
rename from keyboards/bear_face/v2/info.json
rename to keyboards/bear_face/v2/keyboard.json
diff --git a/keyboards/bear_face/v2/rules.mk b/keyboards/bear_face/v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/bestway/info.json b/keyboards/bestway/keyboard.json
similarity index 100%
rename from keyboards/bestway/info.json
rename to keyboards/bestway/keyboard.json
diff --git a/keyboards/bestway/rules.mk b/keyboards/bestway/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/bestway/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/keyboard.json
similarity index 100%
rename from keyboards/binepad/bn006/info.json
rename to keyboards/binepad/bn006/keyboard.json
diff --git a/keyboards/binepad/bn006/rules.mk b/keyboards/binepad/bn006/rules.mk
deleted file mode 100755
index 7ff128fa692..00000000000
--- a/keyboards/binepad/bn006/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/binepad/bn009/r2/info.json b/keyboards/binepad/bn009/r2/keyboard.json
similarity index 100%
rename from keyboards/binepad/bn009/r2/info.json
rename to keyboards/binepad/bn009/r2/keyboard.json
diff --git a/keyboards/binepad/bn009/r2/rules.mk b/keyboards/binepad/bn009/r2/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/binepad/bn009/r2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/binepad/bnk9/info.json b/keyboards/binepad/bnk9/keyboard.json
similarity index 100%
rename from keyboards/binepad/bnk9/info.json
rename to keyboards/binepad/bnk9/keyboard.json
diff --git a/keyboards/binepad/bnk9/rules.mk b/keyboards/binepad/bnk9/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/binepad/bnk9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/binepad/bnr1/v2/info.json b/keyboards/binepad/bnr1/v2/keyboard.json
similarity index 100%
rename from keyboards/binepad/bnr1/v2/info.json
rename to keyboards/binepad/bnr1/v2/keyboard.json
diff --git a/keyboards/binepad/bnr1/v2/rules.mk b/keyboards/binepad/bnr1/v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/binepad/bnr1/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/binepad/pixie/info.json b/keyboards/binepad/pixie/keyboard.json
similarity index 100%
rename from keyboards/binepad/pixie/info.json
rename to keyboards/binepad/pixie/keyboard.json
diff --git a/keyboards/binepad/pixie/rules.mk b/keyboards/binepad/pixie/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/binepad/pixie/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/black_hellebore/info.json b/keyboards/black_hellebore/keyboard.json
similarity index 100%
rename from keyboards/black_hellebore/info.json
rename to keyboards/black_hellebore/keyboard.json
diff --git a/keyboards/black_hellebore/rules.mk b/keyboards/black_hellebore/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/blu/vimclutch/info.json b/keyboards/blu/vimclutch/keyboard.json
similarity index 100%
rename from keyboards/blu/vimclutch/info.json
rename to keyboards/blu/vimclutch/keyboard.json
diff --git a/keyboards/blu/vimclutch/rules.mk b/keyboards/blu/vimclutch/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/blu/vimclutch/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/boardsource/3x4/info.json b/keyboards/boardsource/3x4/keyboard.json
similarity index 100%
rename from keyboards/boardsource/3x4/info.json
rename to keyboards/boardsource/3x4/keyboard.json
diff --git a/keyboards/boardsource/3x4/rules.mk b/keyboards/boardsource/3x4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/3x4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/4x12/info.json b/keyboards/boardsource/4x12/keyboard.json
similarity index 100%
rename from keyboards/boardsource/4x12/info.json
rename to keyboards/boardsource/4x12/keyboard.json
diff --git a/keyboards/boardsource/4x12/rules.mk b/keyboards/boardsource/4x12/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/4x12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/5x12/info.json b/keyboards/boardsource/5x12/keyboard.json
similarity index 100%
rename from keyboards/boardsource/5x12/info.json
rename to keyboards/boardsource/5x12/keyboard.json
diff --git a/keyboards/boardsource/5x12/rules.mk b/keyboards/boardsource/5x12/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/5x12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/beiwagon/info.json b/keyboards/boardsource/beiwagon/keyboard.json
similarity index 100%
rename from keyboards/boardsource/beiwagon/info.json
rename to keyboards/boardsource/beiwagon/keyboard.json
diff --git a/keyboards/boardsource/beiwagon/rules.mk b/keyboards/boardsource/beiwagon/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/boardsource/equals/avr/info.json b/keyboards/boardsource/equals/avr/keyboard.json
similarity index 100%
rename from keyboards/boardsource/equals/avr/info.json
rename to keyboards/boardsource/equals/avr/keyboard.json
diff --git a/keyboards/boardsource/equals/avr/rules.mk b/keyboards/boardsource/equals/avr/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/equals/avr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/keyboard.json
similarity index 100%
rename from keyboards/boardsource/holiday/spooky/info.json
rename to keyboards/boardsource/holiday/spooky/keyboard.json
diff --git a/keyboards/boardsource/holiday/spooky/rules.mk b/keyboards/boardsource/holiday/spooky/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/holiday/spooky/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/lulu/avr/info.json b/keyboards/boardsource/lulu/avr/keyboard.json
similarity index 100%
rename from keyboards/boardsource/lulu/avr/info.json
rename to keyboards/boardsource/lulu/avr/keyboard.json
diff --git a/keyboards/boardsource/lulu/avr/rules.mk b/keyboards/boardsource/lulu/avr/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/lulu/avr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/microdox/v1/info.json b/keyboards/boardsource/microdox/v1/keyboard.json
similarity index 100%
rename from keyboards/boardsource/microdox/v1/info.json
rename to keyboards/boardsource/microdox/v1/keyboard.json
diff --git a/keyboards/boardsource/microdox/v1/rules.mk b/keyboards/boardsource/microdox/v1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/boardsource/microdox/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/boardsource/microdox/v2/info.json b/keyboards/boardsource/microdox/v2/keyboard.json
similarity index 100%
rename from keyboards/boardsource/microdox/v2/info.json
rename to keyboards/boardsource/microdox/v2/keyboard.json
diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/boardsource/technik_o/info.json b/keyboards/boardsource/technik_o/keyboard.json
similarity index 100%
rename from keyboards/boardsource/technik_o/info.json
rename to keyboards/boardsource/technik_o/keyboard.json
diff --git a/keyboards/boardsource/technik_o/rules.mk b/keyboards/boardsource/technik_o/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/boardsource/technik_s/info.json b/keyboards/boardsource/technik_s/keyboard.json
similarity index 100%
rename from keyboards/boardsource/technik_s/info.json
rename to keyboards/boardsource/technik_s/keyboard.json
diff --git a/keyboards/boardsource/technik_s/rules.mk b/keyboards/boardsource/technik_s/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/keyboard.json
similarity index 100%
rename from keyboards/boardsource/the_mark/info.json
rename to keyboards/boardsource/the_mark/keyboard.json
diff --git a/keyboards/boardsource/the_mark/rules.mk b/keyboards/boardsource/the_mark/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/bredworks/wyvern_hs/info.json b/keyboards/bredworks/wyvern_hs/keyboard.json
similarity index 100%
rename from keyboards/bredworks/wyvern_hs/info.json
rename to keyboards/bredworks/wyvern_hs/keyboard.json
diff --git a/keyboards/bredworks/wyvern_hs/rules.mk b/keyboards/bredworks/wyvern_hs/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/bredworks/wyvern_hs/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/bschwind/key_ripper/info.json b/keyboards/bschwind/key_ripper/keyboard.json
similarity index 100%
rename from keyboards/bschwind/key_ripper/info.json
rename to keyboards/bschwind/key_ripper/keyboard.json
diff --git a/keyboards/bschwind/key_ripper/rules.mk b/keyboards/bschwind/key_ripper/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/bschwind/key_ripper/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/buildakb/mw60/info.json b/keyboards/buildakb/mw60/keyboard.json
similarity index 100%
rename from keyboards/buildakb/mw60/info.json
rename to keyboards/buildakb/mw60/keyboard.json
diff --git a/keyboards/buildakb/mw60/rules.mk b/keyboards/buildakb/mw60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/buildakb/mw60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/keyboard.json
similarity index 100%
rename from keyboards/butterkeebs/pocketpad/info.json
rename to keyboards/butterkeebs/pocketpad/keyboard.json
diff --git a/keyboards/butterkeebs/pocketpad/rules.mk b/keyboards/butterkeebs/pocketpad/rules.mk
deleted file mode 100644
index f886ea2e8ec..00000000000
--- a/keyboards/butterkeebs/pocketpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/bastion60/info.json b/keyboards/cannonkeys/bastion60/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bastion60/info.json
rename to keyboards/cannonkeys/bastion60/keyboard.json
diff --git a/keyboards/cannonkeys/bastion60/rules.mk b/keyboards/cannonkeys/bastion60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/bastion60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/bastion65/info.json b/keyboards/cannonkeys/bastion65/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bastion65/info.json
rename to keyboards/cannonkeys/bastion65/keyboard.json
diff --git a/keyboards/cannonkeys/bastion65/rules.mk b/keyboards/cannonkeys/bastion65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/bastion65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/bastion75/info.json b/keyboards/cannonkeys/bastion75/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bastion75/info.json
rename to keyboards/cannonkeys/bastion75/keyboard.json
diff --git a/keyboards/cannonkeys/bastion75/rules.mk b/keyboards/cannonkeys/bastion75/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/bastion75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/bastiontkl/info.json b/keyboards/cannonkeys/bastiontkl/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/bastiontkl/info.json
rename to keyboards/cannonkeys/bastiontkl/keyboard.json
diff --git a/keyboards/cannonkeys/bastiontkl/rules.mk b/keyboards/cannonkeys/bastiontkl/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/bastiontkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/brutalv2_1800/info.json
rename to keyboards/cannonkeys/brutalv2_1800/keyboard.json
diff --git a/keyboards/cannonkeys/brutalv2_1800/rules.mk b/keyboards/cannonkeys/brutalv2_1800/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/brutalv2_1800/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/brutalv2_60/info.json b/keyboards/cannonkeys/brutalv2_60/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/brutalv2_60/info.json
rename to keyboards/cannonkeys/brutalv2_60/keyboard.json
diff --git a/keyboards/cannonkeys/brutalv2_60/rules.mk b/keyboards/cannonkeys/brutalv2_60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/brutalv2_60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/caerdroia/info.json
rename to keyboards/cannonkeys/caerdroia/keyboard.json
diff --git a/keyboards/cannonkeys/caerdroia/rules.mk b/keyboards/cannonkeys/caerdroia/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/caerdroia/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/db60/hotswap/info.json
rename to keyboards/cannonkeys/db60/hotswap/keyboard.json
diff --git a/keyboards/cannonkeys/db60/hotswap/rules.mk b/keyboards/cannonkeys/db60/hotswap/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/db60/j02/info.json
rename to keyboards/cannonkeys/db60/j02/keyboard.json
diff --git a/keyboards/cannonkeys/db60/j02/rules.mk b/keyboards/cannonkeys/db60/j02/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/cannonkeys/db60/rev2/info.json b/keyboards/cannonkeys/db60/rev2/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/db60/rev2/info.json
rename to keyboards/cannonkeys/db60/rev2/keyboard.json
diff --git a/keyboards/cannonkeys/db60/rev2/rules.mk b/keyboards/cannonkeys/db60/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/cannonkeys/ortho48v2/info.json b/keyboards/cannonkeys/ortho48v2/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ortho48v2/info.json
rename to keyboards/cannonkeys/ortho48v2/keyboard.json
diff --git a/keyboards/cannonkeys/ortho48v2/rules.mk b/keyboards/cannonkeys/ortho48v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/ortho48v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/ortho60v2/info.json
rename to keyboards/cannonkeys/ortho60v2/keyboard.json
diff --git a/keyboards/cannonkeys/ortho60v2/rules.mk b/keyboards/cannonkeys/ortho60v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/ortho60v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/satisfaction75/prototype/info.json
rename to keyboards/cannonkeys/satisfaction75/prototype/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/satisfaction75/rev1/info.json
rename to keyboards/cannonkeys/satisfaction75/rev1/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/info.json b/keyboards/cannonkeys/satisfaction75/rev2/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/satisfaction75/rev2/info.json
rename to keyboards/cannonkeys/satisfaction75/rev2/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/keyboard.json
similarity index 100%
rename from keyboards/cannonkeys/typeb/info.json
rename to keyboards/cannonkeys/typeb/keyboard.json
diff --git a/keyboards/cannonkeys/typeb/rules.mk b/keyboards/cannonkeys/typeb/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cannonkeys/typeb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/keyboard.json
similarity index 100%
rename from keyboards/capsunlocked/cu75/info.json
rename to keyboards/capsunlocked/cu75/keyboard.json
diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/info.json b/keyboards/capsunlocked/cu80/v2/ansi/keyboard.json
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2/ansi/info.json
rename to keyboards/capsunlocked/cu80/v2/ansi/keyboard.json
diff --git a/keyboards/capsunlocked/cu80/v2/ansi/rules.mk b/keyboards/capsunlocked/cu80/v2/ansi/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/capsunlocked/cu80/v2/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/capsunlocked/cu80/v2/iso/info.json b/keyboards/capsunlocked/cu80/v2/iso/keyboard.json
similarity index 100%
rename from keyboards/capsunlocked/cu80/v2/iso/info.json
rename to keyboards/capsunlocked/cu80/v2/iso/keyboard.json
diff --git a/keyboards/capsunlocked/cu80/v2/iso/rules.mk b/keyboards/capsunlocked/cu80/v2/iso/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/capsunlocked/cu80/v2/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/keyboard.json
similarity index 100%
rename from keyboards/chickenman/ciel65/info.json
rename to keyboards/chickenman/ciel65/keyboard.json
diff --git a/keyboards/chickenman/ciel65/rules.mk b/keyboards/chickenman/ciel65/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/chickenman/ciel65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/keyboard.json
similarity index 100%
rename from keyboards/chlx/ppr_merro60/info.json
rename to keyboards/chlx/ppr_merro60/keyboard.json
diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/chlx/ppr_merro60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/chord/zero/info.json b/keyboards/chord/zero/keyboard.json
similarity index 100%
rename from keyboards/chord/zero/info.json
rename to keyboards/chord/zero/keyboard.json
diff --git a/keyboards/chord/zero/rules.mk b/keyboards/chord/zero/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/chord/zero/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/chosfox/cf81/info.json b/keyboards/chosfox/cf81/keyboard.json
similarity index 100%
rename from keyboards/chosfox/cf81/info.json
rename to keyboards/chosfox/cf81/keyboard.json
diff --git a/keyboards/chosfox/cf81/rules.mk b/keyboards/chosfox/cf81/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/chosfox/cf81/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/chouchou/info.json b/keyboards/chouchou/keyboard.json
similarity index 100%
rename from keyboards/chouchou/info.json
rename to keyboards/chouchou/keyboard.json
diff --git a/keyboards/chouchou/rules.mk b/keyboards/chouchou/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/keyboard.json
similarity index 100%
rename from keyboards/chromatonemini/info.json
rename to keyboards/chromatonemini/keyboard.json
diff --git a/keyboards/chromatonemini/rules.mk b/keyboards/chromatonemini/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/churrosoft/deck8/noleds/info.json b/keyboards/churrosoft/deck8/noleds/keyboard.json
similarity index 100%
rename from keyboards/churrosoft/deck8/noleds/info.json
rename to keyboards/churrosoft/deck8/noleds/keyboard.json
diff --git a/keyboards/churrosoft/deck8/noleds/rules.mk b/keyboards/churrosoft/deck8/noleds/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/churrosoft/deck8/noleds/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/churrosoft/deck8/rgb/info.json b/keyboards/churrosoft/deck8/rgb/keyboard.json
similarity index 100%
rename from keyboards/churrosoft/deck8/rgb/info.json
rename to keyboards/churrosoft/deck8/rgb/keyboard.json
diff --git a/keyboards/churrosoft/deck8/rgb/rules.mk b/keyboards/churrosoft/deck8/rgb/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/churrosoft/deck8/rgb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cipulot/60xt/info.json b/keyboards/cipulot/60xt/keyboard.json
similarity index 100%
rename from keyboards/cipulot/60xt/info.json
rename to keyboards/cipulot/60xt/keyboard.json
diff --git a/keyboards/cipulot/60xt/rules.mk b/keyboards/cipulot/60xt/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/keyboard.json
similarity index 100%
rename from keyboards/citrus/erdnuss65/info.json
rename to keyboards/citrus/erdnuss65/keyboard.json
diff --git a/keyboards/citrus/erdnuss65/rules.mk b/keyboards/citrus/erdnuss65/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/clickety_split/leeloo/rev1/info.json b/keyboards/clickety_split/leeloo/rev1/keyboard.json
similarity index 100%
rename from keyboards/clickety_split/leeloo/rev1/info.json
rename to keyboards/clickety_split/leeloo/rev1/keyboard.json
diff --git a/keyboards/clickety_split/leeloo/rev1/rules.mk b/keyboards/clickety_split/leeloo/rev1/rules.mk
deleted file mode 100644
index 5713c150766..00000000000
--- a/keyboards/clickety_split/leeloo/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Intentionally left blank.
\ No newline at end of file
diff --git a/keyboards/clickety_split/leeloo/rev2/info.json b/keyboards/clickety_split/leeloo/rev2/keyboard.json
similarity index 100%
rename from keyboards/clickety_split/leeloo/rev2/info.json
rename to keyboards/clickety_split/leeloo/rev2/keyboard.json
diff --git a/keyboards/clickety_split/leeloo/rev2/rules.mk b/keyboards/clickety_split/leeloo/rev2/rules.mk
deleted file mode 100644
index 80a6663b9c6..00000000000
--- a/keyboards/clickety_split/leeloo/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Intentionally left blank.
diff --git a/keyboards/clickety_split/leeloo/rev3/info.json b/keyboards/clickety_split/leeloo/rev3/keyboard.json
similarity index 100%
rename from keyboards/clickety_split/leeloo/rev3/info.json
rename to keyboards/clickety_split/leeloo/rev3/keyboard.json
diff --git a/keyboards/clickety_split/leeloo/rev3/rules.mk b/keyboards/clickety_split/leeloo/rev3/rules.mk
deleted file mode 100644
index 80a6663b9c6..00000000000
--- a/keyboards/clickety_split/leeloo/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Intentionally left blank.
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/keyboard.json
similarity index 100%
rename from keyboards/clueboard/17/info.json
rename to keyboards/clueboard/17/keyboard.json
diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/keyboard.json
similarity index 100%
rename from keyboards/clueboard/2x1800/2018/info.json
rename to keyboards/clueboard/2x1800/2018/keyboard.json
diff --git a/keyboards/clueboard/2x1800/2018/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/clueboard/2x1800/2018/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/keyboard.json
similarity index 100%
rename from keyboards/clueboard/2x1800/2019/info.json
rename to keyboards/clueboard/2x1800/2019/keyboard.json
diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/clueboard/2x1800/2019/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/keyboard.json
similarity index 100%
rename from keyboards/clueboard/66/rev1/info.json
rename to keyboards/clueboard/66/rev1/keyboard.json
diff --git a/keyboards/clueboard/66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/clueboard/66/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/keyboard.json
similarity index 100%
rename from keyboards/clueboard/66/rev2/info.json
rename to keyboards/clueboard/66/rev2/keyboard.json
diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/keyboard.json
similarity index 100%
rename from keyboards/clueboard/66/rev3/info.json
rename to keyboards/clueboard/66/rev3/keyboard.json
diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/keyboard.json
similarity index 100%
rename from keyboards/clueboard/66/rev4/info.json
rename to keyboards/clueboard/66/rev4/keyboard.json
diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/clueboard/66/rev4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/keyboard.json
similarity index 100%
rename from keyboards/clueboard/66_hotswap/gen1/info.json
rename to keyboards/clueboard/66_hotswap/gen1/keyboard.json
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/keyboard.json
similarity index 100%
rename from keyboards/clueboard/california/info.json
rename to keyboards/clueboard/california/keyboard.json
diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/clueboard/california/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/keyboard.json
similarity index 100%
rename from keyboards/clueboard/card/info.json
rename to keyboards/clueboard/card/keyboard.json
diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/coban/pad9a/info.json b/keyboards/coban/pad9a/keyboard.json
similarity index 100%
rename from keyboards/coban/pad9a/info.json
rename to keyboards/coban/pad9a/keyboard.json
diff --git a/keyboards/coban/pad9a/rules.mk b/keyboards/coban/pad9a/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/compensator/info.json b/keyboards/compensator/keyboard.json
similarity index 100%
rename from keyboards/compensator/info.json
rename to keyboards/compensator/keyboard.json
diff --git a/keyboards/compensator/rules.mk b/keyboards/compensator/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/compensator/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/contra/info.json b/keyboards/contra/keyboard.json
similarity index 100%
rename from keyboards/contra/info.json
rename to keyboards/contra/keyboard.json
diff --git a/keyboards/contra/rules.mk b/keyboards/contra/rules.mk
deleted file mode 100755
index 6e7633bfe01..00000000000
--- a/keyboards/contra/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/converter/adb_usb/rev1/info.json b/keyboards/converter/adb_usb/rev1/keyboard.json
similarity index 100%
rename from keyboards/converter/adb_usb/rev1/info.json
rename to keyboards/converter/adb_usb/rev1/keyboard.json
diff --git a/keyboards/converter/adb_usb/rev1/rules.mk b/keyboards/converter/adb_usb/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/converter/adb_usb/rev2/info.json b/keyboards/converter/adb_usb/rev2/keyboard.json
similarity index 100%
rename from keyboards/converter/adb_usb/rev2/info.json
rename to keyboards/converter/adb_usb/rev2/keyboard.json
diff --git a/keyboards/converter/adb_usb/rev2/rules.mk b/keyboards/converter/adb_usb/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/keyboard.json
similarity index 100%
rename from keyboards/converter/palm_usb/stowaway/info.json
rename to keyboards/converter/palm_usb/stowaway/keyboard.json
diff --git a/keyboards/converter/palm_usb/stowaway/rules.mk b/keyboards/converter/palm_usb/stowaway/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/keyboard.json
similarity index 100%
rename from keyboards/converter/sun_usb/type3/info.json
rename to keyboards/converter/sun_usb/type3/keyboard.json
diff --git a/keyboards/converter/sun_usb/type3/rules.mk b/keyboards/converter/sun_usb/type3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/keyboard.json
similarity index 100%
rename from keyboards/converter/sun_usb/type5/info.json
rename to keyboards/converter/sun_usb/type5/keyboard.json
diff --git a/keyboards/converter/sun_usb/type5/rules.mk b/keyboards/converter/sun_usb/type5/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/converter/usb_usb/hasu/info.json b/keyboards/converter/usb_usb/hasu/keyboard.json
similarity index 100%
rename from keyboards/converter/usb_usb/hasu/info.json
rename to keyboards/converter/usb_usb/hasu/keyboard.json
diff --git a/keyboards/converter/usb_usb/hasu/rules.mk b/keyboards/converter/usb_usb/hasu/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/converter/usb_usb/hasu/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/converter/usb_usb/leonardo/info.json b/keyboards/converter/usb_usb/leonardo/keyboard.json
similarity index 100%
rename from keyboards/converter/usb_usb/leonardo/info.json
rename to keyboards/converter/usb_usb/leonardo/keyboard.json
diff --git a/keyboards/converter/usb_usb/leonardo/rules.mk b/keyboards/converter/usb_usb/leonardo/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/converter/usb_usb/leonardo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/keyboard.json
similarity index 100%
rename from keyboards/cradio/info.json
rename to keyboards/cradio/keyboard.json
diff --git a/keyboards/cradio/rules.mk b/keyboards/cradio/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cradio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/keyboard.json
similarity index 100%
rename from keyboards/crkbd/r2g/info.json
rename to keyboards/crkbd/r2g/keyboard.json
diff --git a/keyboards/crkbd/r2g/rules.mk b/keyboards/crkbd/r2g/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/keyboard.json
similarity index 100%
rename from keyboards/crkbd/rev1/info.json
rename to keyboards/crkbd/rev1/keyboard.json
diff --git a/keyboards/crkbd/rev1/rules.mk b/keyboards/crkbd/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/crowboard/info.json b/keyboards/crowboard/keyboard.json
similarity index 100%
rename from keyboards/crowboard/info.json
rename to keyboards/crowboard/keyboard.json
diff --git a/keyboards/crowboard/rules.mk b/keyboards/crowboard/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/crowboard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/keyboard.json
similarity index 100%
rename from keyboards/custommk/evo70/info.json
rename to keyboards/custommk/evo70/keyboard.json
diff --git a/keyboards/custommk/evo70/rules.mk b/keyboards/custommk/evo70/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/custommk/evo70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/keyboard.json
similarity index 100%
rename from keyboards/custommk/genesis/rev1/info.json
rename to keyboards/custommk/genesis/rev1/keyboard.json
diff --git a/keyboards/custommk/genesis/rev1/rules.mk b/keyboards/custommk/genesis/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/cutie_club/fidelity/info.json b/keyboards/cutie_club/fidelity/keyboard.json
similarity index 100%
rename from keyboards/cutie_club/fidelity/info.json
rename to keyboards/cutie_club/fidelity/keyboard.json
diff --git a/keyboards/cutie_club/fidelity/rules.mk b/keyboards/cutie_club/fidelity/rules.mk
deleted file mode 100644
index 79986c3cede..00000000000
--- a/keyboards/cutie_club/fidelity/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Intentionally left blank, please see info.json
diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/keyboard.json
similarity index 100%
rename from keyboards/cxt_studio/info.json
rename to keyboards/cxt_studio/keyboard.json
diff --git a/keyboards/cxt_studio/rules.mk b/keyboards/cxt_studio/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/cxt_studio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dailycraft/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/keyboard.json
similarity index 100%
rename from keyboards/dailycraft/bat43/rev1/info.json
rename to keyboards/dailycraft/bat43/rev1/keyboard.json
diff --git a/keyboards/dailycraft/bat43/rev1/rules.mk b/keyboards/dailycraft/bat43/rev1/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/dailycraft/bat43/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/keyboard.json
similarity index 100%
rename from keyboards/dailycraft/bat43/rev2/info.json
rename to keyboards/dailycraft/bat43/rev2/keyboard.json
diff --git a/keyboards/dailycraft/bat43/rev2/rules.mk b/keyboards/dailycraft/bat43/rev2/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/dailycraft/bat43/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json
similarity index 100%
rename from keyboards/dailycraft/sandbox/rev1/info.json
rename to keyboards/dailycraft/sandbox/rev1/keyboard.json
diff --git a/keyboards/dailycraft/sandbox/rev1/rules.mk b/keyboards/dailycraft/sandbox/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/keyboard.json
similarity index 100%
rename from keyboards/dailycraft/wings42/rev1/info.json
rename to keyboards/dailycraft/wings42/rev1/keyboard.json
diff --git a/keyboards/dailycraft/wings42/rev1/rules.mk b/keyboards/dailycraft/wings42/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
similarity index 100%
rename from keyboards/dailycraft/wings42/rev1_extkeys/info.json
rename to keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk b/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/keyboard.json
similarity index 100%
rename from keyboards/dailycraft/wings42/rev2/info.json
rename to keyboards/dailycraft/wings42/rev2/keyboard.json
diff --git a/keyboards/dailycraft/wings42/rev2/rules.mk b/keyboards/dailycraft/wings42/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/keyboard.json
similarity index 100%
rename from keyboards/dark/magnum_ergo_1/info.json
rename to keyboards/dark/magnum_ergo_1/keyboard.json
diff --git a/keyboards/dark/magnum_ergo_1/rules.mk b/keyboards/dark/magnum_ergo_1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/darkproject/kd83a_bfg_edition/info.json b/keyboards/darkproject/kd83a_bfg_edition/keyboard.json
similarity index 100%
rename from keyboards/darkproject/kd83a_bfg_edition/info.json
rename to keyboards/darkproject/kd83a_bfg_edition/keyboard.json
diff --git a/keyboards/darkproject/kd83a_bfg_edition/rules.mk b/keyboards/darkproject/kd83a_bfg_edition/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/darkproject/kd83a_bfg_edition/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/darkproject/kd87a_bfg_edition/info.json b/keyboards/darkproject/kd87a_bfg_edition/keyboard.json
similarity index 100%
rename from keyboards/darkproject/kd87a_bfg_edition/info.json
rename to keyboards/darkproject/kd87a_bfg_edition/keyboard.json
diff --git a/keyboards/darkproject/kd87a_bfg_edition/rules.mk b/keyboards/darkproject/kd87a_bfg_edition/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/darkproject/kd87a_bfg_edition/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/darmoshark/k3/info.json b/keyboards/darmoshark/k3/keyboard.json
similarity index 100%
rename from keyboards/darmoshark/k3/info.json
rename to keyboards/darmoshark/k3/keyboard.json
diff --git a/keyboards/darmoshark/k3/rules.mk b/keyboards/darmoshark/k3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/darmoshark/k3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/deemen17/de60fs/info.json b/keyboards/deemen17/de60fs/keyboard.json
similarity index 100%
rename from keyboards/deemen17/de60fs/info.json
rename to keyboards/deemen17/de60fs/keyboard.json
diff --git a/keyboards/deemen17/de60fs/rules.mk b/keyboards/deemen17/de60fs/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/deemen17/de60fs/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dekunukem/duckypad/info.json b/keyboards/dekunukem/duckypad/keyboard.json
similarity index 100%
rename from keyboards/dekunukem/duckypad/info.json
rename to keyboards/dekunukem/duckypad/keyboard.json
diff --git a/keyboards/dekunukem/duckypad/rules.mk b/keyboards/dekunukem/duckypad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dekunukem/duckypad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/densus/alveus/mx/info.json b/keyboards/densus/alveus/mx/keyboard.json
similarity index 100%
rename from keyboards/densus/alveus/mx/info.json
rename to keyboards/densus/alveus/mx/keyboard.json
diff --git a/keyboards/densus/alveus/mx/rules.mk b/keyboards/densus/alveus/mx/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/densus/alveus/mx/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/dnworks/9973/info.json b/keyboards/dnworks/9973/keyboard.json
similarity index 100%
rename from keyboards/dnworks/9973/info.json
rename to keyboards/dnworks/9973/keyboard.json
diff --git a/keyboards/dnworks/9973/rules.mk b/keyboards/dnworks/9973/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dnworks/9973/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dnworks/frltkl/info.json b/keyboards/dnworks/frltkl/keyboard.json
similarity index 100%
rename from keyboards/dnworks/frltkl/info.json
rename to keyboards/dnworks/frltkl/keyboard.json
diff --git a/keyboards/dnworks/frltkl/rules.mk b/keyboards/dnworks/frltkl/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/dnworks/frltkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/dnworks/numpad/info.json b/keyboards/dnworks/numpad/keyboard.json
similarity index 100%
rename from keyboards/dnworks/numpad/info.json
rename to keyboards/dnworks/numpad/keyboard.json
diff --git a/keyboards/dnworks/numpad/rules.mk b/keyboards/dnworks/numpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dnworks/numpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dnworks/sbl/info.json b/keyboards/dnworks/sbl/keyboard.json
similarity index 100%
rename from keyboards/dnworks/sbl/info.json
rename to keyboards/dnworks/sbl/keyboard.json
diff --git a/keyboards/dnworks/sbl/rules.mk b/keyboards/dnworks/sbl/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/dnworks/sbl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/doio/kb04/info.json b/keyboards/doio/kb04/keyboard.json
similarity index 100%
rename from keyboards/doio/kb04/info.json
rename to keyboards/doio/kb04/keyboard.json
diff --git a/keyboards/doio/kb04/rules.mk b/keyboards/doio/kb04/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/doio/kb04/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/doio/kb12/info.json b/keyboards/doio/kb12/keyboard.json
similarity index 100%
rename from keyboards/doio/kb12/info.json
rename to keyboards/doio/kb12/keyboard.json
diff --git a/keyboards/doio/kb12/rules.mk b/keyboards/doio/kb12/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/doio/kb12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/doio/kb19/info.json b/keyboards/doio/kb19/keyboard.json
similarity index 100%
rename from keyboards/doio/kb19/info.json
rename to keyboards/doio/kb19/keyboard.json
diff --git a/keyboards/doio/kb19/rules.mk b/keyboards/doio/kb19/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/doio/kb19/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/doio/kb3x/info.json b/keyboards/doio/kb3x/keyboard.json
similarity index 100%
rename from keyboards/doio/kb3x/info.json
rename to keyboards/doio/kb3x/keyboard.json
diff --git a/keyboards/doio/kb3x/rules.mk b/keyboards/doio/kb3x/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/doio/kb3x/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/keyboard.json
similarity index 100%
rename from keyboards/dotmod/dymium65/info.json
rename to keyboards/dotmod/dymium65/keyboard.json
diff --git a/keyboards/dotmod/dymium65/rules.mk b/keyboards/dotmod/dymium65/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/dotmod/dymium65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/dp3000/rev1/info.json b/keyboards/dp3000/rev1/keyboard.json
similarity index 100%
rename from keyboards/dp3000/rev1/info.json
rename to keyboards/dp3000/rev1/keyboard.json
diff --git a/keyboards/dp3000/rev1/rules.mk b/keyboards/dp3000/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dp3000/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dp3000/rev2/info.json b/keyboards/dp3000/rev2/keyboard.json
similarity index 100%
rename from keyboards/dp3000/rev2/info.json
rename to keyboards/dp3000/rev2/keyboard.json
diff --git a/keyboards/dp3000/rev2/rules.mk b/keyboards/dp3000/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dp3000/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/drewkeys/mercury65/info.json b/keyboards/drewkeys/mercury65/keyboard.json
similarity index 100%
rename from keyboards/drewkeys/mercury65/info.json
rename to keyboards/drewkeys/mercury65/keyboard.json
diff --git a/keyboards/drewkeys/mercury65/rules.mk b/keyboards/drewkeys/mercury65/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/drewkeys/mercury65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/drhigsby/ogurec/left_pm/info.json b/keyboards/drhigsby/ogurec/left_pm/keyboard.json
similarity index 100%
rename from keyboards/drhigsby/ogurec/left_pm/info.json
rename to keyboards/drhigsby/ogurec/left_pm/keyboard.json
diff --git a/keyboards/drhigsby/ogurec/left_pm/rules.mk b/keyboards/drhigsby/ogurec/left_pm/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/drhigsby/ogurec/right_pm/info.json b/keyboards/drhigsby/ogurec/right_pm/keyboard.json
similarity index 100%
rename from keyboards/drhigsby/ogurec/right_pm/info.json
rename to keyboards/drhigsby/ogurec/right_pm/keyboard.json
diff --git a/keyboards/drhigsby/ogurec/right_pm/rules.mk b/keyboards/drhigsby/ogurec/right_pm/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/drop/thekey/v1/info.json b/keyboards/drop/thekey/v1/keyboard.json
similarity index 100%
rename from keyboards/drop/thekey/v1/info.json
rename to keyboards/drop/thekey/v1/keyboard.json
diff --git a/keyboards/drop/thekey/v1/rules.mk b/keyboards/drop/thekey/v1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/drop/thekey/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/drop/thekey/v2/info.json b/keyboards/drop/thekey/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/thekey/v2/info.json
rename to keyboards/drop/thekey/v2/keyboard.json
diff --git a/keyboards/drop/thekey/v2/rules.mk b/keyboards/drop/thekey/v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/drop/thekey/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/durgod/dgk6x/galaxy/info.json b/keyboards/durgod/dgk6x/galaxy/keyboard.json
similarity index 100%
rename from keyboards/durgod/dgk6x/galaxy/info.json
rename to keyboards/durgod/dgk6x/galaxy/keyboard.json
diff --git a/keyboards/durgod/dgk6x/galaxy/rules.mk b/keyboards/durgod/dgk6x/galaxy/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/durgod/dgk6x/hades_ansi/info.json b/keyboards/durgod/dgk6x/hades_ansi/keyboard.json
similarity index 100%
rename from keyboards/durgod/dgk6x/hades_ansi/info.json
rename to keyboards/durgod/dgk6x/hades_ansi/keyboard.json
diff --git a/keyboards/durgod/dgk6x/hades_ansi/rules.mk b/keyboards/durgod/dgk6x/hades_ansi/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/durgod/dgk6x/hades_iso/info.json b/keyboards/durgod/dgk6x/hades_iso/keyboard.json
similarity index 100%
rename from keyboards/durgod/dgk6x/hades_iso/info.json
rename to keyboards/durgod/dgk6x/hades_iso/keyboard.json
diff --git a/keyboards/durgod/dgk6x/hades_iso/rules.mk b/keyboards/durgod/dgk6x/hades_iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/durgod/dgk6x/hades_iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/keyboard.json
similarity index 100%
rename from keyboards/durgod/dgk6x/venus/info.json
rename to keyboards/durgod/dgk6x/venus/keyboard.json
diff --git a/keyboards/durgod/dgk6x/venus/rules.mk b/keyboards/durgod/dgk6x/venus/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dztech/dz60v2/info.json b/keyboards/dztech/dz60v2/keyboard.json
similarity index 100%
rename from keyboards/dztech/dz60v2/info.json
rename to keyboards/dztech/dz60v2/keyboard.json
diff --git a/keyboards/dztech/dz60v2/rules.mk b/keyboards/dztech/dz60v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dztech/dz60v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dztech/pluto/info.json b/keyboards/dztech/pluto/keyboard.json
similarity index 100%
rename from keyboards/dztech/pluto/info.json
rename to keyboards/dztech/pluto/keyboard.json
diff --git a/keyboards/dztech/pluto/rules.mk b/keyboards/dztech/pluto/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dztech/pluto/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/keyboard.json
similarity index 100%
rename from keyboards/dztech/tofu/ii/v1/info.json
rename to keyboards/dztech/tofu/ii/v1/keyboard.json
diff --git a/keyboards/dztech/tofu/ii/v1/rules.mk b/keyboards/dztech/tofu/ii/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/keyboard.json
similarity index 100%
rename from keyboards/dztech/tofu/jr/v1/info.json
rename to keyboards/dztech/tofu/jr/v1/keyboard.json
diff --git a/keyboards/dztech/tofu/jr/v1/rules.mk b/keyboards/dztech/tofu/jr/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/dztech/tofu/jr/v2/info.json b/keyboards/dztech/tofu/jr/v2/keyboard.json
similarity index 100%
rename from keyboards/dztech/tofu/jr/v2/info.json
rename to keyboards/dztech/tofu/jr/v2/keyboard.json
diff --git a/keyboards/dztech/tofu/jr/v2/rules.mk b/keyboards/dztech/tofu/jr/v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/dztech/tofu/jr/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/dztech/tofu60/info.json b/keyboards/dztech/tofu60/keyboard.json
similarity index 100%
rename from keyboards/dztech/tofu60/info.json
rename to keyboards/dztech/tofu60/keyboard.json
diff --git a/keyboards/dztech/tofu60/rules.mk b/keyboards/dztech/tofu60/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/keyboard.json
similarity index 100%
rename from keyboards/ebastler/e80_1800/info.json
rename to keyboards/ebastler/e80_1800/keyboard.json
diff --git a/keyboards/ebastler/e80_1800/rules.mk b/keyboards/ebastler/e80_1800/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/ebastler/e80_1800/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/keyboard.json
similarity index 100%
rename from keyboards/eek/silk_down/info.json
rename to keyboards/eek/silk_down/keyboard.json
diff --git a/keyboards/eek/silk_down/rules.mk b/keyboards/eek/silk_down/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/keyboard.json
similarity index 100%
rename from keyboards/eek/silk_up/info.json
rename to keyboards/eek/silk_up/keyboard.json
diff --git a/keyboards/eek/silk_up/rules.mk b/keyboards/eek/silk_up/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/eggsworks/egg58/info.json b/keyboards/eggsworks/egg58/keyboard.json
similarity index 100%
rename from keyboards/eggsworks/egg58/info.json
rename to keyboards/eggsworks/egg58/keyboard.json
diff --git a/keyboards/eggsworks/egg58/rules.mk b/keyboards/eggsworks/egg58/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/eggsworks/egg58/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/keyboard.json
similarity index 100%
rename from keyboards/ekow/akira/info.json
rename to keyboards/ekow/akira/keyboard.json
diff --git a/keyboards/ekow/akira/rules.mk b/keyboards/ekow/akira/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ekow/akira/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/enviousdesign/60f/info.json b/keyboards/enviousdesign/60f/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/60f/info.json
rename to keyboards/enviousdesign/60f/keyboard.json
diff --git a/keyboards/enviousdesign/60f/rules.mk b/keyboards/enviousdesign/60f/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/enviousdesign/60f/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/65m/info.json b/keyboards/enviousdesign/65m/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/65m/info.json
rename to keyboards/enviousdesign/65m/keyboard.json
diff --git a/keyboards/enviousdesign/65m/rules.mk b/keyboards/enviousdesign/65m/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/enviousdesign/65m/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/commissions/mini1800/info.json b/keyboards/enviousdesign/commissions/mini1800/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/commissions/mini1800/info.json
rename to keyboards/enviousdesign/commissions/mini1800/keyboard.json
diff --git a/keyboards/enviousdesign/commissions/mini1800/rules.mk b/keyboards/enviousdesign/commissions/mini1800/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/enviousdesign/commissions/mini1800/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rev0/info.json b/keyboards/enviousdesign/delirium/rev0/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/delirium/rev0/info.json
rename to keyboards/enviousdesign/delirium/rev0/keyboard.json
diff --git a/keyboards/enviousdesign/delirium/rev0/rules.mk b/keyboards/enviousdesign/delirium/rev0/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/enviousdesign/delirium/rev0/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rev1/info.json b/keyboards/enviousdesign/delirium/rev1/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/delirium/rev1/info.json
rename to keyboards/enviousdesign/delirium/rev1/keyboard.json
diff --git a/keyboards/enviousdesign/delirium/rev1/rules.mk b/keyboards/enviousdesign/delirium/rev1/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/enviousdesign/delirium/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/delirium/rgb/info.json b/keyboards/enviousdesign/delirium/rgb/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/delirium/rgb/info.json
rename to keyboards/enviousdesign/delirium/rgb/keyboard.json
diff --git a/keyboards/enviousdesign/delirium/rgb/rules.mk b/keyboards/enviousdesign/delirium/rgb/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/enviousdesign/delirium/rgb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/enviousdesign/mcro/rev1/info.json b/keyboards/enviousdesign/mcro/rev1/keyboard.json
similarity index 100%
rename from keyboards/enviousdesign/mcro/rev1/info.json
rename to keyboards/enviousdesign/mcro/rev1/keyboard.json
diff --git a/keyboards/enviousdesign/mcro/rev1/rules.mk b/keyboards/enviousdesign/mcro/rev1/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/enviousdesign/mcro/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/era/divine/info.json b/keyboards/era/divine/keyboard.json
similarity index 100%
rename from keyboards/era/divine/info.json
rename to keyboards/era/divine/keyboard.json
diff --git a/keyboards/era/divine/rules.mk b/keyboards/era/divine/rules.mk
deleted file mode 100644
index 3922c569c4e..00000000000
--- a/keyboards/era/divine/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
\ No newline at end of file
diff --git a/keyboards/era/era65/info.json b/keyboards/era/era65/keyboard.json
similarity index 100%
rename from keyboards/era/era65/info.json
rename to keyboards/era/era65/keyboard.json
diff --git a/keyboards/era/era65/rules.mk b/keyboards/era/era65/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/era/sirind/brick65/info.json b/keyboards/era/sirind/brick65/keyboard.json
similarity index 100%
rename from keyboards/era/sirind/brick65/info.json
rename to keyboards/era/sirind/brick65/keyboard.json
diff --git a/keyboards/era/sirind/brick65/rules.mk b/keyboards/era/sirind/brick65/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/sirind/brick65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/era/sirind/klein_hs/info.json b/keyboards/era/sirind/klein_hs/keyboard.json
similarity index 100%
rename from keyboards/era/sirind/klein_hs/info.json
rename to keyboards/era/sirind/klein_hs/keyboard.json
diff --git a/keyboards/era/sirind/klein_hs/rules.mk b/keyboards/era/sirind/klein_hs/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/era/sirind/klein_sd/info.json b/keyboards/era/sirind/klein_sd/keyboard.json
similarity index 100%
rename from keyboards/era/sirind/klein_sd/info.json
rename to keyboards/era/sirind/klein_sd/keyboard.json
diff --git a/keyboards/era/sirind/klein_sd/rules.mk b/keyboards/era/sirind/klein_sd/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/sirind/klein_sd/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/base/info.json b/keyboards/ergodox_ez/base/keyboard.json
similarity index 100%
rename from keyboards/ergodox_ez/base/info.json
rename to keyboards/ergodox_ez/base/keyboard.json
diff --git a/keyboards/ergodox_ez/base/rules.mk b/keyboards/ergodox_ez/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/keyboard.json
similarity index 100%
rename from keyboards/ergoslab/rev1/info.json
rename to keyboards/ergoslab/rev1/keyboard.json
diff --git a/keyboards/ergoslab/rev1/rules.mk b/keyboards/ergoslab/rev1/rules.mk
deleted file mode 100644
index fff00a1b511..00000000000
--- a/keyboards/ergoslab/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Revision Specific Build Options
-#   change yes to no to disable
-#
diff --git a/keyboards/etiennecollin/wave/info.json b/keyboards/etiennecollin/wave/keyboard.json
similarity index 100%
rename from keyboards/etiennecollin/wave/info.json
rename to keyboards/etiennecollin/wave/keyboard.json
diff --git a/keyboards/etiennecollin/wave/rules.mk b/keyboards/etiennecollin/wave/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/etiennecollin/wave/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/evyd13/fin_pad/info.json b/keyboards/evyd13/fin_pad/keyboard.json
similarity index 100%
rename from keyboards/evyd13/fin_pad/info.json
rename to keyboards/evyd13/fin_pad/keyboard.json
diff --git a/keyboards/evyd13/fin_pad/rules.mk b/keyboards/evyd13/fin_pad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/evyd13/fin_pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/evyd13/nt210/info.json b/keyboards/evyd13/nt210/keyboard.json
similarity index 100%
rename from keyboards/evyd13/nt210/info.json
rename to keyboards/evyd13/nt210/keyboard.json
diff --git a/keyboards/evyd13/nt210/rules.mk b/keyboards/evyd13/nt210/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/evyd13/nt210/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/evyd13/nt650/info.json b/keyboards/evyd13/nt650/keyboard.json
similarity index 100%
rename from keyboards/evyd13/nt650/info.json
rename to keyboards/evyd13/nt650/keyboard.json
diff --git a/keyboards/evyd13/nt650/rules.mk b/keyboards/evyd13/nt650/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/evyd13/nt650/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/keyboard.json
similarity index 100%
rename from keyboards/exclusive/e85/hotswap/info.json
rename to keyboards/exclusive/e85/hotswap/keyboard.json
diff --git a/keyboards/exclusive/e85/hotswap/rules.mk b/keyboards/exclusive/e85/hotswap/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/keyboard.json
similarity index 100%
rename from keyboards/exclusive/e85/soldered/info.json
rename to keyboards/exclusive/e85/soldered/keyboard.json
diff --git a/keyboards/exclusive/e85/soldered/rules.mk b/keyboards/exclusive/e85/soldered/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/eyeohdesigns/humble40/info.json b/keyboards/eyeohdesigns/humble40/keyboard.json
similarity index 100%
rename from keyboards/eyeohdesigns/humble40/info.json
rename to keyboards/eyeohdesigns/humble40/keyboard.json
diff --git a/keyboards/eyeohdesigns/humble40/rules.mk b/keyboards/eyeohdesigns/humble40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/eyeohdesigns/humble40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ez_maker/directpins/promicro/info.json b/keyboards/ez_maker/directpins/promicro/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/promicro/info.json
rename to keyboards/ez_maker/directpins/promicro/keyboard.json
diff --git a/keyboards/ez_maker/directpins/promicro/rules.mk b/keyboards/ez_maker/directpins/promicro/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ez_maker/directpins/promicro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ez_maker/directpins/proton_c/info.json b/keyboards/ez_maker/directpins/proton_c/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/proton_c/info.json
rename to keyboards/ez_maker/directpins/proton_c/keyboard.json
diff --git a/keyboards/ez_maker/directpins/proton_c/rules.mk b/keyboards/ez_maker/directpins/proton_c/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ez_maker/directpins/proton_c/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ez_maker/directpins/rp2040/info.json b/keyboards/ez_maker/directpins/rp2040/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/rp2040/info.json
rename to keyboards/ez_maker/directpins/rp2040/keyboard.json
diff --git a/keyboards/ez_maker/directpins/rp2040/rules.mk b/keyboards/ez_maker/directpins/rp2040/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ez_maker/directpins/rp2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ez_maker/directpins/teensy_2/info.json b/keyboards/ez_maker/directpins/teensy_2/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/teensy_2/info.json
rename to keyboards/ez_maker/directpins/teensy_2/keyboard.json
diff --git a/keyboards/ez_maker/directpins/teensy_2/rules.mk b/keyboards/ez_maker/directpins/teensy_2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ez_maker/directpins/teensy_2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/teensy_2pp/info.json
rename to keyboards/ez_maker/directpins/teensy_2pp/keyboard.json
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/rules.mk b/keyboards/ez_maker/directpins/teensy_2pp/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ez_maker/directpins/teensy_2pp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/keyboard.json
similarity index 100%
rename from keyboards/fancytech/fancyalice66/info.json
rename to keyboards/fancytech/fancyalice66/keyboard.json
diff --git a/keyboards/fancytech/fancyalice66/rules.mk b/keyboards/fancytech/fancyalice66/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/fancytech/fancyalice66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ferris/0_2/base/info.json b/keyboards/ferris/0_2/base/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_2/base/info.json
rename to keyboards/ferris/0_2/base/keyboard.json
diff --git a/keyboards/ferris/0_2/base/rules.mk b/keyboards/ferris/0_2/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ferris/0_2/compact/info.json b/keyboards/ferris/0_2/compact/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_2/compact/info.json
rename to keyboards/ferris/0_2/compact/keyboard.json
diff --git a/keyboards/ferris/0_2/compact/rules.mk b/keyboards/ferris/0_2/compact/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ferris/0_2/high/info.json b/keyboards/ferris/0_2/high/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_2/high/info.json
rename to keyboards/ferris/0_2/high/keyboard.json
diff --git a/keyboards/ferris/0_2/high/rules.mk b/keyboards/ferris/0_2/high/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ferris/0_2/mini/info.json b/keyboards/ferris/0_2/mini/keyboard.json
similarity index 100%
rename from keyboards/ferris/0_2/mini/info.json
rename to keyboards/ferris/0_2/mini/keyboard.json
diff --git a/keyboards/ferris/0_2/mini/rules.mk b/keyboards/ferris/0_2/mini/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/keyboard.json
similarity index 100%
rename from keyboards/ferris/sweep/info.json
rename to keyboards/ferris/sweep/keyboard.json
diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ferris/sweep/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/flashquark/horizon_z/info.json b/keyboards/flashquark/horizon_z/keyboard.json
similarity index 100%
rename from keyboards/flashquark/horizon_z/info.json
rename to keyboards/flashquark/horizon_z/keyboard.json
diff --git a/keyboards/flashquark/horizon_z/rules.mk b/keyboards/flashquark/horizon_z/rules.mk
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/keyboards/for_science/info.json b/keyboards/for_science/keyboard.json
similarity index 100%
rename from keyboards/for_science/info.json
rename to keyboards/for_science/keyboard.json
diff --git a/keyboards/for_science/rules.mk b/keyboards/for_science/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/for_science/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/forever65/info.json b/keyboards/forever65/keyboard.json
similarity index 100%
rename from keyboards/forever65/info.json
rename to keyboards/forever65/keyboard.json
diff --git a/keyboards/forever65/rules.mk b/keyboards/forever65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/forever65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/keyboard.json
similarity index 100%
rename from keyboards/fortitude60/rev1/info.json
rename to keyboards/fortitude60/rev1/keyboard.json
diff --git a/keyboards/fortitude60/rev1/rules.mk b/keyboards/fortitude60/rev1/rules.mk
deleted file mode 100644
index fff00a1b511..00000000000
--- a/keyboards/fortitude60/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Revision Specific Build Options
-#   change yes to no to disable
-#
diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/keyboard.json
similarity index 100%
rename from keyboards/frobiac/blackflat/info.json
rename to keyboards/frobiac/blackflat/keyboard.json
diff --git a/keyboards/frobiac/blackflat/rules.mk b/keyboards/frobiac/blackflat/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/frobiac/blackflat/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/frobiac/hypernano/info.json b/keyboards/frobiac/hypernano/keyboard.json
similarity index 100%
rename from keyboards/frobiac/hypernano/info.json
rename to keyboards/frobiac/hypernano/keyboard.json
diff --git a/keyboards/frobiac/hypernano/rules.mk b/keyboards/frobiac/hypernano/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/frobiac/hypernano/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/keyboard.json
similarity index 100%
rename from keyboards/frobiac/redtilt/info.json
rename to keyboards/frobiac/redtilt/keyboard.json
diff --git a/keyboards/frobiac/redtilt/rules.mk b/keyboards/frobiac/redtilt/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/frobiac/redtilt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/fruitykeeb/fruitbar/r1/elite_c/info.json b/keyboards/fruitykeeb/fruitbar/r1/elite_c/keyboard.json
similarity index 100%
rename from keyboards/fruitykeeb/fruitbar/r1/elite_c/info.json
rename to keyboards/fruitykeeb/fruitbar/r1/elite_c/keyboard.json
diff --git a/keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk b/keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/fruitykeeb/fruitbar/r1/elite_c/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/fruitykeeb/fruitbar/r1/promicro/info.json b/keyboards/fruitykeeb/fruitbar/r1/promicro/keyboard.json
similarity index 100%
rename from keyboards/fruitykeeb/fruitbar/r1/promicro/info.json
rename to keyboards/fruitykeeb/fruitbar/r1/promicro/keyboard.json
diff --git a/keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk b/keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/fruitykeeb/fruitbar/r1/promicro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/fruitykeeb/fruitbar/r2/info.json b/keyboards/fruitykeeb/fruitbar/r2/keyboard.json
similarity index 100%
rename from keyboards/fruitykeeb/fruitbar/r2/info.json
rename to keyboards/fruitykeeb/fruitbar/r2/keyboard.json
diff --git a/keyboards/fruitykeeb/fruitbar/r2/rules.mk b/keyboards/fruitykeeb/fruitbar/r2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/fruitykeeb/fruitbar/r2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/fs_streampad/info.json b/keyboards/fs_streampad/keyboard.json
similarity index 100%
rename from keyboards/fs_streampad/info.json
rename to keyboards/fs_streampad/keyboard.json
diff --git a/keyboards/fs_streampad/rules.mk b/keyboards/fs_streampad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/fs_streampad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/galile0/glyphkbd_v2/info.json b/keyboards/galile0/glyphkbd_v2/keyboard.json
similarity index 100%
rename from keyboards/galile0/glyphkbd_v2/info.json
rename to keyboards/galile0/glyphkbd_v2/keyboard.json
diff --git a/keyboards/galile0/glyphkbd_v2/rules.mk b/keyboards/galile0/glyphkbd_v2/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/galile0/glyphkbd_v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/keyboard.json
similarity index 100%
rename from keyboards/geistmaschine/geist/info.json
rename to keyboards/geistmaschine/geist/keyboard.json
diff --git a/keyboards/geistmaschine/geist/rules.mk b/keyboards/geistmaschine/geist/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/geistmaschine/geist/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ghs/jem/hotswap_ansi/info.json b/keyboards/ghs/jem/hotswap_ansi/keyboard.json
similarity index 100%
rename from keyboards/ghs/jem/hotswap_ansi/info.json
rename to keyboards/ghs/jem/hotswap_ansi/keyboard.json
diff --git a/keyboards/ghs/jem/hotswap_ansi/rules.mk b/keyboards/ghs/jem/hotswap_ansi/rules.mk
deleted file mode 100644
index 17f0d87b7f4..00000000000
--- a/keyboards/ghs/jem/hotswap_ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file left intentionally blank
diff --git a/keyboards/ghs/jem/soldered/info.json b/keyboards/ghs/jem/soldered/keyboard.json
similarity index 100%
rename from keyboards/ghs/jem/soldered/info.json
rename to keyboards/ghs/jem/soldered/keyboard.json
diff --git a/keyboards/ghs/jem/soldered/rules.mk b/keyboards/ghs/jem/soldered/rules.mk
deleted file mode 100644
index 218d8921e51..00000000000
--- a/keyboards/ghs/jem/soldered/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank.
diff --git a/keyboards/ghs/xls/info.json b/keyboards/ghs/xls/keyboard.json
similarity index 100%
rename from keyboards/ghs/xls/info.json
rename to keyboards/ghs/xls/keyboard.json
diff --git a/keyboards/ghs/xls/rules.mk b/keyboards/ghs/xls/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/ghs/xls/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/keyboard.json
similarity index 100%
rename from keyboards/gkeyboard/gpad8_2r/info.json
rename to keyboards/gkeyboard/gpad8_2r/keyboard.json
diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/gkeyboard/greatpad/info.json b/keyboards/gkeyboard/greatpad/keyboard.json
similarity index 100%
rename from keyboards/gkeyboard/greatpad/info.json
rename to keyboards/gkeyboard/greatpad/keyboard.json
diff --git a/keyboards/gkeyboard/greatpad/rules.mk b/keyboards/gkeyboard/greatpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/gkeyboard/greatpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/gl516/xr63gl/info.json b/keyboards/gl516/xr63gl/keyboard.json
similarity index 100%
rename from keyboards/gl516/xr63gl/info.json
rename to keyboards/gl516/xr63gl/keyboard.json
diff --git a/keyboards/gl516/xr63gl/rules.mk b/keyboards/gl516/xr63gl/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/gl516/xr63gl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/gray_studio/think65v3/info.json b/keyboards/gray_studio/think65v3/keyboard.json
similarity index 100%
rename from keyboards/gray_studio/think65v3/info.json
rename to keyboards/gray_studio/think65v3/keyboard.json
diff --git a/keyboards/gray_studio/think65v3/rules.mk b/keyboards/gray_studio/think65v3/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/gray_studio/think65v3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/hackpad/info.json b/keyboards/hackpad/keyboard.json
similarity index 100%
rename from keyboards/hackpad/info.json
rename to keyboards/hackpad/keyboard.json
diff --git a/keyboards/hackpad/rules.mk b/keyboards/hackpad/rules.mk
deleted file mode 100644
index 7114cc32958..00000000000
--- a/keyboards/hackpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# this file is intentionally left blank
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/keyboard.json
similarity index 100%
rename from keyboards/handwired/3dortho14u/rev1/info.json
rename to keyboards/handwired/3dortho14u/rev1/keyboard.json
diff --git a/keyboards/handwired/3dortho14u/rev1/rules.mk b/keyboards/handwired/3dortho14u/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/3dortho14u/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/keyboard.json
similarity index 100%
rename from keyboards/handwired/3dortho14u/rev2/info.json
rename to keyboards/handwired/3dortho14u/rev2/keyboard.json
diff --git a/keyboards/handwired/3dortho14u/rev2/rules.mk b/keyboards/handwired/3dortho14u/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/3dortho14u/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/keyboard.json
similarity index 100%
rename from keyboards/handwired/3dp660_oled/info.json
rename to keyboards/handwired/3dp660_oled/keyboard.json
diff --git a/keyboards/handwired/3dp660_oled/rules.mk b/keyboards/handwired/3dp660_oled/rules.mk
deleted file mode 100644
index c80812f6e0a..00000000000
--- a/keyboards/handwired/3dp660_oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/keyboard.json
similarity index 100%
rename from keyboards/handwired/baredev/rev1/info.json
rename to keyboards/handwired/baredev/rev1/keyboard.json
diff --git a/keyboards/handwired/baredev/rev1/rules.mk b/keyboards/handwired/baredev/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_cc/info.json
rename to keyboards/handwired/dactyl_cc/keyboard.json
diff --git a/keyboards/handwired/dactyl_cc/rules.mk b/keyboards/handwired/dactyl_cc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/dactyl_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_kinesis/info.json
rename to keyboards/handwired/dactyl_kinesis/keyboard.json
diff --git a/keyboards/handwired/dactyl_kinesis/rules.mk b/keyboards/handwired/dactyl_kinesis/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/dactyl_kinesis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_lightcycle/info.json
rename to keyboards/handwired/dactyl_lightcycle/keyboard.json
diff --git a/keyboards/handwired/dactyl_lightcycle/rules.mk b/keyboards/handwired/dactyl_lightcycle/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/4x6_4_3/info.json
rename to keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/5x6_68/info.json
rename to keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
rename to keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_manuform/6x7/info.json
rename to keyboards/handwired/dactyl_manuform/6x7/keyboard.json
diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/dactyl_maximus/info.json b/keyboards/handwired/dactyl_maximus/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_maximus/info.json
rename to keyboards/handwired/dactyl_maximus/keyboard.json
diff --git a/keyboards/handwired/dactyl_maximus/rules.mk b/keyboards/handwired/dactyl_maximus/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/dactyl_maximus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_minidox/info.json b/keyboards/handwired/dactyl_minidox/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_minidox/info.json
rename to keyboards/handwired/dactyl_minidox/keyboard.json
diff --git a/keyboards/handwired/dactyl_minidox/rules.mk b/keyboards/handwired/dactyl_minidox/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/dactyl_minidox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_tracer/info.json b/keyboards/handwired/dactyl_tracer/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactyl_tracer/info.json
rename to keyboards/handwired/dactyl_tracer/keyboard.json
diff --git a/keyboards/handwired/dactyl_tracer/rules.mk b/keyboards/handwired/dactyl_tracer/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/handwired/dactyl_tracer/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/keyboard.json
similarity index 100%
rename from keyboards/handwired/dactylmacropad/info.json
rename to keyboards/handwired/dactylmacropad/keyboard.json
diff --git a/keyboards/handwired/dactylmacropad/rules.mk b/keyboards/handwired/dactylmacropad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/dactylmacropad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
similarity index 100%
rename from keyboards/handwired/daskeyboard/daskeyboard4/info.json
rename to keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk b/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dmote/info.json b/keyboards/handwired/dmote/keyboard.json
similarity index 100%
rename from keyboards/handwired/dmote/info.json
rename to keyboards/handwired/dmote/keyboard.json
diff --git a/keyboards/handwired/dmote/rules.mk b/keyboards/handwired/dmote/rules.mk
deleted file mode 100644
index 876618b9d13..00000000000
--- a/keyboards/handwired/dmote/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File is intentionally blank
diff --git a/keyboards/handwired/dygma/raise/ansi/info.json b/keyboards/handwired/dygma/raise/ansi/keyboard.json
similarity index 100%
rename from keyboards/handwired/dygma/raise/ansi/info.json
rename to keyboards/handwired/dygma/raise/ansi/keyboard.json
diff --git a/keyboards/handwired/dygma/raise/ansi/rules.mk b/keyboards/handwired/dygma/raise/ansi/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/dygma/raise/iso/info.json b/keyboards/handwired/dygma/raise/iso/keyboard.json
similarity index 100%
rename from keyboards/handwired/dygma/raise/iso/info.json
rename to keyboards/handwired/dygma/raise/iso/keyboard.json
diff --git a/keyboards/handwired/dygma/raise/iso/rules.mk b/keyboards/handwired/dygma/raise/iso/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/iso85k/info.json b/keyboards/handwired/iso85k/keyboard.json
similarity index 100%
rename from keyboards/handwired/iso85k/info.json
rename to keyboards/handwired/iso85k/keyboard.json
diff --git a/keyboards/handwired/iso85k/rules.mk b/keyboards/handwired/iso85k/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/iso85k/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/itstleo9/promicro/info.json b/keyboards/handwired/itstleo9/promicro/keyboard.json
similarity index 100%
rename from keyboards/handwired/itstleo9/promicro/info.json
rename to keyboards/handwired/itstleo9/promicro/keyboard.json
diff --git a/keyboards/handwired/itstleo9/promicro/rules.mk b/keyboards/handwired/itstleo9/promicro/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/itstleo9/promicro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/itstleo9/rp2040/info.json b/keyboards/handwired/itstleo9/rp2040/keyboard.json
similarity index 100%
rename from keyboards/handwired/itstleo9/rp2040/info.json
rename to keyboards/handwired/itstleo9/rp2040/keyboard.json
diff --git a/keyboards/handwired/itstleo9/rp2040/rules.mk b/keyboards/handwired/itstleo9/rp2040/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/itstleo9/rp2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/keyboard.json
similarity index 100%
rename from keyboards/handwired/jotanck/info.json
rename to keyboards/handwired/jotanck/keyboard.json
diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/jotanck/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/jotlily60/info.json b/keyboards/handwired/jotlily60/keyboard.json
similarity index 100%
rename from keyboards/handwired/jotlily60/info.json
rename to keyboards/handwired/jotlily60/keyboard.json
diff --git a/keyboards/handwired/jotlily60/rules.mk b/keyboards/handwired/jotlily60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/jotlily60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/macro3/info.json b/keyboards/handwired/macro3/keyboard.json
similarity index 100%
rename from keyboards/handwired/macro3/info.json
rename to keyboards/handwired/macro3/keyboard.json
diff --git a/keyboards/handwired/macro3/rules.mk b/keyboards/handwired/macro3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/macro3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/keyboard.json
similarity index 100%
rename from keyboards/handwired/marek128b/ergosplit44/info.json
rename to keyboards/handwired/marek128b/ergosplit44/keyboard.json
diff --git a/keyboards/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/marek128b/ergosplit44/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/keyboard.json
similarity index 100%
rename from keyboards/handwired/maverick0197/keydeck8/info.json
rename to keyboards/handwired/maverick0197/keydeck8/keyboard.json
diff --git a/keyboards/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/maverick0197/keydeck8/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/maverick0197/keydeck8/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json
similarity index 100%
rename from keyboards/handwired/ms_sculpt_mobile/astar/info.json
rename to keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json
similarity index 100%
rename from keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json
rename to keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/nortontechpad/info.json b/keyboards/handwired/nortontechpad/keyboard.json
similarity index 100%
rename from keyboards/handwired/nortontechpad/info.json
rename to keyboards/handwired/nortontechpad/keyboard.json
diff --git a/keyboards/handwired/nortontechpad/rules.mk b/keyboards/handwired/nortontechpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/nortontechpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/bluepill/info.json
rename to keyboards/handwired/onekey/bluepill/keyboard.json
diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/bluepill_uf2boot/info.json
rename to keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/elite_c/info.json
rename to keyboards/handwired/onekey/elite_c/keyboard.json
diff --git a/keyboards/handwired/onekey/elite_c/rules.mk b/keyboards/handwired/onekey/elite_c/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/nucleo_f446re/info.json
rename to keyboards/handwired/onekey/nucleo_f446re/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_f446re/rules.mk b/keyboards/handwired/onekey/nucleo_f446re/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/nucleo_g431rb/info.json b/keyboards/handwired/onekey/nucleo_g431rb/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/nucleo_g431rb/info.json
rename to keyboards/handwired/onekey/nucleo_g431rb/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_g431rb/rules.mk b/keyboards/handwired/onekey/nucleo_g431rb/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/nucleo_g474re/info.json b/keyboards/handwired/onekey/nucleo_g474re/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/nucleo_g474re/info.json
rename to keyboards/handwired/onekey/nucleo_g474re/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_g474re/rules.mk b/keyboards/handwired/onekey/nucleo_g474re/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/info.json b/keyboards/handwired/onekey/nucleo_h723zg/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/nucleo_h723zg/info.json
rename to keyboards/handwired/onekey/nucleo_h723zg/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/rules.mk b/keyboards/handwired/onekey/nucleo_h723zg/rules.mk
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/nucleo_l432kc/info.json
rename to keyboards/handwired/onekey/nucleo_l432kc/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/promicro/info.json
rename to keyboards/handwired/onekey/promicro/keyboard.json
diff --git a/keyboards/handwired/onekey/promicro/rules.mk b/keyboards/handwired/onekey/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/proton_c/info.json
rename to keyboards/handwired/onekey/proton_c/keyboard.json
diff --git a/keyboards/handwired/onekey/proton_c/rules.mk b/keyboards/handwired/onekey/proton_c/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/rp2040/info.json
rename to keyboards/handwired/onekey/rp2040/keyboard.json
diff --git a/keyboards/handwired/onekey/rp2040/rules.mk b/keyboards/handwired/onekey/rp2040/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/stm32f0_disco/info.json
rename to keyboards/handwired/onekey/stm32f0_disco/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/stm32f3_disco/info.json b/keyboards/handwired/onekey/stm32f3_disco/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/stm32f3_disco/info.json
rename to keyboards/handwired/onekey/stm32f3_disco/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f3_disco/rules.mk b/keyboards/handwired/onekey/stm32f3_disco/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/stm32f405_feather/info.json
rename to keyboards/handwired/onekey/stm32f405_feather/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f405_feather/rules.mk b/keyboards/handwired/onekey/stm32f405_feather/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/onekey/stm32f405_feather/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/teensy_2/info.json
rename to keyboards/handwired/onekey/teensy_2/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_2/rules.mk b/keyboards/handwired/onekey/teensy_2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/teensy_2pp/info.json
rename to keyboards/handwired/onekey/teensy_2pp/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_2pp/rules.mk b/keyboards/handwired/onekey/teensy_2pp/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/onekey/teensy_32/info.json b/keyboards/handwired/onekey/teensy_32/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/teensy_32/info.json
rename to keyboards/handwired/onekey/teensy_32/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/keyboard.json
similarity index 100%
rename from keyboards/handwired/onekey/teensy_35/info.json
rename to keyboards/handwired/onekey/teensy_35/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/onekey/teensy_35/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/petruziamini/info.json b/keyboards/handwired/petruziamini/keyboard.json
similarity index 100%
rename from keyboards/handwired/petruziamini/info.json
rename to keyboards/handwired/petruziamini/keyboard.json
diff --git a/keyboards/handwired/petruziamini/rules.mk b/keyboards/handwired/petruziamini/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/petruziamini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/phantagom/baragon/info.json b/keyboards/handwired/phantagom/baragon/keyboard.json
similarity index 100%
rename from keyboards/handwired/phantagom/baragon/info.json
rename to keyboards/handwired/phantagom/baragon/keyboard.json
diff --git a/keyboards/handwired/phantagom/baragon/rules.mk b/keyboards/handwired/phantagom/baragon/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/phantagom/baragon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/phantagom/varan/info.json b/keyboards/handwired/phantagom/varan/keyboard.json
similarity index 100%
rename from keyboards/handwired/phantagom/varan/info.json
rename to keyboards/handwired/phantagom/varan/keyboard.json
diff --git a/keyboards/handwired/phantagom/varan/rules.mk b/keyboards/handwired/phantagom/varan/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/phantagom/varan/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/keyboard.json
similarity index 100%
rename from keyboards/handwired/pill60/bluepill/info.json
rename to keyboards/handwired/pill60/bluepill/keyboard.json
diff --git a/keyboards/handwired/pill60/bluepill/rules.mk b/keyboards/handwired/pill60/bluepill/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/pill60/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/keyboard.json
similarity index 100%
rename from keyboards/handwired/polly40/info.json
rename to keyboards/handwired/polly40/keyboard.json
diff --git a/keyboards/handwired/polly40/rules.mk b/keyboards/handwired/polly40/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/handwired/polly40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/keyboard.json
similarity index 100%
rename from keyboards/handwired/pytest/basic/info.json
rename to keyboards/handwired/pytest/basic/keyboard.json
diff --git a/keyboards/handwired/pytest/basic/rules.mk b/keyboards/handwired/pytest/basic/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/pytest/has_community/info.json b/keyboards/handwired/pytest/has_community/keyboard.json
similarity index 100%
rename from keyboards/handwired/pytest/has_community/info.json
rename to keyboards/handwired/pytest/has_community/keyboard.json
diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/keyboard.json
similarity index 100%
rename from keyboards/handwired/pytest/macro/info.json
rename to keyboards/handwired/pytest/macro/keyboard.json
diff --git a/keyboards/handwired/pytest/macro/rules.mk b/keyboards/handwired/pytest/macro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/rabijl/rotary_numpad/info.json b/keyboards/handwired/rabijl/rotary_numpad/keyboard.json
similarity index 100%
rename from keyboards/handwired/rabijl/rotary_numpad/info.json
rename to keyboards/handwired/rabijl/rotary_numpad/keyboard.json
diff --git a/keyboards/handwired/rabijl/rotary_numpad/rules.mk b/keyboards/handwired/rabijl/rotary_numpad/rules.mk
deleted file mode 100644
index 1287472e49e..00000000000
--- a/keyboards/handwired/rabijl/rotary_numpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# file intentionally left blank
diff --git a/keyboards/handwired/rd_61_qmk/info.json b/keyboards/handwired/rd_61_qmk/keyboard.json
similarity index 100%
rename from keyboards/handwired/rd_61_qmk/info.json
rename to keyboards/handwired/rd_61_qmk/keyboard.json
diff --git a/keyboards/handwired/rd_61_qmk/rules.mk b/keyboards/handwired/rd_61_qmk/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/rd_61_qmk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/keyboard.json
similarity index 100%
rename from keyboards/handwired/reclined/info.json
rename to keyboards/handwired/reclined/keyboard.json
diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/reclined/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto108/info.json b/keyboards/handwired/scottokeebs/scotto108/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scotto108/info.json
rename to keyboards/handwired/scottokeebs/scotto108/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto108/rules.mk b/keyboards/handwired/scottokeebs/scotto108/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scotto108/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto34/info.json b/keyboards/handwired/scottokeebs/scotto34/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scotto34/info.json
rename to keyboards/handwired/scottokeebs/scotto34/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto34/rules.mk b/keyboards/handwired/scottokeebs/scotto34/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/scottokeebs/scotto36/info.json b/keyboards/handwired/scottokeebs/scotto36/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scotto36/info.json
rename to keyboards/handwired/scottokeebs/scotto36/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto36/rules.mk b/keyboards/handwired/scottokeebs/scotto36/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scotto36/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto40/info.json b/keyboards/handwired/scottokeebs/scotto40/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scotto40/info.json
rename to keyboards/handwired/scottokeebs/scotto40/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto40/rules.mk b/keyboards/handwired/scottokeebs/scotto40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scotto40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto61/info.json b/keyboards/handwired/scottokeebs/scotto61/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scotto61/info.json
rename to keyboards/handwired/scottokeebs/scotto61/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto61/rules.mk b/keyboards/handwired/scottokeebs/scotto61/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scotto61/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto9/info.json b/keyboards/handwired/scottokeebs/scotto9/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scotto9/info.json
rename to keyboards/handwired/scottokeebs/scotto9/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto9/rules.mk b/keyboards/handwired/scottokeebs/scotto9/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scotto9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottoalp/info.json b/keyboards/handwired/scottokeebs/scottoalp/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottoalp/info.json
rename to keyboards/handwired/scottokeebs/scottoalp/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoalp/rules.mk b/keyboards/handwired/scottokeebs/scottoalp/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottoalp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottocmd/info.json b/keyboards/handwired/scottokeebs/scottocmd/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottocmd/info.json
rename to keyboards/handwired/scottokeebs/scottocmd/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottocmd/rules.mk b/keyboards/handwired/scottokeebs/scottocmd/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottocmd/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottodeck/info.json b/keyboards/handwired/scottokeebs/scottodeck/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottodeck/info.json
rename to keyboards/handwired/scottokeebs/scottodeck/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottodeck/rules.mk b/keyboards/handwired/scottokeebs/scottodeck/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottodeck/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottoergo/info.json b/keyboards/handwired/scottokeebs/scottoergo/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottoergo/info.json
rename to keyboards/handwired/scottokeebs/scottoergo/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoergo/rules.mk b/keyboards/handwired/scottokeebs/scottoergo/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottoergo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottofly/info.json b/keyboards/handwired/scottokeebs/scottofly/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottofly/info.json
rename to keyboards/handwired/scottokeebs/scottofly/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottofly/rules.mk b/keyboards/handwired/scottokeebs/scottofly/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottofly/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottofrog/info.json b/keyboards/handwired/scottokeebs/scottofrog/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottofrog/info.json
rename to keyboards/handwired/scottokeebs/scottofrog/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottofrog/rules.mk b/keyboards/handwired/scottokeebs/scottofrog/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottofrog/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottogame/info.json b/keyboards/handwired/scottokeebs/scottogame/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottogame/info.json
rename to keyboards/handwired/scottokeebs/scottogame/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottogame/rules.mk b/keyboards/handwired/scottokeebs/scottogame/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/handwired/scottokeebs/scottogame/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/info.json b/keyboards/handwired/scottokeebs/scottoinvader/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottoinvader/info.json
rename to keyboards/handwired/scottokeebs/scottoinvader/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk b/keyboards/handwired/scottokeebs/scottoinvader/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottokatana/info.json b/keyboards/handwired/scottokeebs/scottokatana/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottokatana/info.json
rename to keyboards/handwired/scottokeebs/scottokatana/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottokatana/rules.mk b/keyboards/handwired/scottokeebs/scottokatana/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottokatana/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottolong/info.json b/keyboards/handwired/scottokeebs/scottolong/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottolong/info.json
rename to keyboards/handwired/scottokeebs/scottolong/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottolong/rules.mk b/keyboards/handwired/scottokeebs/scottolong/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottolong/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottomacrodeck/info.json
rename to keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottomouse/info.json
rename to keyboards/handwired/scottokeebs/scottomouse/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottomouse/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottomouse/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottonum/info.json b/keyboards/handwired/scottokeebs/scottonum/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottonum/info.json
rename to keyboards/handwired/scottokeebs/scottonum/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottonum/rules.mk b/keyboards/handwired/scottokeebs/scottonum/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottonum/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottosplit/info.json b/keyboards/handwired/scottokeebs/scottosplit/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottosplit/info.json
rename to keyboards/handwired/scottokeebs/scottosplit/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottosplit/rules.mk b/keyboards/handwired/scottokeebs/scottosplit/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottosplit/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottostarter/info.json b/keyboards/handwired/scottokeebs/scottostarter/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottostarter/info.json
rename to keyboards/handwired/scottokeebs/scottostarter/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottostarter/rules.mk b/keyboards/handwired/scottokeebs/scottostarter/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/handwired/scottokeebs/scottostarter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottowing/info.json b/keyboards/handwired/scottokeebs/scottowing/keyboard.json
similarity index 100%
rename from keyboards/handwired/scottokeebs/scottowing/info.json
rename to keyboards/handwired/scottokeebs/scottowing/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottowing/rules.mk b/keyboards/handwired/scottokeebs/scottowing/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/scottokeebs/scottowing/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/keyboard.json
similarity index 100%
rename from keyboards/handwired/sejin_eat1010r2/info.json
rename to keyboards/handwired/sejin_eat1010r2/keyboard.json
diff --git a/keyboards/handwired/sejin_eat1010r2/rules.mk b/keyboards/handwired/sejin_eat1010r2/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/sejin_eat1010r2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/keyboard.json
similarity index 100%
rename from keyboards/handwired/sono1/stm32f103/info.json
rename to keyboards/handwired/sono1/stm32f103/keyboard.json
diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/sono1/stm32f103/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/keyboard.json
similarity index 100%
rename from keyboards/handwired/sono1/t2pp/info.json
rename to keyboards/handwired/sono1/t2pp/keyboard.json
diff --git a/keyboards/handwired/sono1/t2pp/rules.mk b/keyboards/handwired/sono1/t2pp/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/split_cloud/info.json b/keyboards/handwired/split_cloud/keyboard.json
similarity index 100%
rename from keyboards/handwired/split_cloud/info.json
rename to keyboards/handwired/split_cloud/keyboard.json
diff --git a/keyboards/handwired/split_cloud/rules.mk b/keyboards/handwired/split_cloud/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/keyboard.json
similarity index 100%
rename from keyboards/handwired/splittest/bluepill/info.json
rename to keyboards/handwired/splittest/bluepill/keyboard.json
diff --git a/keyboards/handwired/splittest/bluepill/rules.mk b/keyboards/handwired/splittest/bluepill/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/handwired/splittest/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/keyboard.json
similarity index 100%
rename from keyboards/handwired/splittest/promicro/info.json
rename to keyboards/handwired/splittest/promicro/keyboard.json
diff --git a/keyboards/handwired/splittest/promicro/rules.mk b/keyboards/handwired/splittest/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/keyboard.json
similarity index 100%
rename from keyboards/handwired/splittest/teensy_2/info.json
rename to keyboards/handwired/splittest/teensy_2/keyboard.json
diff --git a/keyboards/handwired/splittest/teensy_2/rules.mk b/keyboards/handwired/splittest/teensy_2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/starrykeebs/dude09/info.json b/keyboards/handwired/starrykeebs/dude09/keyboard.json
similarity index 100%
rename from keyboards/handwired/starrykeebs/dude09/info.json
rename to keyboards/handwired/starrykeebs/dude09/keyboard.json
diff --git a/keyboards/handwired/starrykeebs/dude09/rules.mk b/keyboards/handwired/starrykeebs/dude09/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/starrykeebs/dude09/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/technicpad/info.json b/keyboards/handwired/technicpad/keyboard.json
similarity index 100%
rename from keyboards/handwired/technicpad/info.json
rename to keyboards/handwired/technicpad/keyboard.json
diff --git a/keyboards/handwired/technicpad/rules.mk b/keyboards/handwired/technicpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/technicpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/keyboard.json
similarity index 100%
rename from keyboards/handwired/tkk/info.json
rename to keyboards/handwired/tkk/keyboard.json
diff --git a/keyboards/handwired/tkk/rules.mk b/keyboards/handwired/tkk/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/tkk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
similarity index 100%
rename from keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
rename to keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
similarity index 100%
rename from keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
rename to keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/keyboard.json
similarity index 100%
rename from keyboards/handwired/unk/rev1/info.json
rename to keyboards/handwired/unk/rev1/keyboard.json
diff --git a/keyboards/handwired/unk/rev1/rules.mk b/keyboards/handwired/unk/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/keyboard.json
similarity index 100%
rename from keyboards/handwired/wakizashi40/info.json
rename to keyboards/handwired/wakizashi40/keyboard.json
diff --git a/keyboards/handwired/wakizashi40/rules.mk b/keyboards/handwired/wakizashi40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/wakizashi40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/helios/info.json b/keyboards/handwired/wwa/helios/keyboard.json
similarity index 100%
rename from keyboards/handwired/wwa/helios/info.json
rename to keyboards/handwired/wwa/helios/keyboard.json
diff --git a/keyboards/handwired/wwa/helios/rules.mk b/keyboards/handwired/wwa/helios/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/wwa/helios/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/kepler/info.json b/keyboards/handwired/wwa/kepler/keyboard.json
similarity index 100%
rename from keyboards/handwired/wwa/kepler/info.json
rename to keyboards/handwired/wwa/kepler/keyboard.json
diff --git a/keyboards/handwired/wwa/kepler/rules.mk b/keyboards/handwired/wwa/kepler/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/wwa/kepler/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/mercury/info.json b/keyboards/handwired/wwa/mercury/keyboard.json
similarity index 100%
rename from keyboards/handwired/wwa/mercury/info.json
rename to keyboards/handwired/wwa/mercury/keyboard.json
diff --git a/keyboards/handwired/wwa/mercury/rules.mk b/keyboards/handwired/wwa/mercury/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/wwa/mercury/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/soyuz/info.json b/keyboards/handwired/wwa/soyuz/keyboard.json
similarity index 100%
rename from keyboards/handwired/wwa/soyuz/info.json
rename to keyboards/handwired/wwa/soyuz/keyboard.json
diff --git a/keyboards/handwired/wwa/soyuz/rules.mk b/keyboards/handwired/wwa/soyuz/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/wwa/soyuzxl/info.json b/keyboards/handwired/wwa/soyuzxl/keyboard.json
similarity index 100%
rename from keyboards/handwired/wwa/soyuzxl/info.json
rename to keyboards/handwired/wwa/soyuzxl/keyboard.json
diff --git a/keyboards/handwired/wwa/soyuzxl/rules.mk b/keyboards/handwired/wwa/soyuzxl/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/keyboard.json
similarity index 100%
rename from keyboards/handwired/xealous/rev1/info.json
rename to keyboards/handwired/xealous/rev1/keyboard.json
diff --git a/keyboards/handwired/xealous/rev1/rules.mk b/keyboards/handwired/xealous/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/handwired/ziyoulang_k3_mod/info.json b/keyboards/handwired/ziyoulang_k3_mod/keyboard.json
similarity index 100%
rename from keyboards/handwired/ziyoulang_k3_mod/info.json
rename to keyboards/handwired/ziyoulang_k3_mod/keyboard.json
diff --git a/keyboards/handwired/ziyoulang_k3_mod/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/handwired/ziyoulang_k3_mod/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/heliotrope/info.json b/keyboards/heliotrope/keyboard.json
similarity index 100%
rename from keyboards/heliotrope/info.json
rename to keyboards/heliotrope/keyboard.json
diff --git a/keyboards/heliotrope/rules.mk b/keyboards/heliotrope/rules.mk
deleted file mode 100644
index 6968c523355..00000000000
--- a/keyboards/heliotrope/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-
diff --git a/keyboards/hhkb/ansi/32u4/info.json b/keyboards/hhkb/ansi/32u4/keyboard.json
similarity index 100%
rename from keyboards/hhkb/ansi/32u4/info.json
rename to keyboards/hhkb/ansi/32u4/keyboard.json
diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/hineybush/h101/info.json b/keyboards/hineybush/h101/keyboard.json
similarity index 100%
rename from keyboards/hineybush/h101/info.json
rename to keyboards/hineybush/h101/keyboard.json
diff --git a/keyboards/hineybush/h101/rules.mk b/keyboards/hineybush/h101/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/hineybush/h101/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/hineybush/h87_g2/info.json b/keyboards/hineybush/h87_g2/keyboard.json
similarity index 100%
rename from keyboards/hineybush/h87_g2/info.json
rename to keyboards/hineybush/h87_g2/keyboard.json
diff --git a/keyboards/hineybush/h87_g2/rules.mk b/keyboards/hineybush/h87_g2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/hineybush/h87_g2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/hineybush/ibis/info.json b/keyboards/hineybush/ibis/keyboard.json
similarity index 100%
rename from keyboards/hineybush/ibis/info.json
rename to keyboards/hineybush/ibis/keyboard.json
diff --git a/keyboards/hineybush/ibis/rules.mk b/keyboards/hineybush/ibis/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/hineybush/ibis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/holyswitch/lightweight65/info.json b/keyboards/holyswitch/lightweight65/keyboard.json
similarity index 100%
rename from keyboards/holyswitch/lightweight65/info.json
rename to keyboards/holyswitch/lightweight65/keyboard.json
diff --git a/keyboards/holyswitch/lightweight65/rules.mk b/keyboards/holyswitch/lightweight65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/holyswitch/lightweight65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json
similarity index 100%
rename from keyboards/horrortroll/caticorn/rev1/hotswap/info.json
rename to keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/keyboard.json
similarity index 100%
rename from keyboards/horrortroll/caticorn/rev1/solder/info.json
rename to keyboards/horrortroll/caticorn/rev1/solder/keyboard.json
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/hotdox76v2/info.json b/keyboards/hotdox76v2/keyboard.json
similarity index 100%
rename from keyboards/hotdox76v2/info.json
rename to keyboards/hotdox76v2/keyboard.json
diff --git a/keyboards/hotdox76v2/rules.mk b/keyboards/hotdox76v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/hubble/info.json b/keyboards/hubble/keyboard.json
similarity index 100%
rename from keyboards/hubble/info.json
rename to keyboards/hubble/keyboard.json
diff --git a/keyboards/hubble/rules.mk b/keyboards/hubble/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/hubble/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ibm/model_m/modelh/info.json b/keyboards/ibm/model_m/modelh/keyboard.json
similarity index 100%
rename from keyboards/ibm/model_m/modelh/info.json
rename to keyboards/ibm/model_m/modelh/keyboard.json
diff --git a/keyboards/ibm/model_m/modelh/rules.mk b/keyboards/ibm/model_m/modelh/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/info.json b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
similarity index 100%
rename from keyboards/ibm/model_m_122/m122_3270/bluepill/info.json
rename to keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/idank/spankbd/info.json b/keyboards/idank/spankbd/keyboard.json
similarity index 100%
rename from keyboards/idank/spankbd/info.json
rename to keyboards/idank/spankbd/keyboard.json
diff --git a/keyboards/idank/spankbd/rules.mk b/keyboards/idank/spankbd/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/idank/spankbd/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/idank/sweeq/info.json b/keyboards/idank/sweeq/keyboard.json
similarity index 100%
rename from keyboards/idank/sweeq/info.json
rename to keyboards/idank/sweeq/keyboard.json
diff --git a/keyboards/idank/sweeq/rules.mk b/keyboards/idank/sweeq/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/idank/sweeq/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/keyboard.json
similarity index 100%
rename from keyboards/idobao/id80/v2/ansi/info.json
rename to keyboards/idobao/id80/v2/ansi/keyboard.json
diff --git a/keyboards/idobao/id80/v2/ansi/rules.mk b/keyboards/idobao/id80/v2/ansi/rules.mk
deleted file mode 100644
index 5fa6d2f3d01..00000000000
--- a/keyboards/idobao/id80/v2/ansi/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-# see common info.json
diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/keyboard.json
similarity index 100%
rename from keyboards/idobao/id80/v2/iso/info.json
rename to keyboards/idobao/id80/v2/iso/keyboard.json
diff --git a/keyboards/idobao/id80/v2/iso/rules.mk b/keyboards/idobao/id80/v2/iso/rules.mk
deleted file mode 100644
index 5fa6d2f3d01..00000000000
--- a/keyboards/idobao/id80/v2/iso/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-# see common info.json
diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/keyboard.json
similarity index 100%
rename from keyboards/idyllic/tinny50_rgb/info.json
rename to keyboards/idyllic/tinny50_rgb/keyboard.json
diff --git a/keyboards/idyllic/tinny50_rgb/rules.mk b/keyboards/idyllic/tinny50_rgb/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/igloo/info.json b/keyboards/igloo/keyboard.json
similarity index 100%
rename from keyboards/igloo/info.json
rename to keyboards/igloo/keyboard.json
diff --git a/keyboards/igloo/rules.mk b/keyboards/igloo/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/igloo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/info.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keyboard.json
similarity index 100%
rename from keyboards/inett_studio/sq80/hotswap_layout_i/info.json
rename to keyboards/inett_studio/sq80/hotswap_layout_i/keyboard.json
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/inland/mk47/info.json b/keyboards/inland/mk47/keyboard.json
similarity index 100%
rename from keyboards/inland/mk47/info.json
rename to keyboards/inland/mk47/keyboard.json
diff --git a/keyboards/inland/mk47/rules.mk b/keyboards/inland/mk47/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/inland/mk47/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/inland/v83p/info.json b/keyboards/inland/v83p/keyboard.json
similarity index 100%
rename from keyboards/inland/v83p/info.json
rename to keyboards/inland/v83p/keyboard.json
diff --git a/keyboards/inland/v83p/rules.mk b/keyboards/inland/v83p/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/inland/v83p/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/input_club/infinity60/led/info.json b/keyboards/input_club/infinity60/led/keyboard.json
similarity index 100%
rename from keyboards/input_club/infinity60/led/info.json
rename to keyboards/input_club/infinity60/led/keyboard.json
diff --git a/keyboards/input_club/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/input_club/infinity60/rev1/info.json b/keyboards/input_club/infinity60/rev1/keyboard.json
similarity index 100%
rename from keyboards/input_club/infinity60/rev1/info.json
rename to keyboards/input_club/infinity60/rev1/keyboard.json
diff --git a/keyboards/input_club/infinity60/rev1/rules.mk b/keyboards/input_club/infinity60/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/itstleo/itstleo40/info.json b/keyboards/itstleo/itstleo40/keyboard.json
similarity index 100%
rename from keyboards/itstleo/itstleo40/info.json
rename to keyboards/itstleo/itstleo40/keyboard.json
diff --git a/keyboards/itstleo/itstleo40/rules.mk b/keyboards/itstleo/itstleo40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/itstleo/itstleo40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json b/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
similarity index 100%
rename from keyboards/jacky_studio/piggy60/rev1/hotswap/info.json
rename to keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk b/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/info.json b/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
similarity index 100%
rename from keyboards/jacky_studio/piggy60/rev1/solder/info.json
rename to keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk b/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/keyboard.json
similarity index 100%
rename from keyboards/jadookb/jkb65/r1/info.json
rename to keyboards/jadookb/jkb65/r1/keyboard.json
diff --git a/keyboards/jadookb/jkb65/r1/rules.mk b/keyboards/jadookb/jkb65/r1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/keyboard.json
similarity index 100%
rename from keyboards/jadookb/jkb65/r2/info.json
rename to keyboards/jadookb/jkb65/r2/keyboard.json
diff --git a/keyboards/jadookb/jkb65/r2/rules.mk b/keyboards/jadookb/jkb65/r2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/jaykeeb/orba/info.json b/keyboards/jaykeeb/orba/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/orba/info.json
rename to keyboards/jaykeeb/orba/keyboard.json
diff --git a/keyboards/jaykeeb/orba/rules.mk b/keyboards/jaykeeb/orba/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/jaykeeb/orba/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/jaykeeb/sebelas/info.json b/keyboards/jaykeeb/sebelas/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/sebelas/info.json
rename to keyboards/jaykeeb/sebelas/keyboard.json
diff --git a/keyboards/jaykeeb/sebelas/rules.mk b/keyboards/jaykeeb/sebelas/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jaykeeb/sebelas/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jaykeeb/skyline/info.json b/keyboards/jaykeeb/skyline/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/skyline/info.json
rename to keyboards/jaykeeb/skyline/keyboard.json
diff --git a/keyboards/jaykeeb/skyline/rules.mk b/keyboards/jaykeeb/skyline/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/jaykeeb/skyline/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/jaykeeb/sriwedari70/info.json b/keyboards/jaykeeb/sriwedari70/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/sriwedari70/info.json
rename to keyboards/jaykeeb/sriwedari70/keyboard.json
diff --git a/keyboards/jaykeeb/sriwedari70/rules.mk b/keyboards/jaykeeb/sriwedari70/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/jaykeeb/sriwedari70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/jaykeeb/tokki/info.json b/keyboards/jaykeeb/tokki/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/tokki/info.json
rename to keyboards/jaykeeb/tokki/keyboard.json
diff --git a/keyboards/jaykeeb/tokki/rules.mk b/keyboards/jaykeeb/tokki/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jaykeeb/tokki/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/keyboard.json
similarity index 100%
rename from keyboards/jels/boaty/info.json
rename to keyboards/jels/boaty/keyboard.json
diff --git a/keyboards/jels/boaty/rules.mk b/keyboards/jels/boaty/rules.mk
deleted file mode 100644
index 837f4bffb53..00000000000
--- a/keyboards/jels/boaty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
diff --git a/keyboards/jels/jels60/v1/info.json b/keyboards/jels/jels60/v1/keyboard.json
similarity index 100%
rename from keyboards/jels/jels60/v1/info.json
rename to keyboards/jels/jels60/v1/keyboard.json
diff --git a/keyboards/jels/jels60/v1/rules.mk b/keyboards/jels/jels60/v1/rules.mk
deleted file mode 100644
index 5566e1323fa..00000000000
--- a/keyboards/jels/jels60/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# left blank intentionally
diff --git a/keyboards/jels/jels60/v2/info.json b/keyboards/jels/jels60/v2/keyboard.json
similarity index 100%
rename from keyboards/jels/jels60/v2/info.json
rename to keyboards/jels/jels60/v2/keyboard.json
diff --git a/keyboards/jels/jels60/v2/rules.mk b/keyboards/jels/jels60/v2/rules.mk
deleted file mode 100644
index e0b4f1030fb..00000000000
--- a/keyboards/jels/jels60/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# left blank intentionally
\ No newline at end of file
diff --git a/keyboards/jidohun/km113/info.json b/keyboards/jidohun/km113/keyboard.json
similarity index 100%
rename from keyboards/jidohun/km113/info.json
rename to keyboards/jidohun/km113/keyboard.json
diff --git a/keyboards/jidohun/km113/rules.mk b/keyboards/jidohun/km113/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jidohun/km113/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jukaie/jk01/info.json b/keyboards/jukaie/jk01/keyboard.json
similarity index 100%
rename from keyboards/jukaie/jk01/info.json
rename to keyboards/jukaie/jk01/keyboard.json
diff --git a/keyboards/jukaie/jk01/rules.mk b/keyboards/jukaie/jk01/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/jukaie/jk01/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/keyboard.json
similarity index 100%
rename from keyboards/kakunpc/angel64/alpha/info.json
rename to keyboards/kakunpc/angel64/alpha/keyboard.json
diff --git a/keyboards/kakunpc/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/keyboard.json
similarity index 100%
rename from keyboards/kakunpc/angel64/rev1/info.json
rename to keyboards/kakunpc/angel64/rev1/keyboard.json
diff --git a/keyboards/kakunpc/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kalakos/bahrnob/info.json b/keyboards/kalakos/bahrnob/keyboard.json
similarity index 100%
rename from keyboards/kalakos/bahrnob/info.json
rename to keyboards/kalakos/bahrnob/keyboard.json
diff --git a/keyboards/kalakos/bahrnob/rules.mk b/keyboards/kalakos/bahrnob/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kalakos/bahrnob/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/keyboard.json
similarity index 100%
rename from keyboards/kapcave/paladinpad/rev1/info.json
rename to keyboards/kapcave/paladinpad/rev1/keyboard.json
diff --git a/keyboards/kapcave/paladinpad/rev1/rules.mk b/keyboards/kapcave/paladinpad/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/keyboard.json
similarity index 100%
rename from keyboards/kapcave/paladinpad/rev2/info.json
rename to keyboards/kapcave/paladinpad/rev2/keyboard.json
diff --git a/keyboards/kapcave/paladinpad/rev2/rules.mk b/keyboards/kapcave/paladinpad/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kb_elmo/bm42/info.json b/keyboards/kb_elmo/bm42/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/bm42/info.json
rename to keyboards/kb_elmo/bm42/keyboard.json
diff --git a/keyboards/kb_elmo/bm42/rules.mk b/keyboards/kb_elmo/bm42/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kb_elmo/bm42/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kb_elmo/dizzy40/info.json b/keyboards/kb_elmo/dizzy40/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/dizzy40/info.json
rename to keyboards/kb_elmo/dizzy40/keyboard.json
diff --git a/keyboards/kb_elmo/dizzy40/rules.mk b/keyboards/kb_elmo/dizzy40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kb_elmo/dizzy40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kb_elmo/eliza/info.json b/keyboards/kb_elmo/eliza/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/eliza/info.json
rename to keyboards/kb_elmo/eliza/keyboard.json
diff --git a/keyboards/kb_elmo/eliza/rules.mk b/keyboards/kb_elmo/eliza/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kb_elmo/eliza/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kb_elmo/gamehand/info.json b/keyboards/kb_elmo/gamehand/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/gamehand/info.json
rename to keyboards/kb_elmo/gamehand/keyboard.json
diff --git a/keyboards/kb_elmo/gamehand/rules.mk b/keyboards/kb_elmo/gamehand/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kb_elmo/gamehand/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/keyboard.json
similarity index 100%
rename from keyboards/kbdcraft/adam64/info.json
rename to keyboards/kbdcraft/adam64/keyboard.json
diff --git a/keyboards/kbdcraft/adam64/rules.mk b/keyboards/kbdcraft/adam64/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/kbdcraft/adam64/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/kbdfans/d45/v2/info.json b/keyboards/kbdfans/d45/v2/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/d45/v2/info.json
rename to keyboards/kbdfans/d45/v2/keyboard.json
diff --git a/keyboards/kbdfans/d45/v2/rules.mk b/keyboards/kbdfans/d45/v2/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kbdfans/d45/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/kbd67/rev1/info.json
rename to keyboards/kbdfans/kbd67/rev1/keyboard.json
diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/kbdpad/mk3/info.json
rename to keyboards/kbdfans/kbdpad/mk3/keyboard.json
diff --git a/keyboards/kbdfans/kbdpad/mk3/rules.mk b/keyboards/kbdfans/kbdpad/mk3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kbdfans/kbdpad/mk3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/odinmini/info.json
rename to keyboards/kbdfans/odinmini/keyboard.json
diff --git a/keyboards/kbdfans/odinmini/rules.mk b/keyboards/kbdfans/odinmini/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/tiger80/info.json
rename to keyboards/kbdfans/tiger80/keyboard.json
diff --git a/keyboards/kbdfans/tiger80/rules.mk b/keyboards/kbdfans/tiger80/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/keyboard.json
similarity index 100%
rename from keyboards/keebio/bamfk1/info.json
rename to keyboards/keebio/bamfk1/keyboard.json
diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebio/bamfk1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keebio/chocopad/rev1/info.json b/keyboards/keebio/chocopad/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/chocopad/rev1/info.json
rename to keyboards/keebio/chocopad/rev1/keyboard.json
diff --git a/keyboards/keebio/chocopad/rev1/rules.mk b/keyboards/keebio/chocopad/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebio/chocopad/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keebio/chocopad/rev2/info.json b/keyboards/keebio/chocopad/rev2/keyboard.json
similarity index 100%
rename from keyboards/keebio/chocopad/rev2/info.json
rename to keyboards/keebio/chocopad/rev2/keyboard.json
diff --git a/keyboards/keebio/chocopad/rev2/rules.mk b/keyboards/keebio/chocopad/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebio/chocopad/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/convolution/rev1/info.json
rename to keyboards/keebio/convolution/rev1/keyboard.json
diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/keyboard.json
similarity index 100%
rename from keyboards/keebio/nyquistpad/info.json
rename to keyboards/keebio/nyquistpad/keyboard.json
diff --git a/keyboards/keebio/nyquistpad/rules.mk b/keyboards/keebio/nyquistpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebio/nyquistpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/sinc/rev1/info.json
rename to keyboards/keebio/sinc/rev1/keyboard.json
diff --git a/keyboards/keebio/sinc/rev1/rules.mk b/keyboards/keebio/sinc/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebio/sinc/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/keyboard.json
similarity index 100%
rename from keyboards/keebio/sinc/rev2/info.json
rename to keyboards/keebio/sinc/rev2/keyboard.json
diff --git a/keyboards/keebio/sinc/rev2/rules.mk b/keyboards/keebio/sinc/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebio/sinc/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keebsforall/freebird75/info.json b/keyboards/keebsforall/freebird75/keyboard.json
similarity index 100%
rename from keyboards/keebsforall/freebird75/info.json
rename to keyboards/keebsforall/freebird75/keyboard.json
diff --git a/keyboards/keebsforall/freebird75/rules.mk b/keyboards/keebsforall/freebird75/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keebsforall/freebird75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kelwin/utopia88/info.json b/keyboards/kelwin/utopia88/keyboard.json
similarity index 100%
rename from keyboards/kelwin/utopia88/info.json
rename to keyboards/kelwin/utopia88/keyboard.json
diff --git a/keyboards/kelwin/utopia88/rules.mk b/keyboards/kelwin/utopia88/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kelwin/utopia88/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/keyboard.json
similarity index 100%
rename from keyboards/kepler_33/proto/info.json
rename to keyboards/kepler_33/proto/keyboard.json
diff --git a/keyboards/kepler_33/proto/rules.mk b/keyboards/kepler_33/proto/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/keyboard.json
similarity index 100%
rename from keyboards/keycapsss/kimiko/rev1/info.json
rename to keyboards/keycapsss/kimiko/rev1/keyboard.json
diff --git a/keyboards/keycapsss/kimiko/rev1/rules.mk b/keyboards/keycapsss/kimiko/rev1/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/keycapsss/kimiko/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/keycapsss/kimiko/rev2/info.json b/keyboards/keycapsss/kimiko/rev2/keyboard.json
similarity index 100%
rename from keyboards/keycapsss/kimiko/rev2/info.json
rename to keyboards/keycapsss/kimiko/rev2/keyboard.json
diff --git a/keyboards/keycapsss/kimiko/rev2/rules.mk b/keyboards/keycapsss/kimiko/rev2/rules.mk
deleted file mode 100644
index 7d895c7f4df..00000000000
--- a/keyboards/keycapsss/kimiko/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File is left intentionally blank
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/info.json b/keyboards/keychron/c1_pro/ansi/rgb/keyboard.json
similarity index 100%
rename from keyboards/keychron/c1_pro/ansi/rgb/info.json
rename to keyboards/keychron/c1_pro/ansi/rgb/keyboard.json
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk b/keyboards/keychron/c1_pro/ansi/rgb/rules.mk
deleted file mode 100644
index 7307f9f9e79..00000000000
--- a/keyboards/keychron/c1_pro/ansi/rgb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Build Options
diff --git a/keyboards/keychron/c1_pro/ansi/white/info.json b/keyboards/keychron/c1_pro/ansi/white/keyboard.json
similarity index 100%
rename from keyboards/keychron/c1_pro/ansi/white/info.json
rename to keyboards/keychron/c1_pro/ansi/white/keyboard.json
diff --git a/keyboards/keychron/c1_pro/ansi/white/rules.mk b/keyboards/keychron/c1_pro/ansi/white/rules.mk
deleted file mode 100644
index 7307f9f9e79..00000000000
--- a/keyboards/keychron/c1_pro/ansi/white/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Build Options
diff --git a/keyboards/keychron/q0/base/info.json b/keyboards/keychron/q0/base/keyboard.json
similarity index 100%
rename from keyboards/keychron/q0/base/info.json
rename to keyboards/keychron/q0/base/keyboard.json
diff --git a/keyboards/keychron/q0/base/rules.mk b/keyboards/keychron/q0/base/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q0/base/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q0/plus/info.json b/keyboards/keychron/q0/plus/keyboard.json
similarity index 100%
rename from keyboards/keychron/q0/plus/info.json
rename to keyboards/keychron/q0/plus/keyboard.json
diff --git a/keyboards/keychron/q0/plus/rules.mk b/keyboards/keychron/q0/plus/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q0/plus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/info.json b/keyboards/keychron/q1v1/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v1/ansi/info.json
rename to keyboards/keychron/q1v1/ansi/keyboard.json
diff --git a/keyboards/keychron/q1v1/ansi/rules.mk b/keyboards/keychron/q1v1/ansi/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q1v1/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi_encoder/info.json b/keyboards/keychron/q1v1/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v1/ansi_encoder/info.json
rename to keyboards/keychron/q1v1/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q1v1/ansi_encoder/rules.mk b/keyboards/keychron/q1v1/ansi_encoder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q1v1/ansi_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q1v1/iso/info.json b/keyboards/keychron/q1v1/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v1/iso/info.json
rename to keyboards/keychron/q1v1/iso/keyboard.json
diff --git a/keyboards/keychron/q1v1/iso/rules.mk b/keyboards/keychron/q1v1/iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q1v1/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso_encoder/info.json b/keyboards/keychron/q1v1/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q1v1/iso_encoder/info.json
rename to keyboards/keychron/q1v1/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q1v1/iso_encoder/rules.mk b/keyboards/keychron/q1v1/iso_encoder/rules.mk
deleted file mode 100644
index 6968c523355..00000000000
--- a/keyboards/keychron/q1v1/iso_encoder/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-
diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q2/ansi/info.json
rename to keyboards/keychron/q2/ansi/keyboard.json
diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q2/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q2/ansi_encoder/info.json
rename to keyboards/keychron/q2/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q2/ansi_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q2/iso/info.json
rename to keyboards/keychron/q2/iso/keyboard.json
diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q2/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q2/iso_encoder/info.json
rename to keyboards/keychron/q2/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q2/iso_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/keyboard.json
similarity index 100%
rename from keyboards/keychron/q2/jis/info.json
rename to keyboards/keychron/q2/jis/keyboard.json
diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q2/jis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q2/jis_encoder/info.json
rename to keyboards/keychron/q2/jis_encoder/keyboard.json
diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q2/jis_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q3/ansi/info.json
rename to keyboards/keychron/q3/ansi/keyboard.json
diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q3/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q3/iso/info.json
rename to keyboards/keychron/q3/iso/keyboard.json
diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q3/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/keyboard.json
similarity index 100%
rename from keyboards/keychron/q3/jis/info.json
rename to keyboards/keychron/q3/jis/keyboard.json
diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q3/jis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q4/iso/info.json
rename to keyboards/keychron/q4/iso/keyboard.json
diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q4/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q7/ansi/info.json
rename to keyboards/keychron/q7/ansi/keyboard.json
diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q7/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q7/iso/info.json
rename to keyboards/keychron/q7/iso/keyboard.json
diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q7/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q8/ansi/info.json
rename to keyboards/keychron/q8/ansi/keyboard.json
diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q8/ansi_encoder/info.json
rename to keyboards/keychron/q8/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q8/iso/info.json
rename to keyboards/keychron/q8/iso/keyboard.json
diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q8/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q8/iso_encoder/info.json
rename to keyboards/keychron/q8/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/keyboard.json
similarity index 100%
rename from keyboards/keychron/q9/ansi/info.json
rename to keyboards/keychron/q9/ansi/keyboard.json
diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q9/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q9/ansi_encoder/info.json
rename to keyboards/keychron/q9/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q9/ansi_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/keyboard.json
similarity index 100%
rename from keyboards/keychron/q9/iso/info.json
rename to keyboards/keychron/q9/iso/keyboard.json
diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/keychron/q9/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q9/iso_encoder/info.json
rename to keyboards/keychron/q9/iso_encoder/keyboard.json
diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/keychron/q9/iso_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/info.json b/keyboards/keychron/q9_plus/ansi_encoder/keyboard.json
similarity index 100%
rename from keyboards/keychron/q9_plus/ansi_encoder/info.json
rename to keyboards/keychron/q9_plus/ansi_encoder/keyboard.json
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/rules.mk b/keyboards/keychron/q9_plus/ansi_encoder/rules.mk
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/keyboards/keyspensory/kp60/info.json b/keyboards/keyspensory/kp60/keyboard.json
similarity index 100%
rename from keyboards/keyspensory/kp60/info.json
rename to keyboards/keyspensory/kp60/keyboard.json
diff --git a/keyboards/keyspensory/kp60/rules.mk b/keyboards/keyspensory/kp60/rules.mk
deleted file mode 100644
index 2c49b41d7a0..00000000000
--- a/keyboards/keyspensory/kp60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keyten/diablo/info.json b/keyboards/keyten/diablo/keyboard.json
similarity index 100%
rename from keyboards/keyten/diablo/info.json
rename to keyboards/keyten/diablo/keyboard.json
diff --git a/keyboards/keyten/diablo/rules.mk b/keyboards/keyten/diablo/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/keyten/kt60hs_t/info.json b/keyboards/keyten/kt60hs_t/keyboard.json
similarity index 100%
rename from keyboards/keyten/kt60hs_t/info.json
rename to keyboards/keyten/kt60hs_t/keyboard.json
diff --git a/keyboards/keyten/kt60hs_t/rules.mk b/keyboards/keyten/kt60hs_t/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kezewa/enter67/info.json b/keyboards/kezewa/enter67/keyboard.json
similarity index 100%
rename from keyboards/kezewa/enter67/info.json
rename to keyboards/kezewa/enter67/keyboard.json
diff --git a/keyboards/kezewa/enter67/rules.mk b/keyboards/kezewa/enter67/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kezewa/enter67/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kezewa/enter80/info.json b/keyboards/kezewa/enter80/keyboard.json
similarity index 100%
rename from keyboards/kezewa/enter80/info.json
rename to keyboards/kezewa/enter80/keyboard.json
diff --git a/keyboards/kezewa/enter80/rules.mk b/keyboards/kezewa/enter80/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kezewa/enter80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kibou/fukuro/info.json b/keyboards/kibou/fukuro/keyboard.json
similarity index 100%
rename from keyboards/kibou/fukuro/info.json
rename to keyboards/kibou/fukuro/keyboard.json
diff --git a/keyboards/kibou/fukuro/rules.mk b/keyboards/kibou/fukuro/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kibou/fukuro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kibou/harbour/info.json b/keyboards/kibou/harbour/keyboard.json
similarity index 100%
rename from keyboards/kibou/harbour/info.json
rename to keyboards/kibou/harbour/keyboard.json
diff --git a/keyboards/kibou/harbour/rules.mk b/keyboards/kibou/harbour/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kibou/harbour/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kibou/suisei/info.json b/keyboards/kibou/suisei/keyboard.json
similarity index 100%
rename from keyboards/kibou/suisei/info.json
rename to keyboards/kibou/suisei/keyboard.json
diff --git a/keyboards/kibou/suisei/rules.mk b/keyboards/kibou/suisei/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kibou/suisei/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kibou/wendy/info.json b/keyboards/kibou/wendy/keyboard.json
similarity index 100%
rename from keyboards/kibou/wendy/info.json
rename to keyboards/kibou/wendy/keyboard.json
diff --git a/keyboards/kibou/wendy/rules.mk b/keyboards/kibou/wendy/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kibou/wendy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kibou/winter/info.json b/keyboards/kibou/winter/keyboard.json
similarity index 100%
rename from keyboards/kibou/winter/info.json
rename to keyboards/kibou/winter/keyboard.json
diff --git a/keyboards/kibou/winter/rules.mk b/keyboards/kibou/winter/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kibou/winter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/keyboard.json
similarity index 100%
rename from keyboards/kin80/blackpill103/info.json
rename to keyboards/kin80/blackpill103/keyboard.json
diff --git a/keyboards/kin80/blackpill103/rules.mk b/keyboards/kin80/blackpill103/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/kin80/blackpill103/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/keyboard.json
similarity index 100%
rename from keyboards/kin80/micro/info.json
rename to keyboards/kin80/micro/keyboard.json
diff --git a/keyboards/kin80/micro/rules.mk b/keyboards/kin80/micro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kint2pp/info.json
rename to keyboards/kinesis/kint2pp/keyboard.json
diff --git a/keyboards/kinesis/kint2pp/rules.mk b/keyboards/kinesis/kint2pp/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kint36/info.json
rename to keyboards/kinesis/kint36/keyboard.json
diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kinesis/kintwin/info.json b/keyboards/kinesis/kintwin/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kintwin/info.json
rename to keyboards/kinesis/kintwin/keyboard.json
diff --git a/keyboards/kinesis/kintwin/rules.mk b/keyboards/kinesis/kintwin/rules.mk
deleted file mode 100644
index 3922c569c4e..00000000000
--- a/keyboards/kinesis/kintwin/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
\ No newline at end of file
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/keyboard.json
similarity index 100%
rename from keyboards/kinesis/stapelberg/info.json
rename to keyboards/kinesis/stapelberg/keyboard.json
diff --git a/keyboards/kinesis/stapelberg/rules.mk b/keyboards/kinesis/stapelberg/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kisakeyluxury/qtz/info.json b/keyboards/kisakeyluxury/qtz/keyboard.json
similarity index 100%
rename from keyboards/kisakeyluxury/qtz/info.json
rename to keyboards/kisakeyluxury/qtz/keyboard.json
diff --git a/keyboards/kisakeyluxury/qtz/rules.mk b/keyboards/kisakeyluxury/qtz/rules.mk
deleted file mode 100644
index 0d24fc28579..00000000000
--- a/keyboards/kisakeyluxury/qtz/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kiserdesigns/madeline/info.json b/keyboards/kiserdesigns/madeline/keyboard.json
similarity index 100%
rename from keyboards/kiserdesigns/madeline/info.json
rename to keyboards/kiserdesigns/madeline/keyboard.json
diff --git a/keyboards/kiserdesigns/madeline/rules.mk b/keyboards/kiserdesigns/madeline/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kiserdesigns/madeline/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kj_modify/rs40/info.json b/keyboards/kj_modify/rs40/keyboard.json
similarity index 100%
rename from keyboards/kj_modify/rs40/info.json
rename to keyboards/kj_modify/rs40/keyboard.json
diff --git a/keyboards/kj_modify/rs40/rules.mk b/keyboards/kj_modify/rs40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kj_modify/rs40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kk/65/info.json b/keyboards/kk/65/keyboard.json
similarity index 100%
rename from keyboards/kk/65/info.json
rename to keyboards/kk/65/keyboard.json
diff --git a/keyboards/kk/65/rules.mk b/keyboards/kk/65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kk/65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kopibeng/mnk60/info.json b/keyboards/kopibeng/mnk60/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/mnk60/info.json
rename to keyboards/kopibeng/mnk60/keyboard.json
diff --git a/keyboards/kopibeng/mnk60/rules.mk b/keyboards/kopibeng/mnk60/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kopibeng/mnk60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kopibeng/mnk60_stm32/info.json b/keyboards/kopibeng/mnk60_stm32/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/mnk60_stm32/info.json
rename to keyboards/kopibeng/mnk60_stm32/keyboard.json
diff --git a/keyboards/kopibeng/mnk60_stm32/rules.mk b/keyboards/kopibeng/mnk60_stm32/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kopibeng/mnk60_stm32/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kopibeng/tgr_lena/info.json b/keyboards/kopibeng/tgr_lena/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/tgr_lena/info.json
rename to keyboards/kopibeng/tgr_lena/keyboard.json
diff --git a/keyboards/kopibeng/tgr_lena/rules.mk b/keyboards/kopibeng/tgr_lena/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kopibeng/tgr_lena/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/bm16a/v1/info.json
rename to keyboards/kprepublic/bm16a/v1/keyboard.json
diff --git a/keyboards/kprepublic/bm16a/v1/rules.mk b/keyboards/kprepublic/bm16a/v1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kprepublic/bm16a/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/bm16a/v2/info.json
rename to keyboards/kprepublic/bm16a/v2/keyboard.json
diff --git a/keyboards/kprepublic/bm16a/v2/rules.mk b/keyboards/kprepublic/bm16a/v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/info.json b/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/bm40hsrgb/rev2/info.json
rename to keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kprepublic/cstc40/daughterboard/info.json b/keyboards/kprepublic/cstc40/daughterboard/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/cstc40/daughterboard/info.json
rename to keyboards/kprepublic/cstc40/daughterboard/keyboard.json
diff --git a/keyboards/kprepublic/cstc40/daughterboard/rules.mk b/keyboards/kprepublic/cstc40/daughterboard/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kprepublic/cstc40/daughterboard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/info.json b/keyboards/kprepublic/cstc40/single_pcb/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/cstc40/single_pcb/info.json
rename to keyboards/kprepublic/cstc40/single_pcb/keyboard.json
diff --git a/keyboards/kprepublic/cstc40/single_pcb/rules.mk b/keyboards/kprepublic/cstc40/single_pcb/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kprepublic/cstc40/single_pcb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kradoindustries/kousa/info.json b/keyboards/kradoindustries/kousa/keyboard.json
similarity index 100%
rename from keyboards/kradoindustries/kousa/info.json
rename to keyboards/kradoindustries/kousa/keyboard.json
diff --git a/keyboards/kradoindustries/kousa/rules.mk b/keyboards/kradoindustries/kousa/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kradoindustries/kousa/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kradoindustries/krado66/info.json b/keyboards/kradoindustries/krado66/keyboard.json
similarity index 100%
rename from keyboards/kradoindustries/krado66/info.json
rename to keyboards/kradoindustries/krado66/keyboard.json
diff --git a/keyboards/kradoindustries/krado66/rules.mk b/keyboards/kradoindustries/krado66/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/kradoindustries/krado66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/kradoindustries/promenade/info.json b/keyboards/kradoindustries/promenade/keyboard.json
similarity index 100%
rename from keyboards/kradoindustries/promenade/info.json
rename to keyboards/kradoindustries/promenade/keyboard.json
diff --git a/keyboards/kradoindustries/promenade/rules.mk b/keyboards/kradoindustries/promenade/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kradoindustries/promenade/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kraken_jones/pteron56/info.json b/keyboards/kraken_jones/pteron56/keyboard.json
similarity index 100%
rename from keyboards/kraken_jones/pteron56/info.json
rename to keyboards/kraken_jones/pteron56/keyboard.json
diff --git a/keyboards/kraken_jones/pteron56/rules.mk b/keyboards/kraken_jones/pteron56/rules.mk
deleted file mode 100644
index 876618b9d13..00000000000
--- a/keyboards/kraken_jones/pteron56/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File is intentionally blank
diff --git a/keyboards/kumaokobo/kudox/columner/info.json b/keyboards/kumaokobo/kudox/columner/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/kudox/columner/info.json
rename to keyboards/kumaokobo/kudox/columner/keyboard.json
diff --git a/keyboards/kumaokobo/kudox/columner/rules.mk b/keyboards/kumaokobo/kudox/columner/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kumaokobo/kudox/rev1/info.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/kudox/rev1/info.json
rename to keyboards/kumaokobo/kudox/rev1/keyboard.json
diff --git a/keyboards/kumaokobo/kudox/rev1/rules.mk b/keyboards/kumaokobo/kudox/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kumaokobo/kudox/rev2/info.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/kudox/rev2/info.json
rename to keyboards/kumaokobo/kudox/rev2/keyboard.json
diff --git a/keyboards/kumaokobo/kudox/rev2/rules.mk b/keyboards/kumaokobo/kudox/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kumaokobo/kudox/rev3/info.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/kudox/rev3/info.json
rename to keyboards/kumaokobo/kudox/rev3/keyboard.json
diff --git a/keyboards/kumaokobo/kudox/rev3/rules.mk b/keyboards/kumaokobo/kudox/rev3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kumaokobo/kudox_game/rev1/info.json b/keyboards/kumaokobo/kudox_game/rev1/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/kudox_game/rev1/info.json
rename to keyboards/kumaokobo/kudox_game/rev1/keyboard.json
diff --git a/keyboards/kumaokobo/kudox_game/rev1/rules.mk b/keyboards/kumaokobo/kudox_game/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kumaokobo/pico/65keys/info.json b/keyboards/kumaokobo/pico/65keys/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/pico/65keys/info.json
rename to keyboards/kumaokobo/pico/65keys/keyboard.json
diff --git a/keyboards/kumaokobo/pico/65keys/rules.mk b/keyboards/kumaokobo/pico/65keys/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kumaokobo/pico/70keys/info.json b/keyboards/kumaokobo/pico/70keys/keyboard.json
similarity index 100%
rename from keyboards/kumaokobo/pico/70keys/info.json
rename to keyboards/kumaokobo/pico/70keys/keyboard.json
diff --git a/keyboards/kumaokobo/pico/70keys/rules.mk b/keyboards/kumaokobo/pico/70keys/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/keyboard.json
similarity index 100%
rename from keyboards/kuro/kuro65/info.json
rename to keyboards/kuro/kuro65/keyboard.json
diff --git a/keyboards/kuro/kuro65/rules.mk b/keyboards/kuro/kuro65/rules.mk
deleted file mode 100644
index d6b023bddce..00000000000
--- a/keyboards/kuro/kuro65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is left blank intentionally. See info.json for config.
\ No newline at end of file
diff --git a/keyboards/kwstudio/pisces/info.json b/keyboards/kwstudio/pisces/keyboard.json
similarity index 100%
rename from keyboards/kwstudio/pisces/info.json
rename to keyboards/kwstudio/pisces/keyboard.json
diff --git a/keyboards/kwstudio/pisces/rules.mk b/keyboards/kwstudio/pisces/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kwstudio/pisces/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kwstudio/scorpio/info.json b/keyboards/kwstudio/scorpio/keyboard.json
similarity index 100%
rename from keyboards/kwstudio/scorpio/info.json
rename to keyboards/kwstudio/scorpio/keyboard.json
diff --git a/keyboards/kwstudio/scorpio/rules.mk b/keyboards/kwstudio/scorpio/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kwstudio/scorpio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kwstudio/scorpio_rev2/info.json b/keyboards/kwstudio/scorpio_rev2/keyboard.json
similarity index 100%
rename from keyboards/kwstudio/scorpio_rev2/info.json
rename to keyboards/kwstudio/scorpio_rev2/keyboard.json
diff --git a/keyboards/kwstudio/scorpio_rev2/rules.mk b/keyboards/kwstudio/scorpio_rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/kwstudio/scorpio_rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/keyboard.json
similarity index 100%
rename from keyboards/laneware/raindrop/info.json
rename to keyboards/laneware/raindrop/keyboard.json
diff --git a/keyboards/laneware/raindrop/rules.mk b/keyboards/laneware/raindrop/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/laser_ninja/pumpkinpad/info.json b/keyboards/laser_ninja/pumpkinpad/keyboard.json
similarity index 100%
rename from keyboards/laser_ninja/pumpkinpad/info.json
rename to keyboards/laser_ninja/pumpkinpad/keyboard.json
diff --git a/keyboards/laser_ninja/pumpkinpad/rules.mk b/keyboards/laser_ninja/pumpkinpad/rules.mk
deleted file mode 100644
index 08a1c1568c9..00000000000
--- a/keyboards/laser_ninja/pumpkinpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank.
diff --git a/keyboards/lendunistus/rpneko65/rev1/info.json b/keyboards/lendunistus/rpneko65/rev1/keyboard.json
similarity index 100%
rename from keyboards/lendunistus/rpneko65/rev1/info.json
rename to keyboards/lendunistus/rpneko65/rev1/keyboard.json
diff --git a/keyboards/lendunistus/rpneko65/rev1/rules.mk b/keyboards/lendunistus/rpneko65/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/lendunistus/rpneko65/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/lets_split/rev1/info.json b/keyboards/lets_split/rev1/keyboard.json
similarity index 100%
rename from keyboards/lets_split/rev1/info.json
rename to keyboards/lets_split/rev1/keyboard.json
diff --git a/keyboards/lets_split/rev1/rules.mk b/keyboards/lets_split/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/lfk65_hs/info.json
rename to keyboards/lfkeyboards/lfk65_hs/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk65_hs/rules.mk b/keyboards/lfkeyboards/lfk65_hs/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/lfk78/revb/info.json
rename to keyboards/lfkeyboards/lfk78/revb/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk78/revb/rules.mk b/keyboards/lfkeyboards/lfk78/revb/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/lfk78/revc/info.json
rename to keyboards/lfkeyboards/lfk78/revc/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk78/revc/rules.mk b/keyboards/lfkeyboards/lfk78/revc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/lfk87/reva/info.json b/keyboards/lfkeyboards/lfk87/reva/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/lfk87/reva/info.json
rename to keyboards/lfkeyboards/lfk87/reva/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk87/reva/rules.mk b/keyboards/lfkeyboards/lfk87/reva/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/lfk87/revc/info.json b/keyboards/lfkeyboards/lfk87/revc/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/lfk87/revc/info.json
rename to keyboards/lfkeyboards/lfk87/revc/keyboard.json
diff --git a/keyboards/lfkeyboards/lfk87/revc/rules.mk b/keyboards/lfkeyboards/lfk87/revc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/smk65/revb/info.json
rename to keyboards/lfkeyboards/smk65/revb/keyboard.json
diff --git a/keyboards/lfkeyboards/smk65/revb/rules.mk b/keyboards/lfkeyboards/smk65/revb/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lfkeyboards/smk65/revf/info.json b/keyboards/lfkeyboards/smk65/revf/keyboard.json
similarity index 100%
rename from keyboards/lfkeyboards/smk65/revf/info.json
rename to keyboards/lfkeyboards/smk65/revf/keyboard.json
diff --git a/keyboards/lfkeyboards/smk65/revf/rules.mk b/keyboards/lfkeyboards/smk65/revf/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/lgbtkl/info.json b/keyboards/lgbtkl/keyboard.json
similarity index 100%
rename from keyboards/lgbtkl/info.json
rename to keyboards/lgbtkl/keyboard.json
diff --git a/keyboards/lgbtkl/rules.mk b/keyboards/lgbtkl/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/lgbtkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/keyboard.json
similarity index 100%
rename from keyboards/lily58/rev1/info.json
rename to keyboards/lily58/rev1/keyboard.json
diff --git a/keyboards/lily58/rev1/rules.mk b/keyboards/lily58/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/keyboard.json
similarity index 100%
rename from keyboards/linworks/em8/info.json
rename to keyboards/linworks/em8/keyboard.json
diff --git a/keyboards/linworks/em8/rules.mk b/keyboards/linworks/em8/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/linworks/em8/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/linworks/fave60/info.json b/keyboards/linworks/fave60/keyboard.json
similarity index 100%
rename from keyboards/linworks/fave60/info.json
rename to keyboards/linworks/fave60/keyboard.json
diff --git a/keyboards/linworks/fave60/rules.mk b/keyboards/linworks/fave60/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/linworks/fave60a/info.json b/keyboards/linworks/fave60a/keyboard.json
similarity index 100%
rename from keyboards/linworks/fave60a/info.json
rename to keyboards/linworks/fave60a/keyboard.json
diff --git a/keyboards/linworks/fave60a/rules.mk b/keyboards/linworks/fave60a/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/linworks/favepada/info.json b/keyboards/linworks/favepada/keyboard.json
similarity index 100%
rename from keyboards/linworks/favepada/info.json
rename to keyboards/linworks/favepada/keyboard.json
diff --git a/keyboards/linworks/favepada/rules.mk b/keyboards/linworks/favepada/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/macrocat/info.json b/keyboards/macrocat/keyboard.json
similarity index 100%
rename from keyboards/macrocat/info.json
rename to keyboards/macrocat/keyboard.json
diff --git a/keyboards/macrocat/rules.mk b/keyboards/macrocat/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/macrocat/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/magic_force/mf17/info.json b/keyboards/magic_force/mf17/keyboard.json
similarity index 100%
rename from keyboards/magic_force/mf17/info.json
rename to keyboards/magic_force/mf17/keyboard.json
diff --git a/keyboards/magic_force/mf17/rules.mk b/keyboards/magic_force/mf17/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/magic_force/mf17/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/keyboard.json
similarity index 100%
rename from keyboards/makenova/omega/omega4/info.json
rename to keyboards/makenova/omega/omega4/keyboard.json
diff --git a/keyboards/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/makenova/omega/omega4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/keyboard.json
similarity index 100%
rename from keyboards/maple_computing/ivy/rev1/info.json
rename to keyboards/maple_computing/ivy/rev1/keyboard.json
diff --git a/keyboards/maple_computing/ivy/rev1/rules.mk b/keyboards/maple_computing/ivy/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json
similarity index 100%
rename from keyboards/maple_computing/launchpad/rev1/info.json
rename to keyboards/maple_computing/launchpad/rev1/keyboard.json
diff --git a/keyboards/maple_computing/launchpad/rev1/rules.mk b/keyboards/maple_computing/launchpad/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mariorion_v25/prod/info.json b/keyboards/mariorion_v25/prod/keyboard.json
similarity index 100%
rename from keyboards/mariorion_v25/prod/info.json
rename to keyboards/mariorion_v25/prod/keyboard.json
diff --git a/keyboards/mariorion_v25/prod/rules.mk b/keyboards/mariorion_v25/prod/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mariorion_v25/prod/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mariorion_v25/proto/info.json b/keyboards/mariorion_v25/proto/keyboard.json
similarity index 100%
rename from keyboards/mariorion_v25/proto/info.json
rename to keyboards/mariorion_v25/proto/keyboard.json
diff --git a/keyboards/mariorion_v25/proto/rules.mk b/keyboards/mariorion_v25/proto/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mariorion_v25/proto/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/keyboard.json
similarity index 100%
rename from keyboards/marksard/rhymestone/rev1/info.json
rename to keyboards/marksard/rhymestone/rev1/keyboard.json
diff --git a/keyboards/marksard/rhymestone/rev1/rules.mk b/keyboards/marksard/rhymestone/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/keyboard.json
similarity index 100%
rename from keyboards/marksard/treadstone32/lite/info.json
rename to keyboards/marksard/treadstone32/lite/keyboard.json
diff --git a/keyboards/marksard/treadstone32/lite/rules.mk b/keyboards/marksard/treadstone32/lite/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/keyboard.json
similarity index 100%
rename from keyboards/marksard/treadstone32/rev1/info.json
rename to keyboards/marksard/treadstone32/rev1/keyboard.json
diff --git a/keyboards/marksard/treadstone32/rev1/rules.mk b/keyboards/marksard/treadstone32/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/keyboard.json
similarity index 100%
rename from keyboards/marksard/treadstone48/rev1/info.json
rename to keyboards/marksard/treadstone48/rev1/keyboard.json
diff --git a/keyboards/marksard/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/rev1/rules.mk
deleted file mode 100644
index fff00a1b511..00000000000
--- a/keyboards/marksard/treadstone48/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Revision Specific Build Options
-#   change yes to no to disable
-#
diff --git a/keyboards/marshkeys/flowerpad/info.json b/keyboards/marshkeys/flowerpad/keyboard.json
similarity index 100%
rename from keyboards/marshkeys/flowerpad/info.json
rename to keyboards/marshkeys/flowerpad/keyboard.json
diff --git a/keyboards/marshkeys/flowerpad/rules.mk b/keyboards/marshkeys/flowerpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/marshkeys/flowerpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/matchstickworks/southpad/rev1/info.json b/keyboards/matchstickworks/southpad/rev1/keyboard.json
similarity index 100%
rename from keyboards/matchstickworks/southpad/rev1/info.json
rename to keyboards/matchstickworks/southpad/rev1/keyboard.json
diff --git a/keyboards/matchstickworks/southpad/rev1/rules.mk b/keyboards/matchstickworks/southpad/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/matchstickworks/southpad/rev2/info.json b/keyboards/matchstickworks/southpad/rev2/keyboard.json
similarity index 100%
rename from keyboards/matchstickworks/southpad/rev2/info.json
rename to keyboards/matchstickworks/southpad/rev2/keyboard.json
diff --git a/keyboards/matchstickworks/southpad/rev2/rules.mk b/keyboards/matchstickworks/southpad/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/maxipad/promicro/info.json b/keyboards/maxipad/promicro/keyboard.json
similarity index 100%
rename from keyboards/maxipad/promicro/info.json
rename to keyboards/maxipad/promicro/keyboard.json
diff --git a/keyboards/maxipad/promicro/rules.mk b/keyboards/maxipad/promicro/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/maxipad/teensy2/info.json b/keyboards/maxipad/teensy2/keyboard.json
similarity index 100%
rename from keyboards/maxipad/teensy2/info.json
rename to keyboards/maxipad/teensy2/keyboard.json
diff --git a/keyboards/maxipad/teensy2/rules.mk b/keyboards/maxipad/teensy2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/keyboard.json
similarity index 100%
rename from keyboards/maxr1998/phoebe/info.json
rename to keyboards/maxr1998/phoebe/keyboard.json
diff --git a/keyboards/maxr1998/phoebe/rules.mk b/keyboards/maxr1998/phoebe/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mazestudio/jocker/info.json b/keyboards/mazestudio/jocker/keyboard.json
similarity index 100%
rename from keyboards/mazestudio/jocker/info.json
rename to keyboards/mazestudio/jocker/keyboard.json
diff --git a/keyboards/mazestudio/jocker/rules.mk b/keyboards/mazestudio/jocker/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/mazestudio/jocker/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/keyboard.json
similarity index 100%
rename from keyboards/mechllama/g35/v1/info.json
rename to keyboards/mechllama/g35/v1/keyboard.json
diff --git a/keyboards/mechllama/g35/v1/rules.mk b/keyboards/mechllama/g35/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/keyboard.json
similarity index 100%
rename from keyboards/mechllama/g35/v2/info.json
rename to keyboards/mechllama/g35/v2/keyboard.json
diff --git a/keyboards/mechllama/g35/v2/rules.mk b/keyboards/mechllama/g35/v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
rename to keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
rename to keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
rename to keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/hannah65/rev1/haus/info.json
rename to keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/rules.mk b/keyboards/mechlovin/hannah65/rev1/haus/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/infinity87/rev1/rogue87/info.json
rename to keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/infinity87/rev1/rouge87/info.json
rename to keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk
deleted file mode 100644
index 8b137891791..00000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/mechlovin9/rev3/info.json
rename to keyboards/mechlovin/mechlovin9/rev3/keyboard.json
diff --git a/keyboards/mechlovin/mechlovin9/rev3/rules.mk b/keyboards/mechlovin/mechlovin9/rev3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/olly/jf/rev2/info.json
rename to keyboards/mechlovin/olly/jf/rev2/keyboard.json
diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechlovin/olly/jf/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/olly/octagon/info.json
rename to keyboards/mechlovin/olly/octagon/keyboard.json
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechlovin/olly/octagon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/zed1800/oreum/info.json
rename to keyboards/mechlovin/zed1800/oreum/keyboard.json
diff --git a/keyboards/mechlovin/zed1800/oreum/rules.mk b/keyboards/mechlovin/zed1800/oreum/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/zed1800/saber/info.json
rename to keyboards/mechlovin/zed1800/saber/keyboard.json
diff --git a/keyboards/mechlovin/zed1800/saber/rules.mk b/keyboards/mechlovin/zed1800/saber/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/zed1800/zepsody/info.json
rename to keyboards/mechlovin/zed1800/zepsody/keyboard.json
diff --git a/keyboards/mechlovin/zed1800/zepsody/rules.mk b/keyboards/mechlovin/zed1800/zepsody/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/zed65/910/info.json
rename to keyboards/mechlovin/zed65/910/keyboard.json
diff --git a/keyboards/mechlovin/zed65/910/rules.mk b/keyboards/mechlovin/zed65/910/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/mechlovin/zed65/910/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/zed65/no_backlight/cor65/info.json
rename to keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk b/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechlovin/zed65/rev1/info.json b/keyboards/mechlovin/zed65/rev1/keyboard.json
similarity index 100%
rename from keyboards/mechlovin/zed65/rev1/info.json
rename to keyboards/mechlovin/zed65/rev1/keyboard.json
diff --git a/keyboards/mechlovin/zed65/rev1/rules.mk b/keyboards/mechlovin/zed65/rev1/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/mechlovin/zed65/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/mechwild/bb40/f401/info.json b/keyboards/mechwild/bb40/f401/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bb40/f401/info.json
rename to keyboards/mechwild/bb40/f401/keyboard.json
diff --git a/keyboards/mechwild/bb40/f401/rules.mk b/keyboards/mechwild/bb40/f401/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechwild/bb40/f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bb40/f411/info.json b/keyboards/mechwild/bb40/f411/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bb40/f411/info.json
rename to keyboards/mechwild/bb40/f411/keyboard.json
diff --git a/keyboards/mechwild/bb40/f411/rules.mk b/keyboards/mechwild/bb40/f411/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechwild/bb40/f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bde/lefty/info.json
rename to keyboards/mechwild/bde/lefty/keyboard.json
diff --git a/keyboards/mechwild/bde/lefty/rules.mk b/keyboards/mechwild/bde/lefty/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechwild/bde/lefty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/keyboard.json
similarity index 100%
rename from keyboards/mechwild/bde/righty/info.json
rename to keyboards/mechwild/bde/righty/keyboard.json
diff --git a/keyboards/mechwild/bde/righty/rules.mk b/keyboards/mechwild/bde/righty/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mechwild/bde/righty/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechwild/obe/f401/info.json b/keyboards/mechwild/obe/f401/keyboard.json
similarity index 100%
rename from keyboards/mechwild/obe/f401/info.json
rename to keyboards/mechwild/obe/f401/keyboard.json
diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechwild/obe/f411/info.json b/keyboards/mechwild/obe/f411/keyboard.json
similarity index 100%
rename from keyboards/mechwild/obe/f411/info.json
rename to keyboards/mechwild/obe/f411/keyboard.json
diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechwild/waka60/f401/info.json b/keyboards/mechwild/waka60/f401/keyboard.json
similarity index 100%
rename from keyboards/mechwild/waka60/f401/info.json
rename to keyboards/mechwild/waka60/f401/keyboard.json
diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mechwild/waka60/f411/info.json b/keyboards/mechwild/waka60/f411/keyboard.json
similarity index 100%
rename from keyboards/mechwild/waka60/f411/info.json
rename to keyboards/mechwild/waka60/f411/keyboard.json
diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/meetlab/kafka60/info.json b/keyboards/meetlab/kafka60/keyboard.json
similarity index 100%
rename from keyboards/meetlab/kafka60/info.json
rename to keyboards/meetlab/kafka60/keyboard.json
diff --git a/keyboards/meetlab/kafka60/rules.mk b/keyboards/meetlab/kafka60/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/meetlab/kafka60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/meetlab/kafka68/info.json b/keyboards/meetlab/kafka68/keyboard.json
similarity index 100%
rename from keyboards/meetlab/kafka68/info.json
rename to keyboards/meetlab/kafka68/keyboard.json
diff --git a/keyboards/meetlab/kafka68/rules.mk b/keyboards/meetlab/kafka68/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/meetlab/kafka68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/meetlab/kalice/info.json b/keyboards/meetlab/kalice/keyboard.json
similarity index 100%
rename from keyboards/meetlab/kalice/info.json
rename to keyboards/meetlab/kalice/keyboard.json
diff --git a/keyboards/meetlab/kalice/rules.mk b/keyboards/meetlab/kalice/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/meetlab/kalice/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/info.json b/keyboards/meetlab/rena/keyboard.json
similarity index 100%
rename from keyboards/meetlab/rena/info.json
rename to keyboards/meetlab/rena/keyboard.json
diff --git a/keyboards/meetlab/rena/rules.mk b/keyboards/meetlab/rena/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/meetlab/rena/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/meletrix/zoom75/info.json b/keyboards/meletrix/zoom75/keyboard.json
similarity index 100%
rename from keyboards/meletrix/zoom75/info.json
rename to keyboards/meletrix/zoom75/keyboard.json
diff --git a/keyboards/meletrix/zoom75/rules.mk b/keyboards/meletrix/zoom75/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/meletrix/zoom75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/meletrix/zoom98/info.json b/keyboards/meletrix/zoom98/keyboard.json
similarity index 100%
rename from keyboards/meletrix/zoom98/info.json
rename to keyboards/meletrix/zoom98/keyboard.json
diff --git a/keyboards/meletrix/zoom98/rules.mk b/keyboards/meletrix/zoom98/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/meletrix/zoom98/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/millet/doksin/info.json b/keyboards/millet/doksin/keyboard.json
similarity index 100%
rename from keyboards/millet/doksin/info.json
rename to keyboards/millet/doksin/keyboard.json
diff --git a/keyboards/millet/doksin/rules.mk b/keyboards/millet/doksin/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/keyboard.json
similarity index 100%
rename from keyboards/mincedshon/ecila/info.json
rename to keyboards/mincedshon/ecila/keyboard.json
diff --git a/keyboards/mincedshon/ecila/rules.mk b/keyboards/mincedshon/ecila/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mincedshon/ecila/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mk65/info.json b/keyboards/mk65/keyboard.json
similarity index 100%
rename from keyboards/mk65/info.json
rename to keyboards/mk65/keyboard.json
diff --git a/keyboards/mk65/rules.mk b/keyboards/mk65/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/mk65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/keyboard.json
similarity index 100%
rename from keyboards/mlego/m65/rev1/info.json
rename to keyboards/mlego/m65/rev1/keyboard.json
diff --git a/keyboards/mlego/m65/rev1/rules.mk b/keyboards/mlego/m65/rev1/rules.mk
deleted file mode 100644
index 48c755b14e9..00000000000
--- a/keyboards/mlego/m65/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#intentionally blanck
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/keyboard.json
similarity index 100%
rename from keyboards/mlego/m65/rev2/info.json
rename to keyboards/mlego/m65/rev2/keyboard.json
diff --git a/keyboards/mlego/m65/rev2/rules.mk b/keyboards/mlego/m65/rev2/rules.mk
deleted file mode 100644
index 9a795b953e4..00000000000
--- a/keyboards/mlego/m65/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#blank purpose
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/keyboard.json
similarity index 100%
rename from keyboards/mlego/m65/rev3/info.json
rename to keyboards/mlego/m65/rev3/keyboard.json
diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk
deleted file mode 100644
index 8b4c9539892..00000000000
--- a/keyboards/mlego/m65/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#blank on purpose
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/keyboard.json
similarity index 100%
rename from keyboards/mlego/m65/rev4/info.json
rename to keyboards/mlego/m65/rev4/keyboard.json
diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mntre_v3/info.json b/keyboards/mntre_v3/keyboard.json
similarity index 100%
rename from keyboards/mntre_v3/info.json
rename to keyboards/mntre_v3/keyboard.json
diff --git a/keyboards/mntre_v3/rules.mk b/keyboards/mntre_v3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mntre_v3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mode/m256wh/info.json b/keyboards/mode/m256wh/keyboard.json
similarity index 100%
rename from keyboards/mode/m256wh/info.json
rename to keyboards/mode/m256wh/keyboard.json
diff --git a/keyboards/mode/m256wh/rules.mk b/keyboards/mode/m256wh/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mode/m256ws/info.json b/keyboards/mode/m256ws/keyboard.json
similarity index 100%
rename from keyboards/mode/m256ws/info.json
rename to keyboards/mode/m256ws/keyboard.json
diff --git a/keyboards/mode/m256ws/rules.mk b/keyboards/mode/m256ws/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mode/m60h/info.json b/keyboards/mode/m60h/keyboard.json
similarity index 100%
rename from keyboards/mode/m60h/info.json
rename to keyboards/mode/m60h/keyboard.json
diff --git a/keyboards/mode/m60h/rules.mk b/keyboards/mode/m60h/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mode/m60h/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mode/m60h_f/info.json b/keyboards/mode/m60h_f/keyboard.json
similarity index 100%
rename from keyboards/mode/m60h_f/info.json
rename to keyboards/mode/m60h_f/keyboard.json
diff --git a/keyboards/mode/m60h_f/rules.mk b/keyboards/mode/m60h_f/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mode/m60h_f/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mode/m60s/info.json b/keyboards/mode/m60s/keyboard.json
similarity index 100%
rename from keyboards/mode/m60s/info.json
rename to keyboards/mode/m60s/keyboard.json
diff --git a/keyboards/mode/m60s/rules.mk b/keyboards/mode/m60s/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mode/m60s/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/keyboard.json
similarity index 100%
rename from keyboards/mokey/luckycat70/info.json
rename to keyboards/mokey/luckycat70/keyboard.json
diff --git a/keyboards/mokey/luckycat70/rules.mk b/keyboards/mokey/luckycat70/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mokey/luckycat70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mokey/mokey12x2/info.json b/keyboards/mokey/mokey12x2/keyboard.json
similarity index 100%
rename from keyboards/mokey/mokey12x2/info.json
rename to keyboards/mokey/mokey12x2/keyboard.json
diff --git a/keyboards/mokey/mokey12x2/rules.mk b/keyboards/mokey/mokey12x2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mokey/mokey12x2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/keyboard.json
similarity index 100%
rename from keyboards/moky/moky88/info.json
rename to keyboards/moky/moky88/keyboard.json
diff --git a/keyboards/moky/moky88/rules.mk b/keyboards/moky/moky88/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/moky/moky88/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/momokai/aurora/info.json b/keyboards/momokai/aurora/keyboard.json
similarity index 100%
rename from keyboards/momokai/aurora/info.json
rename to keyboards/momokai/aurora/keyboard.json
diff --git a/keyboards/momokai/aurora/rules.mk b/keyboards/momokai/aurora/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/momokai/aurora/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/monsgeek/m1/info.json b/keyboards/monsgeek/m1/keyboard.json
similarity index 100%
rename from keyboards/monsgeek/m1/info.json
rename to keyboards/monsgeek/m1/keyboard.json
diff --git a/keyboards/monsgeek/m1/rules.mk b/keyboards/monsgeek/m1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/monsgeek/m1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/monsgeek/m3/info.json b/keyboards/monsgeek/m3/keyboard.json
similarity index 100%
rename from keyboards/monsgeek/m3/info.json
rename to keyboards/monsgeek/m3/keyboard.json
diff --git a/keyboards/monsgeek/m3/rules.mk b/keyboards/monsgeek/m3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/monsgeek/m3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/monsgeek/m5/info.json b/keyboards/monsgeek/m5/keyboard.json
similarity index 100%
rename from keyboards/monsgeek/m5/info.json
rename to keyboards/monsgeek/m5/keyboard.json
diff --git a/keyboards/monsgeek/m5/rules.mk b/keyboards/monsgeek/m5/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/monsgeek/m5/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/monsgeek/m6/info.json b/keyboards/monsgeek/m6/keyboard.json
similarity index 100%
rename from keyboards/monsgeek/m6/info.json
rename to keyboards/monsgeek/m6/keyboard.json
diff --git a/keyboards/monsgeek/m6/rules.mk b/keyboards/monsgeek/m6/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/monsgeek/m6/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/montsinger/palmetto/info.json b/keyboards/montsinger/palmetto/keyboard.json
similarity index 100%
rename from keyboards/montsinger/palmetto/info.json
rename to keyboards/montsinger/palmetto/keyboard.json
diff --git a/keyboards/montsinger/palmetto/rules.mk b/keyboards/montsinger/palmetto/rules.mk
deleted file mode 100755
index 8b137891791..00000000000
--- a/keyboards/montsinger/palmetto/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/moondrop/dash75/r1/info.json b/keyboards/moondrop/dash75/r1/keyboard.json
similarity index 100%
rename from keyboards/moondrop/dash75/r1/info.json
rename to keyboards/moondrop/dash75/r1/keyboard.json
diff --git a/keyboards/moondrop/dash75/r1/rules.mk b/keyboards/moondrop/dash75/r1/rules.mk
deleted file mode 100644
index 6441046fb6a..00000000000
--- a/keyboards/moondrop/dash75/r1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-# ** Settings are Data Driven and reside in `info.json` **
diff --git a/keyboards/mothwing/info.json b/keyboards/mothwing/keyboard.json
similarity index 100%
rename from keyboards/mothwing/info.json
rename to keyboards/mothwing/keyboard.json
diff --git a/keyboards/mothwing/rules.mk b/keyboards/mothwing/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/keyboard.json
similarity index 100%
rename from keyboards/ms_sculpt/info.json
rename to keyboards/ms_sculpt/keyboard.json
diff --git a/keyboards/ms_sculpt/rules.mk b/keyboards/ms_sculpt/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ms_sculpt/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mwstudio/mmk_3/info.json b/keyboards/mwstudio/mmk_3/keyboard.json
similarity index 100%
rename from keyboards/mwstudio/mmk_3/info.json
rename to keyboards/mwstudio/mmk_3/keyboard.json
diff --git a/keyboards/mwstudio/mmk_3/rules.mk b/keyboards/mwstudio/mmk_3/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/mwstudio/mmk_3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/keyboard.json
similarity index 100%
rename from keyboards/mwstudio/mw660/info.json
rename to keyboards/mwstudio/mw660/keyboard.json
diff --git a/keyboards/mwstudio/mw660/rules.mk b/keyboards/mwstudio/mw660/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mwstudio/mw660/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/keyboard.json
similarity index 100%
rename from keyboards/mwstudio/mw80/info.json
rename to keyboards/mwstudio/mw80/keyboard.json
diff --git a/keyboards/mwstudio/mw80/rules.mk b/keyboards/mwstudio/mw80/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/mxss/info.json b/keyboards/mxss/keyboard.json
similarity index 100%
rename from keyboards/mxss/info.json
rename to keyboards/mxss/keyboard.json
diff --git a/keyboards/mxss/rules.mk b/keyboards/mxss/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/mxss/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/nacly/bigsmoothknob/info.json b/keyboards/nacly/bigsmoothknob/keyboard.json
similarity index 100%
rename from keyboards/nacly/bigsmoothknob/info.json
rename to keyboards/nacly/bigsmoothknob/keyboard.json
diff --git a/keyboards/nacly/bigsmoothknob/rules.mk b/keyboards/nacly/bigsmoothknob/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/nacly/bigsmoothknob/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/navi60/info.json b/keyboards/navi60/keyboard.json
similarity index 100%
rename from keyboards/navi60/info.json
rename to keyboards/navi60/keyboard.json
diff --git a/keyboards/navi60/rules.mk b/keyboards/navi60/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/navi60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/neson_design/810e/info.json b/keyboards/neson_design/810e/keyboard.json
similarity index 100%
rename from keyboards/neson_design/810e/info.json
rename to keyboards/neson_design/810e/keyboard.json
diff --git a/keyboards/neson_design/810e/rules.mk b/keyboards/neson_design/810e/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/neson_design/810e/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/keyboard.json
similarity index 100%
rename from keyboards/neson_design/nico/info.json
rename to keyboards/neson_design/nico/keyboard.json
diff --git a/keyboards/neson_design/nico/rules.mk b/keyboards/neson_design/nico/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/nightly_boards/n40_o/info.json b/keyboards/nightly_boards/n40_o/keyboard.json
similarity index 100%
rename from keyboards/nightly_boards/n40_o/info.json
rename to keyboards/nightly_boards/n40_o/keyboard.json
diff --git a/keyboards/nightly_boards/n40_o/rules.mk b/keyboards/nightly_boards/n40_o/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/nightly_boards/n40_o/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ning/tiny_board/tb16_rgb/info.json b/keyboards/ning/tiny_board/tb16_rgb/keyboard.json
similarity index 100%
rename from keyboards/ning/tiny_board/tb16_rgb/info.json
rename to keyboards/ning/tiny_board/tb16_rgb/keyboard.json
diff --git a/keyboards/ning/tiny_board/tb16_rgb/rules.mk b/keyboards/ning/tiny_board/tb16_rgb/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/nix_studio/lilith/info.json b/keyboards/nix_studio/lilith/keyboard.json
similarity index 100%
rename from keyboards/nix_studio/lilith/info.json
rename to keyboards/nix_studio/lilith/keyboard.json
diff --git a/keyboards/nix_studio/lilith/rules.mk b/keyboards/nix_studio/lilith/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/nix_studio/lilith/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/novelkeys/nk65/base/info.json b/keyboards/novelkeys/nk65/base/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/nk65/base/info.json
rename to keyboards/novelkeys/nk65/base/keyboard.json
diff --git a/keyboards/novelkeys/nk65/base/rules.mk b/keyboards/novelkeys/nk65/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/novelkeys/nk65/v1_4/info.json b/keyboards/novelkeys/nk65/v1_4/keyboard.json
similarity index 100%
rename from keyboards/novelkeys/nk65/v1_4/info.json
rename to keyboards/novelkeys/nk65/v1_4/keyboard.json
diff --git a/keyboards/novelkeys/nk65/v1_4/rules.mk b/keyboards/novelkeys/nk65/v1_4/rules.mk
deleted file mode 100755
index 8b137891791..00000000000
--- a/keyboards/novelkeys/nk65/v1_4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/noxary/valhalla_v2/info.json b/keyboards/noxary/valhalla_v2/keyboard.json
similarity index 100%
rename from keyboards/noxary/valhalla_v2/info.json
rename to keyboards/noxary/valhalla_v2/keyboard.json
diff --git a/keyboards/noxary/valhalla_v2/rules.mk b/keyboards/noxary/valhalla_v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/noxary/valhalla_v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/null/st110r2/info.json b/keyboards/null/st110r2/keyboard.json
similarity index 100%
rename from keyboards/null/st110r2/info.json
rename to keyboards/null/st110r2/keyboard.json
diff --git a/keyboards/null/st110r2/rules.mk b/keyboards/null/st110r2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/null/st110r2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/keyboard.json
similarity index 100%
rename from keyboards/oddball/v1/info.json
rename to keyboards/oddball/v1/keyboard.json
diff --git a/keyboards/oddball/v1/rules.mk b/keyboards/oddball/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/keyboard.json
similarity index 100%
rename from keyboards/oddball/v2/info.json
rename to keyboards/oddball/v2/keyboard.json
diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/keyboard.json
similarity index 100%
rename from keyboards/oddball/v2_1/info.json
rename to keyboards/oddball/v2_1/keyboard.json
diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/3x6/info.json
rename to keyboards/omkbd/runner3680/3x6/keyboard.json
diff --git a/keyboards/omkbd/runner3680/3x6/rules.mk b/keyboards/omkbd/runner3680/3x6/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/3x7/info.json
rename to keyboards/omkbd/runner3680/3x7/keyboard.json
diff --git a/keyboards/omkbd/runner3680/3x7/rules.mk b/keyboards/omkbd/runner3680/3x7/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/3x8/info.json
rename to keyboards/omkbd/runner3680/3x8/keyboard.json
diff --git a/keyboards/omkbd/runner3680/3x8/rules.mk b/keyboards/omkbd/runner3680/3x8/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/4x6/info.json
rename to keyboards/omkbd/runner3680/4x6/keyboard.json
diff --git a/keyboards/omkbd/runner3680/4x6/rules.mk b/keyboards/omkbd/runner3680/4x6/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/4x7/info.json
rename to keyboards/omkbd/runner3680/4x7/keyboard.json
diff --git a/keyboards/omkbd/runner3680/4x7/rules.mk b/keyboards/omkbd/runner3680/4x7/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/4x8/info.json
rename to keyboards/omkbd/runner3680/4x8/keyboard.json
diff --git a/keyboards/omkbd/runner3680/4x8/rules.mk b/keyboards/omkbd/runner3680/4x8/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/5x6/info.json
rename to keyboards/omkbd/runner3680/5x6/keyboard.json
diff --git a/keyboards/omkbd/runner3680/5x6/rules.mk b/keyboards/omkbd/runner3680/5x6/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/5x6_5x8/info.json
rename to keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/5x7/info.json
rename to keyboards/omkbd/runner3680/5x7/keyboard.json
diff --git a/keyboards/omkbd/runner3680/5x7/rules.mk b/keyboards/omkbd/runner3680/5x7/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/keyboard.json
similarity index 100%
rename from keyboards/omkbd/runner3680/5x8/info.json
rename to keyboards/omkbd/runner3680/5x8/keyboard.json
diff --git a/keyboards/omkbd/runner3680/5x8/rules.mk b/keyboards/omkbd/runner3680/5x8/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/orthograph/info.json b/keyboards/orthograph/keyboard.json
similarity index 100%
rename from keyboards/orthograph/info.json
rename to keyboards/orthograph/keyboard.json
diff --git a/keyboards/orthograph/rules.mk b/keyboards/orthograph/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/orthograph/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/pangorin/tan67/info.json b/keyboards/pangorin/tan67/keyboard.json
similarity index 100%
rename from keyboards/pangorin/tan67/info.json
rename to keyboards/pangorin/tan67/keyboard.json
diff --git a/keyboards/pangorin/tan67/rules.mk b/keyboards/pangorin/tan67/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/pangorin/tan67/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/keyboard.json
similarity index 100%
rename from keyboards/pauperboards/brick/info.json
rename to keyboards/pauperboards/brick/keyboard.json
diff --git a/keyboards/pauperboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk
deleted file mode 100644
index 333c4e59739..00000000000
--- a/keyboards/pauperboards/brick/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intenionally left blank
diff --git a/keyboards/peej/tripel/left/info.json b/keyboards/peej/tripel/left/keyboard.json
similarity index 100%
rename from keyboards/peej/tripel/left/info.json
rename to keyboards/peej/tripel/left/keyboard.json
diff --git a/keyboards/peej/tripel/left/rules.mk b/keyboards/peej/tripel/left/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/peej/tripel/left/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/peej/tripel/middle/info.json b/keyboards/peej/tripel/middle/keyboard.json
similarity index 100%
rename from keyboards/peej/tripel/middle/info.json
rename to keyboards/peej/tripel/middle/keyboard.json
diff --git a/keyboards/peej/tripel/middle/rules.mk b/keyboards/peej/tripel/middle/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/peej/tripel/middle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/peej/tripel/right/info.json b/keyboards/peej/tripel/right/keyboard.json
similarity index 100%
rename from keyboards/peej/tripel/right/info.json
rename to keyboards/peej/tripel/right/keyboard.json
diff --git a/keyboards/peej/tripel/right/rules.mk b/keyboards/peej/tripel/right/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/peej/tripel/right/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/keyboard.json
similarity index 100%
rename from keyboards/phentech/rpk_001/info.json
rename to keyboards/phentech/rpk_001/keyboard.json
diff --git a/keyboards/phentech/rpk_001/rules.mk b/keyboards/phentech/rpk_001/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/phentech/rpk_001/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/pica40/rev1/info.json b/keyboards/pica40/rev1/keyboard.json
similarity index 100%
rename from keyboards/pica40/rev1/info.json
rename to keyboards/pica40/rev1/keyboard.json
diff --git a/keyboards/pica40/rev1/rules.mk b/keyboards/pica40/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/pinky/3/info.json b/keyboards/pinky/3/keyboard.json
similarity index 100%
rename from keyboards/pinky/3/info.json
rename to keyboards/pinky/3/keyboard.json
diff --git a/keyboards/pinky/3/rules.mk b/keyboards/pinky/3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/pinky/4/info.json b/keyboards/pinky/4/keyboard.json
similarity index 100%
rename from keyboards/pinky/4/info.json
rename to keyboards/pinky/4/keyboard.json
diff --git a/keyboards/pinky/4/rules.mk b/keyboards/pinky/4/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/pixelspace/shadow80/info.json b/keyboards/pixelspace/shadow80/keyboard.json
similarity index 100%
rename from keyboards/pixelspace/shadow80/info.json
rename to keyboards/pixelspace/shadow80/keyboard.json
diff --git a/keyboards/pixelspace/shadow80/rules.mk b/keyboards/pixelspace/shadow80/rules.mk
deleted file mode 100644
index c80812f6e0a..00000000000
--- a/keyboards/pixelspace/shadow80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/planck/ez/base/info.json b/keyboards/planck/ez/base/keyboard.json
similarity index 100%
rename from keyboards/planck/ez/base/info.json
rename to keyboards/planck/ez/base/keyboard.json
diff --git a/keyboards/planck/ez/base/rules.mk b/keyboards/planck/ez/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/madromys/rev1_001/info.json b/keyboards/ploopyco/madromys/rev1_001/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/madromys/rev1_001/info.json
rename to keyboards/ploopyco/madromys/rev1_001/keyboard.json
diff --git a/keyboards/ploopyco/madromys/rev1_001/rules.mk b/keyboards/ploopyco/madromys/rev1_001/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/trackball/rev1/info.json b/keyboards/ploopyco/trackball/rev1/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/trackball/rev1/info.json
rename to keyboards/ploopyco/trackball/rev1/keyboard.json
diff --git a/keyboards/ploopyco/trackball/rev1/rules.mk b/keyboards/ploopyco/trackball/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/trackball/rev1_005/info.json b/keyboards/ploopyco/trackball/rev1_005/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/trackball/rev1_005/info.json
rename to keyboards/ploopyco/trackball/rev1_005/keyboard.json
diff --git a/keyboards/ploopyco/trackball/rev1_005/rules.mk b/keyboards/ploopyco/trackball/rev1_005/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/info.json b/keyboards/ploopyco/trackball_mini/rev1_001/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/trackball_mini/rev1_001/info.json
rename to keyboards/ploopyco/trackball_mini/rev1_001/keyboard.json
diff --git a/keyboards/ploopyco/trackball_mini/rev1_001/rules.mk b/keyboards/ploopyco/trackball_mini/rev1_001/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/info.json b/keyboards/ploopyco/trackball_mini/rev1_002/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/trackball_mini/rev1_002/info.json
rename to keyboards/ploopyco/trackball_mini/rev1_002/keyboard.json
diff --git a/keyboards/ploopyco/trackball_mini/rev1_002/rules.mk b/keyboards/ploopyco/trackball_mini/rev1_002/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/info.json b/keyboards/ploopyco/trackball_nano/rev1_001/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/trackball_nano/rev1_001/info.json
rename to keyboards/ploopyco/trackball_nano/rev1_001/keyboard.json
diff --git a/keyboards/ploopyco/trackball_nano/rev1_001/rules.mk b/keyboards/ploopyco/trackball_nano/rev1_001/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/info.json b/keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json
similarity index 100%
rename from keyboards/ploopyco/trackball_thumb/rev1_001/info.json
rename to keyboards/ploopyco/trackball_thumb/rev1_001/keyboard.json
diff --git a/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk b/keyboards/ploopyco/trackball_thumb/rev1_001/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/plum47/info.json b/keyboards/plum47/keyboard.json
similarity index 100%
rename from keyboards/plum47/info.json
rename to keyboards/plum47/keyboard.json
diff --git a/keyboards/plum47/rules.mk b/keyboards/plum47/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/plum47/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/keyboard.json
similarity index 100%
rename from keyboards/plywrks/allaro/info.json
rename to keyboards/plywrks/allaro/keyboard.json
diff --git a/keyboards/plywrks/allaro/rules.mk b/keyboards/plywrks/allaro/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/plywrks/allaro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/plywrks/ji_eun/info.json b/keyboards/plywrks/ji_eun/keyboard.json
similarity index 100%
rename from keyboards/plywrks/ji_eun/info.json
rename to keyboards/plywrks/ji_eun/keyboard.json
diff --git a/keyboards/plywrks/ji_eun/rules.mk b/keyboards/plywrks/ji_eun/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/plywrks/ji_eun/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/plywrks/ply8x/info.json b/keyboards/plywrks/ply8x/keyboard.json
similarity index 100%
rename from keyboards/plywrks/ply8x/info.json
rename to keyboards/plywrks/ply8x/keyboard.json
diff --git a/keyboards/plywrks/ply8x/rules.mk b/keyboards/plywrks/ply8x/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/plywrks/ply8x/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/primekb/meridian/ktr1010/info.json b/keyboards/primekb/meridian/ktr1010/keyboard.json
similarity index 100%
rename from keyboards/primekb/meridian/ktr1010/info.json
rename to keyboards/primekb/meridian/ktr1010/keyboard.json
diff --git a/keyboards/primekb/meridian/ktr1010/rules.mk b/keyboards/primekb/meridian/ktr1010/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/primekb/meridian/ws2812/info.json b/keyboards/primekb/meridian/ws2812/keyboard.json
similarity index 100%
rename from keyboards/primekb/meridian/ws2812/info.json
rename to keyboards/primekb/meridian/ws2812/keyboard.json
diff --git a/keyboards/primekb/meridian/ws2812/rules.mk b/keyboards/primekb/meridian/ws2812/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/keyboard.json
similarity index 100%
rename from keyboards/program_yoink/ortho/info.json
rename to keyboards/program_yoink/ortho/keyboard.json
diff --git a/keyboards/program_yoink/ortho/rules.mk b/keyboards/program_yoink/ortho/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/program_yoink/staggered/info.json b/keyboards/program_yoink/staggered/keyboard.json
similarity index 100%
rename from keyboards/program_yoink/staggered/info.json
rename to keyboards/program_yoink/staggered/keyboard.json
diff --git a/keyboards/program_yoink/staggered/rules.mk b/keyboards/program_yoink/staggered/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/projectcain/vault35/atmega32u4/info.json b/keyboards/projectcain/vault35/atmega32u4/keyboard.json
similarity index 100%
rename from keyboards/projectcain/vault35/atmega32u4/info.json
rename to keyboards/projectcain/vault35/atmega32u4/keyboard.json
diff --git a/keyboards/projectcain/vault35/atmega32u4/rules.mk b/keyboards/projectcain/vault35/atmega32u4/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/projectcain/vault35/atmega32u4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/keyboard.json
similarity index 100%
rename from keyboards/projectd/65/projectd_65_ansi/info.json
rename to keyboards/projectd/65/projectd_65_ansi/keyboard.json
diff --git a/keyboards/projectd/65/projectd_65_ansi/rules.mk b/keyboards/projectd/65/projectd_65_ansi/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/projectd/65/projectd_65_ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/projectd/75/ansi/info.json b/keyboards/projectd/75/ansi/keyboard.json
similarity index 100%
rename from keyboards/projectd/75/ansi/info.json
rename to keyboards/projectd/75/ansi/keyboard.json
diff --git a/keyboards/projectd/75/ansi/rules.mk b/keyboards/projectd/75/ansi/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/projectd/75/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/keyboard.json
similarity index 100%
rename from keyboards/proteus67/info.json
rename to keyboards/proteus67/keyboard.json
diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/proteus67/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/keyboard.json
similarity index 100%
rename from keyboards/prototypist/pt60/info.json
rename to keyboards/prototypist/pt60/keyboard.json
diff --git a/keyboards/prototypist/pt60/rules.mk b/keyboards/prototypist/pt60/rules.mk
deleted file mode 100644
index d469a478286..00000000000
--- a/keyboards/prototypist/pt60/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file intentionally left blank.
-
-
diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/keyboard.json
similarity index 100%
rename from keyboards/prototypist/pt80/info.json
rename to keyboards/prototypist/pt80/keyboard.json
diff --git a/keyboards/prototypist/pt80/rules.mk b/keyboards/prototypist/pt80/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/prototypist/pt80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/keyboard.json
similarity index 100%
rename from keyboards/pteropus/info.json
rename to keyboards/pteropus/keyboard.json
diff --git a/keyboards/pteropus/rules.mk b/keyboards/pteropus/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/pteropus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/purin/info.json b/keyboards/purin/keyboard.json
similarity index 100%
rename from keyboards/purin/info.json
rename to keyboards/purin/keyboard.json
diff --git a/keyboards/purin/rules.mk b/keyboards/purin/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/purin/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qck75/v1/info.json b/keyboards/qck75/v1/keyboard.json
similarity index 100%
rename from keyboards/qck75/v1/info.json
rename to keyboards/qck75/v1/keyboard.json
diff --git a/keyboards/qck75/v1/rules.mk b/keyboards/qck75/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/quadrum/delta/info.json b/keyboards/quadrum/delta/keyboard.json
similarity index 100%
rename from keyboards/quadrum/delta/info.json
rename to keyboards/quadrum/delta/keyboard.json
diff --git a/keyboards/quadrum/delta/rules.mk b/keyboards/quadrum/delta/rules.mk
deleted file mode 100644
index 6968c523355..00000000000
--- a/keyboards/quadrum/delta/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-
diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/keyboard.json
similarity index 100%
rename from keyboards/qwertykeys/qk100/ansi/info.json
rename to keyboards/qwertykeys/qk100/ansi/keyboard.json
diff --git a/keyboards/qwertykeys/qk100/ansi/rules.mk b/keyboards/qwertykeys/qk100/ansi/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/qwertykeys/qk100/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/solder/info.json b/keyboards/qwertykeys/qk100/solder/keyboard.json
similarity index 100%
rename from keyboards/qwertykeys/qk100/solder/info.json
rename to keyboards/qwertykeys/qk100/solder/keyboard.json
diff --git a/keyboards/qwertykeys/qk100/solder/rules.mk b/keyboards/qwertykeys/qk100/solder/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/qwertykeys/qk100/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/rainkeebs/trailmix/info.json b/keyboards/rainkeebs/trailmix/keyboard.json
similarity index 100%
rename from keyboards/rainkeebs/trailmix/info.json
rename to keyboards/rainkeebs/trailmix/keyboard.json
diff --git a/keyboards/rainkeebs/trailmix/rules.mk b/keyboards/rainkeebs/trailmix/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rainkeebs/trailmix/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ramlord/witf/info.json b/keyboards/ramlord/witf/keyboard.json
similarity index 100%
rename from keyboards/ramlord/witf/info.json
rename to keyboards/ramlord/witf/keyboard.json
diff --git a/keyboards/ramlord/witf/rules.mk b/keyboards/ramlord/witf/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ramlord/witf/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rart/rart60/info.json b/keyboards/rart/rart60/keyboard.json
similarity index 100%
rename from keyboards/rart/rart60/info.json
rename to keyboards/rart/rart60/keyboard.json
diff --git a/keyboards/rart/rart60/rules.mk b/keyboards/rart/rart60/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rart/rart60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rastersoft/minitkl/info.json b/keyboards/rastersoft/minitkl/keyboard.json
similarity index 100%
rename from keyboards/rastersoft/minitkl/info.json
rename to keyboards/rastersoft/minitkl/keyboard.json
diff --git a/keyboards/rastersoft/minitkl/rules.mk b/keyboards/rastersoft/minitkl/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rastersoft/minitkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/keyboard.json
similarity index 100%
rename from keyboards/redox/rev1/base/info.json
rename to keyboards/redox/rev1/base/keyboard.json
diff --git a/keyboards/redox/rev1/base/rules.mk b/keyboards/redox/rev1/base/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/redox/rev1/base/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/redragon/k667/info.json b/keyboards/redragon/k667/keyboard.json
similarity index 100%
rename from keyboards/redragon/k667/info.json
rename to keyboards/redragon/k667/keyboard.json
diff --git a/keyboards/redragon/k667/rules.mk b/keyboards/redragon/k667/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/redragon/k667/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/reedskeebs/alish40/info.json b/keyboards/reedskeebs/alish40/keyboard.json
similarity index 100%
rename from keyboards/reedskeebs/alish40/info.json
rename to keyboards/reedskeebs/alish40/keyboard.json
diff --git a/keyboards/reedskeebs/alish40/rules.mk b/keyboards/reedskeebs/alish40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/reedskeebs/alish40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/relapsekb/or87/info.json b/keyboards/relapsekb/or87/keyboard.json
similarity index 100%
rename from keyboards/relapsekb/or87/info.json
rename to keyboards/relapsekb/or87/keyboard.json
diff --git a/keyboards/relapsekb/or87/rules.mk b/keyboards/relapsekb/or87/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/relapsekb/or87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/mun/rev1/info.json
rename to keyboards/rgbkb/mun/rev1/keyboard.json
diff --git a/keyboards/rgbkb/mun/rev1/rules.mk b/keyboards/rgbkb/mun/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/pan/rev1/proton_c/info.json
rename to keyboards/rgbkb/pan/rev1/proton_c/keyboard.json
diff --git a/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/sol3/rev1/info.json
rename to keyboards/rgbkb/sol3/rev1/keyboard.json
diff --git a/keyboards/rgbkb/sol3/rev1/rules.mk b/keyboards/rgbkb/sol3/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/zen/rev1/info.json
rename to keyboards/rgbkb/zen/rev1/keyboard.json
diff --git a/keyboards/rgbkb/zen/rev1/rules.mk b/keyboards/rgbkb/zen/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
similarity index 100%
rename from keyboards/rgbkb/zygomorph/rev1/info.json
rename to keyboards/rgbkb/zygomorph/rev1/keyboard.json
diff --git a/keyboards/rgbkb/zygomorph/rev1/rules.mk b/keyboards/rgbkb/zygomorph/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/rico/phoenix_project_no1/info.json b/keyboards/rico/phoenix_project_no1/keyboard.json
similarity index 100%
rename from keyboards/rico/phoenix_project_no1/info.json
rename to keyboards/rico/phoenix_project_no1/keyboard.json
diff --git a/keyboards/rico/phoenix_project_no1/rules.mk b/keyboards/rico/phoenix_project_no1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rico/phoenix_project_no1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/keyboard.json
similarity index 100%
rename from keyboards/rkg68/info.json
rename to keyboards/rkg68/keyboard.json
diff --git a/keyboards/rkg68/rules.mk b/keyboards/rkg68/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/rkg68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/rmi_kb/equator/info.json b/keyboards/rmi_kb/equator/keyboard.json
similarity index 100%
rename from keyboards/rmi_kb/equator/info.json
rename to keyboards/rmi_kb/equator/keyboard.json
diff --git a/keyboards/rmi_kb/equator/rules.mk b/keyboards/rmi_kb/equator/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rmi_kb/equator/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rmi_kb/tkl_ff/v1/info.json b/keyboards/rmi_kb/tkl_ff/v1/keyboard.json
similarity index 100%
rename from keyboards/rmi_kb/tkl_ff/v1/info.json
rename to keyboards/rmi_kb/tkl_ff/v1/keyboard.json
diff --git a/keyboards/rmi_kb/tkl_ff/v1/rules.mk b/keyboards/rmi_kb/tkl_ff/v1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/rmkeebs/rm_fullsize/info.json b/keyboards/rmkeebs/rm_fullsize/keyboard.json
similarity index 100%
rename from keyboards/rmkeebs/rm_fullsize/info.json
rename to keyboards/rmkeebs/rm_fullsize/keyboard.json
diff --git a/keyboards/rmkeebs/rm_fullsize/rules.mk b/keyboards/rmkeebs/rm_fullsize/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/rmkeebs/rm_fullsize/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/rookiebwoy/late9/rev1/info.json b/keyboards/rookiebwoy/late9/rev1/keyboard.json
similarity index 100%
rename from keyboards/rookiebwoy/late9/rev1/info.json
rename to keyboards/rookiebwoy/late9/rev1/keyboard.json
diff --git a/keyboards/rookiebwoy/late9/rev1/rules.mk b/keyboards/rookiebwoy/late9/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rookiebwoy/late9/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/rot13labs/rotc0n/info.json b/keyboards/rot13labs/rotc0n/keyboard.json
similarity index 100%
rename from keyboards/rot13labs/rotc0n/info.json
rename to keyboards/rot13labs/rotc0n/keyboard.json
diff --git a/keyboards/rot13labs/rotc0n/rules.mk b/keyboards/rot13labs/rotc0n/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/rot13labs/rotc0n/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/keyboard.json
similarity index 100%
rename from keyboards/saevus/cor/info.json
rename to keyboards/saevus/cor/keyboard.json
diff --git a/keyboards/saevus/cor/rules.mk b/keyboards/saevus/cor/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/saevus/cor/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/saevus/cor_tkl/info.json b/keyboards/saevus/cor_tkl/keyboard.json
similarity index 100%
rename from keyboards/saevus/cor_tkl/info.json
rename to keyboards/saevus/cor_tkl/keyboard.json
diff --git a/keyboards/saevus/cor_tkl/rules.mk b/keyboards/saevus/cor_tkl/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sakura_workshop/fuji75/hotswap/info.json b/keyboards/sakura_workshop/fuji75/hotswap/keyboard.json
similarity index 100%
rename from keyboards/sakura_workshop/fuji75/hotswap/info.json
rename to keyboards/sakura_workshop/fuji75/hotswap/keyboard.json
diff --git a/keyboards/sakura_workshop/fuji75/hotswap/rules.mk b/keyboards/sakura_workshop/fuji75/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sakura_workshop/fuji75/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sakura_workshop/fuji75/solder/info.json b/keyboards/sakura_workshop/fuji75/solder/keyboard.json
similarity index 100%
rename from keyboards/sakura_workshop/fuji75/solder/info.json
rename to keyboards/sakura_workshop/fuji75/solder/keyboard.json
diff --git a/keyboards/sakura_workshop/fuji75/solder/rules.mk b/keyboards/sakura_workshop/fuji75/solder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sakura_workshop/fuji75/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/7skb/rev1/info.json
rename to keyboards/salicylic_acid3/7skb/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rules.mk b/keyboards/salicylic_acid3/7skb/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/getta25/rev1/info.json
rename to keyboards/salicylic_acid3/getta25/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rules.mk b/keyboards/salicylic_acid3/getta25/rev1/rules.mk
deleted file mode 100644
index fff00a1b511..00000000000
--- a/keyboards/salicylic_acid3/getta25/rev1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Revision Specific Build Options
-#   change yes to no to disable
-#
diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/guide68/info.json
rename to keyboards/salicylic_acid3/guide68/keyboard.json
diff --git a/keyboards/salicylic_acid3/guide68/rules.mk b/keyboards/salicylic_acid3/guide68/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/salicylic_acid3/guide68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/jisplit89/rev1/info.json
rename to keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rules.mk b/keyboards/salicylic_acid3/jisplit89/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/naked48/rev1/info.json
rename to keyboards/salicylic_acid3/naked48/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/naked48/rev1/rules.mk b/keyboards/salicylic_acid3/naked48/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/naked60/rev1/info.json
rename to keyboards/salicylic_acid3/naked60/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/naked60/rev1/rules.mk b/keyboards/salicylic_acid3/naked60/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/naked64/rev1/info.json
rename to keyboards/salicylic_acid3/naked64/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/naked64/rev1/rules.mk b/keyboards/salicylic_acid3/naked64/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json
similarity index 100%
rename from keyboards/salicylic_acid3/setta21/rev1/info.json
rename to keyboards/salicylic_acid3/setta21/rev1/keyboard.json
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rules.mk b/keyboards/salicylic_acid3/setta21/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sapuseven/macropad12/info.json b/keyboards/sapuseven/macropad12/keyboard.json
similarity index 100%
rename from keyboards/sapuseven/macropad12/info.json
rename to keyboards/sapuseven/macropad12/keyboard.json
diff --git a/keyboards/sapuseven/macropad12/rules.mk b/keyboards/sapuseven/macropad12/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sapuseven/macropad12/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/eclipse/eclipse60/info.json
rename to keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json
diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/rules.mk b/keyboards/sawnsprojects/eclipse/eclipse60/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/sawnsprojects/eclipse/eclipse60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/eclipse/tinyneko/info.json
rename to keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json
diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/rules.mk b/keyboards/sawnsprojects/eclipse/tinyneko/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/sawnsprojects/eclipse/tinyneko/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/krush/krush60/solder/info.json
rename to keyboards/sawnsprojects/krush/krush60/solder/keyboard.json
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk b/keyboards/sawnsprojects/krush/krush60/solder/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/info.json b/keyboards/sawnsprojects/okayu/stm32f072/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/okayu/stm32f072/info.json
rename to keyboards/sawnsprojects/okayu/stm32f072/keyboard.json
diff --git a/keyboards/sawnsprojects/okayu/stm32f072/rules.mk b/keyboards/sawnsprojects/okayu/stm32f072/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/info.json b/keyboards/sawnsprojects/okayu/stm32f103/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/okayu/stm32f103/info.json
rename to keyboards/sawnsprojects/okayu/stm32f103/keyboard.json
diff --git a/keyboards/sawnsprojects/okayu/stm32f103/rules.mk b/keyboards/sawnsprojects/okayu/stm32f103/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/info.json b/keyboards/sawnsprojects/okayu/stm32f303/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/okayu/stm32f303/info.json
rename to keyboards/sawnsprojects/okayu/stm32f303/keyboard.json
diff --git a/keyboards/sawnsprojects/okayu/stm32f303/rules.mk b/keyboards/sawnsprojects/okayu/stm32f303/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sawnsprojects/plaque80/info.json b/keyboards/sawnsprojects/plaque80/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/plaque80/info.json
rename to keyboards/sawnsprojects/plaque80/keyboard.json
diff --git a/keyboards/sawnsprojects/plaque80/rules.mk b/keyboards/sawnsprojects/plaque80/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/sawnsprojects/plaque80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/re65/info.json b/keyboards/sawnsprojects/re65/keyboard.json
similarity index 100%
rename from keyboards/sawnsprojects/re65/info.json
rename to keyboards/sawnsprojects/re65/keyboard.json
diff --git a/keyboards/sawnsprojects/re65/rules.mk b/keyboards/sawnsprojects/re65/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/sawnsprojects/re65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/scottokeebs/scotto34/info.json b/keyboards/scottokeebs/scotto34/keyboard.json
similarity index 100%
rename from keyboards/scottokeebs/scotto34/info.json
rename to keyboards/scottokeebs/scotto34/keyboard.json
diff --git a/keyboards/scottokeebs/scotto34/rules.mk b/keyboards/scottokeebs/scotto34/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/scottokeebs/scotto34/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sf2040/info.json b/keyboards/sf2040/keyboard.json
similarity index 100%
rename from keyboards/sf2040/info.json
rename to keyboards/sf2040/keyboard.json
diff --git a/keyboards/sf2040/rules.mk b/keyboards/sf2040/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/sf2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sha/info.json b/keyboards/sha/keyboard.json
similarity index 100%
rename from keyboards/sha/info.json
rename to keyboards/sha/keyboard.json
diff --git a/keyboards/sha/rules.mk b/keyboards/sha/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/sha/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/shandoncodes/riot_pad/info.json b/keyboards/shandoncodes/riot_pad/keyboard.json
similarity index 100%
rename from keyboards/shandoncodes/riot_pad/info.json
rename to keyboards/shandoncodes/riot_pad/keyboard.json
diff --git a/keyboards/shandoncodes/riot_pad/rules.mk b/keyboards/shandoncodes/riot_pad/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/shandoncodes/riot_pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/info.json b/keyboards/sharkoon/skiller_sgk50_s3/keyboard.json
similarity index 100%
rename from keyboards/sharkoon/skiller_sgk50_s3/info.json
rename to keyboards/sharkoon/skiller_sgk50_s3/keyboard.json
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/rules.mk b/keyboards/sharkoon/skiller_sgk50_s3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sharkoon/skiller_sgk50_s3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/shostudio/arc/info.json b/keyboards/shostudio/arc/keyboard.json
similarity index 100%
rename from keyboards/shostudio/arc/info.json
rename to keyboards/shostudio/arc/keyboard.json
diff --git a/keyboards/shostudio/arc/rules.mk b/keyboards/shostudio/arc/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/shostudio/arc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sirius/uni660/rev2/ansi/info.json b/keyboards/sirius/uni660/rev2/ansi/keyboard.json
similarity index 100%
rename from keyboards/sirius/uni660/rev2/ansi/info.json
rename to keyboards/sirius/uni660/rev2/ansi/keyboard.json
diff --git a/keyboards/sirius/uni660/rev2/ansi/rules.mk b/keyboards/sirius/uni660/rev2/ansi/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/keyboard.json
similarity index 100%
rename from keyboards/sirius/uni660/rev2/iso/info.json
rename to keyboards/sirius/uni660/rev2/iso/keyboard.json
diff --git a/keyboards/sirius/uni660/rev2/iso/rules.mk b/keyboards/sirius/uni660/rev2/iso/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/skeletonkbd/frost68/info.json b/keyboards/skeletonkbd/frost68/keyboard.json
similarity index 100%
rename from keyboards/skeletonkbd/frost68/info.json
rename to keyboards/skeletonkbd/frost68/keyboard.json
diff --git a/keyboards/skeletonkbd/frost68/rules.mk b/keyboards/skeletonkbd/frost68/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/skme/zeno/info.json b/keyboards/skme/zeno/keyboard.json
similarity index 100%
rename from keyboards/skme/zeno/info.json
rename to keyboards/skme/zeno/keyboard.json
diff --git a/keyboards/skme/zeno/rules.mk b/keyboards/skme/zeno/rules.mk
deleted file mode 100644
index aa06a6088fc..00000000000
--- a/keyboards/skme/zeno/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# left blank intentionally, moved to info.json
diff --git a/keyboards/skyloong/dt40/info.json b/keyboards/skyloong/dt40/keyboard.json
similarity index 100%
rename from keyboards/skyloong/dt40/info.json
rename to keyboards/skyloong/dt40/keyboard.json
diff --git a/keyboards/skyloong/dt40/rules.mk b/keyboards/skyloong/dt40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/skyloong/dt40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/skyloong/gk61/pro/info.json b/keyboards/skyloong/gk61/pro/keyboard.json
similarity index 100%
rename from keyboards/skyloong/gk61/pro/info.json
rename to keyboards/skyloong/gk61/pro/keyboard.json
diff --git a/keyboards/skyloong/gk61/pro/rules.mk b/keyboards/skyloong/gk61/pro/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/skyloong/gk61/pro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/skyloong/gk61/pro_48/info.json b/keyboards/skyloong/gk61/pro_48/keyboard.json
similarity index 100%
rename from keyboards/skyloong/gk61/pro_48/info.json
rename to keyboards/skyloong/gk61/pro_48/keyboard.json
diff --git a/keyboards/skyloong/gk61/pro_48/rules.mk b/keyboards/skyloong/gk61/pro_48/rules.mk
deleted file mode 100644
index 3bbd2614291..00000000000
--- a/keyboards/skyloong/gk61/pro_48/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/skyloong/gk61/v1/info.json b/keyboards/skyloong/gk61/v1/keyboard.json
similarity index 100%
rename from keyboards/skyloong/gk61/v1/info.json
rename to keyboards/skyloong/gk61/v1/keyboard.json
diff --git a/keyboards/skyloong/gk61/v1/rules.mk b/keyboards/skyloong/gk61/v1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/skyloong/gk61/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/skyloong/qk21/v1/info.json b/keyboards/skyloong/qk21/v1/keyboard.json
similarity index 100%
rename from keyboards/skyloong/qk21/v1/info.json
rename to keyboards/skyloong/qk21/v1/keyboard.json
diff --git a/keyboards/skyloong/qk21/v1/rules.mk b/keyboards/skyloong/qk21/v1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/skyloong/qk21/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/iron180v2/v2h/info.json b/keyboards/smithrune/iron180v2/v2h/keyboard.json
similarity index 100%
rename from keyboards/smithrune/iron180v2/v2h/info.json
rename to keyboards/smithrune/iron180v2/v2h/keyboard.json
diff --git a/keyboards/smithrune/iron180v2/v2h/rules.mk b/keyboards/smithrune/iron180v2/v2h/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/smithrune/iron180v2/v2h/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/iron180v2/v2s/info.json b/keyboards/smithrune/iron180v2/v2s/keyboard.json
similarity index 100%
rename from keyboards/smithrune/iron180v2/v2s/info.json
rename to keyboards/smithrune/iron180v2/v2s/keyboard.json
diff --git a/keyboards/smithrune/iron180v2/v2s/rules.mk b/keyboards/smithrune/iron180v2/v2s/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/smithrune/iron180v2/v2s/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/keyboard.json
similarity index 100%
rename from keyboards/smithrune/magnus/m75h/info.json
rename to keyboards/smithrune/magnus/m75h/keyboard.json
diff --git a/keyboards/smithrune/magnus/m75h/rules.mk b/keyboards/smithrune/magnus/m75h/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/smithrune/magnus/m75h/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/magnus/m75s/info.json b/keyboards/smithrune/magnus/m75s/keyboard.json
similarity index 100%
rename from keyboards/smithrune/magnus/m75s/info.json
rename to keyboards/smithrune/magnus/m75s/keyboard.json
diff --git a/keyboards/smithrune/magnus/m75s/rules.mk b/keyboards/smithrune/magnus/m75s/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/smithrune/magnus/m75s/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smoll/lefty/rev1/info.json b/keyboards/smoll/lefty/rev1/keyboard.json
similarity index 100%
rename from keyboards/smoll/lefty/rev1/info.json
rename to keyboards/smoll/lefty/rev1/keyboard.json
diff --git a/keyboards/smoll/lefty/rev1/rules.mk b/keyboards/smoll/lefty/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/smoll/lefty/rev2/info.json b/keyboards/smoll/lefty/rev2/keyboard.json
similarity index 100%
rename from keyboards/smoll/lefty/rev2/info.json
rename to keyboards/smoll/lefty/rev2/keyboard.json
diff --git a/keyboards/smoll/lefty/rev2/rules.mk b/keyboards/smoll/lefty/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/smoll/pw88/info.json b/keyboards/smoll/pw88/keyboard.json
similarity index 100%
rename from keyboards/smoll/pw88/info.json
rename to keyboards/smoll/pw88/keyboard.json
diff --git a/keyboards/smoll/pw88/rules.mk b/keyboards/smoll/pw88/rules.mk
deleted file mode 100644
index c628fc7d0fe..00000000000
--- a/keyboards/smoll/pw88/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally blank
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/keyboard.json
similarity index 100%
rename from keyboards/sofle/keyhive/info.json
rename to keyboards/sofle/keyhive/keyboard.json
diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sofle/keyhive/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/keyboard.json
similarity index 100%
rename from keyboards/sofle/rev1/info.json
rename to keyboards/sofle/rev1/keyboard.json
diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sofle/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/sofle_choc/info.json b/keyboards/sofle_choc/keyboard.json
similarity index 100%
rename from keyboards/sofle_choc/info.json
rename to keyboards/sofle_choc/keyboard.json
diff --git a/keyboards/sofle_choc/rules.mk b/keyboards/sofle_choc/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/split67/info.json b/keyboards/split67/keyboard.json
similarity index 100%
rename from keyboards/split67/info.json
rename to keyboards/split67/keyboard.json
diff --git a/keyboards/split67/rules.mk b/keyboards/split67/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/split67/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/keyboard.json
similarity index 100%
rename from keyboards/splitkb/aurora/corne/rev1/info.json
rename to keyboards/splitkb/aurora/corne/rev1/keyboard.json
diff --git a/keyboards/splitkb/aurora/corne/rev1/rules.mk b/keyboards/splitkb/aurora/corne/rev1/rules.mk
deleted file mode 100644
index dd523382835..00000000000
--- a/keyboards/splitkb/aurora/corne/rev1/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 splitkb.com <support@splitkb.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Although no rules are defined,
-# presence of this file is required for QMK to compile it.
diff --git a/keyboards/splitkb/aurora/helix/rev1/info.json b/keyboards/splitkb/aurora/helix/rev1/keyboard.json
similarity index 100%
rename from keyboards/splitkb/aurora/helix/rev1/info.json
rename to keyboards/splitkb/aurora/helix/rev1/keyboard.json
diff --git a/keyboards/splitkb/aurora/helix/rev1/rules.mk b/keyboards/splitkb/aurora/helix/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/keyboard.json
similarity index 100%
rename from keyboards/splitkb/aurora/lily58/rev1/info.json
rename to keyboards/splitkb/aurora/lily58/rev1/keyboard.json
diff --git a/keyboards/splitkb/aurora/lily58/rev1/rules.mk b/keyboards/splitkb/aurora/lily58/rev1/rules.mk
deleted file mode 100644
index dd523382835..00000000000
--- a/keyboards/splitkb/aurora/lily58/rev1/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 splitkb.com <support@splitkb.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Although no rules are defined,
-# presence of this file is required for QMK to compile it.
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/info.json b/keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
similarity index 100%
rename from keyboards/splitkb/aurora/sofle_v2/rev1/info.json
rename to keyboards/splitkb/aurora/sofle_v2/rev1/keyboard.json
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/rules.mk b/keyboards/splitkb/aurora/sofle_v2/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/keyboard.json
similarity index 100%
rename from keyboards/splitkb/aurora/sweep/rev1/info.json
rename to keyboards/splitkb/aurora/sweep/rev1/keyboard.json
diff --git a/keyboards/splitkb/aurora/sweep/rev1/rules.mk b/keyboards/splitkb/aurora/sweep/rev1/rules.mk
deleted file mode 100644
index c4275031caf..00000000000
--- a/keyboards/splitkb/aurora/sweep/rev1/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 splitkb.com <support@splitkb.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Although no rules are defined,
-# presence of this file is required for QMK to compile it.
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/rev1/base/info.json b/keyboards/splitkb/kyria/rev1/base/keyboard.json
similarity index 100%
rename from keyboards/splitkb/kyria/rev1/base/info.json
rename to keyboards/splitkb/kyria/rev1/base/keyboard.json
diff --git a/keyboards/splitkb/kyria/rev1/base/rules.mk b/keyboards/splitkb/kyria/rev1/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/splitkb/kyria/rev2/base/info.json b/keyboards/splitkb/kyria/rev2/base/keyboard.json
similarity index 100%
rename from keyboards/splitkb/kyria/rev2/base/info.json
rename to keyboards/splitkb/kyria/rev2/base/keyboard.json
diff --git a/keyboards/splitkb/kyria/rev2/base/rules.mk b/keyboards/splitkb/kyria/rev2/base/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/keyboard.json
similarity index 100%
rename from keyboards/splitkb/kyria/rev3/info.json
rename to keyboards/splitkb/kyria/rev3/keyboard.json
diff --git a/keyboards/splitkb/kyria/rev3/rules.mk b/keyboards/splitkb/kyria/rev3/rules.mk
deleted file mode 100644
index 55e87248482..00000000000
--- a/keyboards/splitkb/kyria/rev3/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Although no rules are defined,
-# presence of this file is required for QMK to compile it.
diff --git a/keyboards/splitography/info.json b/keyboards/splitography/keyboard.json
similarity index 100%
rename from keyboards/splitography/info.json
rename to keyboards/splitography/keyboard.json
diff --git a/keyboards/splitography/rules.mk b/keyboards/splitography/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/sthlmkb/litl/info.json b/keyboards/sthlmkb/litl/keyboard.json
similarity index 100%
rename from keyboards/sthlmkb/litl/info.json
rename to keyboards/sthlmkb/litl/keyboard.json
diff --git a/keyboards/sthlmkb/litl/rules.mk b/keyboards/sthlmkb/litl/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/sthlmkb/litl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/strech/soulstone/info.json b/keyboards/strech/soulstone/keyboard.json
similarity index 100%
rename from keyboards/strech/soulstone/info.json
rename to keyboards/strech/soulstone/keyboard.json
diff --git a/keyboards/strech/soulstone/rules.mk b/keyboards/strech/soulstone/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/strech/soulstone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/keyboard.json
similarity index 100%
rename from keyboards/studiokestra/frl84/info.json
rename to keyboards/studiokestra/frl84/keyboard.json
diff --git a/keyboards/studiokestra/frl84/rules.mk b/keyboards/studiokestra/frl84/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/studiokestra/frl84/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/keyboard.json
similarity index 100%
rename from keyboards/studiokestra/galatea/rev1/info.json
rename to keyboards/studiokestra/galatea/rev1/keyboard.json
diff --git a/keyboards/studiokestra/galatea/rev1/rules.mk b/keyboards/studiokestra/galatea/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/studiokestra/galatea/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/keyboard.json
similarity index 100%
rename from keyboards/studiokestra/galatea/rev2/info.json
rename to keyboards/studiokestra/galatea/rev2/keyboard.json
diff --git a/keyboards/studiokestra/galatea/rev2/rules.mk b/keyboards/studiokestra/galatea/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/studiokestra/galatea/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/studiokestra/galatea/rev3/info.json b/keyboards/studiokestra/galatea/rev3/keyboard.json
similarity index 100%
rename from keyboards/studiokestra/galatea/rev3/info.json
rename to keyboards/studiokestra/galatea/rev3/keyboard.json
diff --git a/keyboards/studiokestra/galatea/rev3/rules.mk b/keyboards/studiokestra/galatea/rev3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/studiokestra/galatea/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/studiokestra/line_friends_tkl/info.json b/keyboards/studiokestra/line_friends_tkl/keyboard.json
similarity index 100%
rename from keyboards/studiokestra/line_friends_tkl/info.json
rename to keyboards/studiokestra/line_friends_tkl/keyboard.json
diff --git a/keyboards/studiokestra/line_friends_tkl/rules.mk b/keyboards/studiokestra/line_friends_tkl/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/studiokestra/line_friends_tkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/subrezon/lancer/info.json b/keyboards/subrezon/lancer/keyboard.json
similarity index 100%
rename from keyboards/subrezon/lancer/info.json
rename to keyboards/subrezon/lancer/keyboard.json
diff --git a/keyboards/subrezon/lancer/rules.mk b/keyboards/subrezon/lancer/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/subrezon/lancer/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/swiss/info.json b/keyboards/swiss/keyboard.json
similarity index 100%
rename from keyboards/swiss/info.json
rename to keyboards/swiss/keyboard.json
diff --git a/keyboards/swiss/rules.mk b/keyboards/swiss/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/swiss/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/syenakeyboards/aswagata/info.json b/keyboards/syenakeyboards/aswagata/keyboard.json
similarity index 100%
rename from keyboards/syenakeyboards/aswagata/info.json
rename to keyboards/syenakeyboards/aswagata/keyboard.json
diff --git a/keyboards/syenakeyboards/aswagata/rules.mk b/keyboards/syenakeyboards/aswagata/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/syenakeyboards/aswagata/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/keyboard.json
similarity index 100%
rename from keyboards/synthandkeys/bento_box/info.json
rename to keyboards/synthandkeys/bento_box/keyboard.json
diff --git a/keyboards/synthandkeys/bento_box/rules.mk b/keyboards/synthandkeys/bento_box/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/synthandkeys/bento_box/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/synthandkeys/the_debit_card/info.json b/keyboards/synthandkeys/the_debit_card/keyboard.json
similarity index 100%
rename from keyboards/synthandkeys/the_debit_card/info.json
rename to keyboards/synthandkeys/the_debit_card/keyboard.json
diff --git a/keyboards/synthandkeys/the_debit_card/rules.mk b/keyboards/synthandkeys/the_debit_card/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/synthandkeys/the_debit_card/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/keyboard.json
similarity index 100%
rename from keyboards/synthlabs/060/info.json
rename to keyboards/synthlabs/060/keyboard.json
diff --git a/keyboards/synthlabs/060/rules.mk b/keyboards/synthlabs/060/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/synthlabs/065/info.json b/keyboards/synthlabs/065/keyboard.json
similarity index 100%
rename from keyboards/synthlabs/065/info.json
rename to keyboards/synthlabs/065/keyboard.json
diff --git a/keyboards/synthlabs/065/rules.mk b/keyboards/synthlabs/065/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/tacworks/tac_k1/info.json b/keyboards/tacworks/tac_k1/keyboard.json
similarity index 100%
rename from keyboards/tacworks/tac_k1/info.json
rename to keyboards/tacworks/tac_k1/keyboard.json
diff --git a/keyboards/tacworks/tac_k1/rules.mk b/keyboards/tacworks/tac_k1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tacworks/tac_k1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/baumkuchen/info.json b/keyboards/takashicompany/baumkuchen/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/baumkuchen/info.json
rename to keyboards/takashicompany/baumkuchen/keyboard.json
diff --git a/keyboards/takashicompany/baumkuchen/rules.mk b/keyboards/takashicompany/baumkuchen/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/takashicompany/baumkuchen/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/dogtag/info.json
rename to keyboards/takashicompany/dogtag/keyboard.json
diff --git a/keyboards/takashicompany/dogtag/rules.mk b/keyboards/takashicompany/dogtag/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/dogtag/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/ejectix/info.json b/keyboards/takashicompany/ejectix/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/ejectix/info.json
rename to keyboards/takashicompany/ejectix/keyboard.json
diff --git a/keyboards/takashicompany/ejectix/rules.mk b/keyboards/takashicompany/ejectix/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/ejectix/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/ergomirage/info.json b/keyboards/takashicompany/ergomirage/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/ergomirage/info.json
rename to keyboards/takashicompany/ergomirage/keyboard.json
diff --git a/keyboards/takashicompany/ergomirage/rules.mk b/keyboards/takashicompany/ergomirage/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/ergomirage/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/goat51/info.json
rename to keyboards/takashicompany/goat51/keyboard.json
diff --git a/keyboards/takashicompany/goat51/rules.mk b/keyboards/takashicompany/goat51/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/takashicompany/goat51/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/heavy_left/info.json
rename to keyboards/takashicompany/heavy_left/keyboard.json
diff --git a/keyboards/takashicompany/heavy_left/rules.mk b/keyboards/takashicompany/heavy_left/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/heavy_left/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/minidivide/info.json b/keyboards/takashicompany/minidivide/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/minidivide/info.json
rename to keyboards/takashicompany/minidivide/keyboard.json
diff --git a/keyboards/takashicompany/minidivide/rules.mk b/keyboards/takashicompany/minidivide/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/takashicompany/minidivide/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/takashicompany/minidivide_max/info.json b/keyboards/takashicompany/minidivide_max/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/minidivide_max/info.json
rename to keyboards/takashicompany/minidivide_max/keyboard.json
diff --git a/keyboards/takashicompany/minidivide_max/rules.mk b/keyboards/takashicompany/minidivide_max/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/minidivide_max/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/minizone/info.json
rename to keyboards/takashicompany/minizone/keyboard.json
diff --git a/keyboards/takashicompany/minizone/rules.mk b/keyboards/takashicompany/minizone/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/minizone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/rookey/info.json b/keyboards/takashicompany/rookey/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/rookey/info.json
rename to keyboards/takashicompany/rookey/keyboard.json
diff --git a/keyboards/takashicompany/rookey/rules.mk b/keyboards/takashicompany/rookey/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/rookey/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/keyboard.json
similarity index 100%
rename from keyboards/takashicompany/tightwriter/info.json
rename to keyboards/takashicompany/tightwriter/keyboard.json
diff --git a/keyboards/takashicompany/tightwriter/rules.mk b/keyboards/takashicompany/tightwriter/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/takashicompany/tightwriter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/takashiski/namecard2x4/rev1/info.json b/keyboards/takashiski/namecard2x4/rev1/keyboard.json
similarity index 100%
rename from keyboards/takashiski/namecard2x4/rev1/info.json
rename to keyboards/takashiski/namecard2x4/rev1/keyboard.json
diff --git a/keyboards/takashiski/namecard2x4/rev1/rules.mk b/keyboards/takashiski/namecard2x4/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/takashiski/namecard2x4/rev2/info.json b/keyboards/takashiski/namecard2x4/rev2/keyboard.json
similarity index 100%
rename from keyboards/takashiski/namecard2x4/rev2/info.json
rename to keyboards/takashiski/namecard2x4/rev2/keyboard.json
diff --git a/keyboards/takashiski/namecard2x4/rev2/rules.mk b/keyboards/takashiski/namecard2x4/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/keyboard.json
similarity index 100%
rename from keyboards/tau4/info.json
rename to keyboards/tau4/keyboard.json
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
deleted file mode 100644
index 0001ae06b81..00000000000
--- a/keyboards/tau4/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# EEPROM_DRIVER ?= i2c        # Driver for external EEPROM chip
-# This is currently not working due to QMK not officially supporting the chip used on the Tau4, I am working on a fix.
diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/keyboard.json
similarity index 100%
rename from keyboards/teahouse/ayleen/info.json
rename to keyboards/teahouse/ayleen/keyboard.json
diff --git a/keyboards/teahouse/ayleen/rules.mk b/keyboards/teahouse/ayleen/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/teahouse/ayleen/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/teleport/native/ansi/info.json b/keyboards/teleport/native/ansi/keyboard.json
similarity index 100%
rename from keyboards/teleport/native/ansi/info.json
rename to keyboards/teleport/native/ansi/keyboard.json
diff --git a/keyboards/teleport/native/ansi/rules.mk b/keyboards/teleport/native/ansi/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/teleport/native/ansi/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/teleport/native/iso/info.json b/keyboards/teleport/native/iso/keyboard.json
similarity index 100%
rename from keyboards/teleport/native/iso/info.json
rename to keyboards/teleport/native/iso/keyboard.json
diff --git a/keyboards/teleport/native/iso/rules.mk b/keyboards/teleport/native/iso/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/teleport/native/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/teleport/tkl/info.json b/keyboards/teleport/tkl/keyboard.json
similarity index 100%
rename from keyboards/teleport/tkl/info.json
rename to keyboards/teleport/tkl/keyboard.json
diff --git a/keyboards/teleport/tkl/rules.mk b/keyboards/teleport/tkl/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/teleport/tkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tg67/info.json b/keyboards/tg67/keyboard.json
similarity index 100%
rename from keyboards/tg67/info.json
rename to keyboards/tg67/keyboard.json
diff --git a/keyboards/tg67/rules.mk b/keyboards/tg67/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tg67/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/info.json b/keyboards/themadnoodle/ncc1701kb/v2/keyboard.json
similarity index 100%
rename from keyboards/themadnoodle/ncc1701kb/v2/info.json
rename to keyboards/themadnoodle/ncc1701kb/v2/keyboard.json
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk b/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/themadnoodle/ncc1701kb/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/themadnoodle/noodlepad/v1/info.json b/keyboards/themadnoodle/noodlepad/v1/keyboard.json
similarity index 100%
rename from keyboards/themadnoodle/noodlepad/v1/info.json
rename to keyboards/themadnoodle/noodlepad/v1/keyboard.json
diff --git a/keyboards/themadnoodle/noodlepad/v1/rules.mk b/keyboards/themadnoodle/noodlepad/v1/rules.mk
deleted file mode 100644
index bd924561489..00000000000
--- a/keyboards/themadnoodle/noodlepad/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#this file was left intentionally blank
diff --git a/keyboards/themadnoodle/noodlepad/v2/info.json b/keyboards/themadnoodle/noodlepad/v2/keyboard.json
similarity index 100%
rename from keyboards/themadnoodle/noodlepad/v2/info.json
rename to keyboards/themadnoodle/noodlepad/v2/keyboard.json
diff --git a/keyboards/themadnoodle/noodlepad/v2/rules.mk b/keyboards/themadnoodle/noodlepad/v2/rules.mk
deleted file mode 100644
index bd924561489..00000000000
--- a/keyboards/themadnoodle/noodlepad/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-#this file was left intentionally blank
diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/keyboard.json
similarity index 100%
rename from keyboards/themadnoodle/noodlepad_micro/info.json
rename to keyboards/themadnoodle/noodlepad_micro/keyboard.json
diff --git a/keyboards/themadnoodle/noodlepad_micro/rules.mk b/keyboards/themadnoodle/noodlepad_micro/rules.mk
deleted file mode 100644
index 6968c523355..00000000000
--- a/keyboards/themadnoodle/noodlepad_micro/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file intentionally left blank
-
diff --git a/keyboards/themadnoodle/udon13/info.json b/keyboards/themadnoodle/udon13/keyboard.json
similarity index 100%
rename from keyboards/themadnoodle/udon13/info.json
rename to keyboards/themadnoodle/udon13/keyboard.json
diff --git a/keyboards/themadnoodle/udon13/rules.mk b/keyboards/themadnoodle/udon13/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/themadnoodle/udon13/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/theone/info.json b/keyboards/theone/keyboard.json
similarity index 100%
rename from keyboards/theone/info.json
rename to keyboards/theone/keyboard.json
diff --git a/keyboards/theone/rules.mk b/keyboards/theone/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/theone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tkw/grandiceps/rev1/info.json b/keyboards/tkw/grandiceps/rev1/keyboard.json
similarity index 100%
rename from keyboards/tkw/grandiceps/rev1/info.json
rename to keyboards/tkw/grandiceps/rev1/keyboard.json
diff --git a/keyboards/tkw/grandiceps/rev1/rules.mk b/keyboards/tkw/grandiceps/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/tkw/stoutgat/v2/f411/info.json b/keyboards/tkw/stoutgat/v2/f411/keyboard.json
similarity index 100%
rename from keyboards/tkw/stoutgat/v2/f411/info.json
rename to keyboards/tkw/stoutgat/v2/f411/keyboard.json
diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/keyboard.json
similarity index 100%
rename from keyboards/tominabox1/le_chiffre/he/info.json
rename to keyboards/tominabox1/le_chiffre/he/keyboard.json
diff --git a/keyboards/tominabox1/le_chiffre/he/rules.mk b/keyboards/tominabox1/le_chiffre/he/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tominabox1/le_chiffre/he/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/keyboard.json
similarity index 100%
rename from keyboards/tominabox1/le_chiffre/rev1/info.json
rename to keyboards/tominabox1/le_chiffre/rev1/keyboard.json
diff --git a/keyboards/tominabox1/le_chiffre/rev1/rules.mk b/keyboards/tominabox1/le_chiffre/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tominabox1/le_chiffre/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/keyboard.json
similarity index 100%
rename from keyboards/tominabox1/le_chiffre/rev2/info.json
rename to keyboards/tominabox1/le_chiffre/rev2/keyboard.json
diff --git a/keyboards/tominabox1/le_chiffre/rev2/rules.mk b/keyboards/tominabox1/le_chiffre/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tominabox1/le_chiffre/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/trainpad/info.json b/keyboards/trainpad/keyboard.json
similarity index 100%
rename from keyboards/trainpad/info.json
rename to keyboards/trainpad/keyboard.json
diff --git a/keyboards/trainpad/rules.mk b/keyboards/trainpad/rules.mk
deleted file mode 100644
index 2c49b41d7a0..00000000000
--- a/keyboards/trainpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally left blank
\ No newline at end of file
diff --git a/keyboards/treasure/type9s3/info.json b/keyboards/treasure/type9s3/keyboard.json
similarity index 100%
rename from keyboards/treasure/type9s3/info.json
rename to keyboards/treasure/type9s3/keyboard.json
diff --git a/keyboards/treasure/type9s3/rules.mk b/keyboards/treasure/type9s3/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/treasure/type9s3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tweetydabird/chameleon/info.json b/keyboards/tweetydabird/chameleon/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/chameleon/info.json
rename to keyboards/tweetydabird/chameleon/keyboard.json
diff --git a/keyboards/tweetydabird/chameleon/rules.mk b/keyboards/tweetydabird/chameleon/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tweetydabird/chameleon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lbs4/info.json
rename to keyboards/tweetydabird/lbs4/keyboard.json
diff --git a/keyboards/tweetydabird/lbs4/rules.mk b/keyboards/tweetydabird/lbs4/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/tweetydabird/lbs4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lbs6/info.json
rename to keyboards/tweetydabird/lbs6/keyboard.json
diff --git a/keyboards/tweetydabird/lbs6/rules.mk b/keyboards/tweetydabird/lbs6/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/tweetydabird/lbs6/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/elite_c/info.json
rename to keyboards/tweetydabird/lotus58/elite_c/keyboard.json
diff --git a/keyboards/tweetydabird/lotus58/elite_c/rules.mk b/keyboards/tweetydabird/lotus58/elite_c/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tweetydabird/lotus58/elite_c/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tweetydabird/lotus58/promicro/info.json b/keyboards/tweetydabird/lotus58/promicro/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/promicro/info.json
rename to keyboards/tweetydabird/lotus58/promicro/keyboard.json
diff --git a/keyboards/tweetydabird/lotus58/promicro/rules.mk b/keyboards/tweetydabird/lotus58/promicro/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/tweetydabird/lotus58/promicro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/tzarc/djinn/rev1/info.json b/keyboards/tzarc/djinn/rev1/keyboard.json
similarity index 100%
rename from keyboards/tzarc/djinn/rev1/info.json
rename to keyboards/tzarc/djinn/rev1/keyboard.json
diff --git a/keyboards/tzarc/djinn/rev1/rules.mk b/keyboards/tzarc/djinn/rev1/rules.mk
deleted file mode 100644
index f4688728490..00000000000
--- a/keyboards/tzarc/djinn/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Placeholder to make the build system work.
diff --git a/keyboards/tzarc/djinn/rev2/info.json b/keyboards/tzarc/djinn/rev2/keyboard.json
similarity index 100%
rename from keyboards/tzarc/djinn/rev2/info.json
rename to keyboards/tzarc/djinn/rev2/keyboard.json
diff --git a/keyboards/tzarc/djinn/rev2/rules.mk b/keyboards/tzarc/djinn/rev2/rules.mk
deleted file mode 100644
index f4688728490..00000000000
--- a/keyboards/tzarc/djinn/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Placeholder to make the build system work.
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/info.json b/keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json
similarity index 100%
rename from keyboards/tzarc/ghoul/rev1/rp2040/info.json
rename to keyboards/tzarc/ghoul/rev1/rp2040/keyboard.json
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk b/keyboards/tzarc/ghoul/rev1/rp2040/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/info.json b/keyboards/tzarc/ghoul/rev1/stm32/keyboard.json
similarity index 100%
rename from keyboards/tzarc/ghoul/rev1/stm32/info.json
rename to keyboards/tzarc/ghoul/rev1/stm32/keyboard.json
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/varanidae/info.json b/keyboards/varanidae/keyboard.json
similarity index 100%
rename from keyboards/varanidae/info.json
rename to keyboards/varanidae/keyboard.json
diff --git a/keyboards/varanidae/rules.mk b/keyboards/varanidae/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/varanidae/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/vertex/cycle8/info.json b/keyboards/vertex/cycle8/keyboard.json
similarity index 100%
rename from keyboards/vertex/cycle8/info.json
rename to keyboards/vertex/cycle8/keyboard.json
diff --git a/keyboards/vertex/cycle8/rules.mk b/keyboards/vertex/cycle8/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/vertex/cycle8/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/vertex/t75/info.json b/keyboards/vertex/t75/keyboard.json
similarity index 100%
rename from keyboards/vertex/t75/info.json
rename to keyboards/vertex/t75/keyboard.json
diff --git a/keyboards/vertex/t75/rules.mk b/keyboards/vertex/t75/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/vertex/t75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/keyboard.json
similarity index 100%
rename from keyboards/viktus/minne/info.json
rename to keyboards/viktus/minne/keyboard.json
diff --git a/keyboards/viktus/minne/rules.mk b/keyboards/viktus/minne/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/viktus/minne/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2/info.json
rename to keyboards/viktus/osav2/keyboard.json
diff --git a/keyboards/viktus/osav2/rules.mk b/keyboards/viktus/osav2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/viktus/osav2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_numpad/info.json
rename to keyboards/viktus/osav2_numpad/keyboard.json
diff --git a/keyboards/viktus/osav2_numpad/rules.mk b/keyboards/viktus/osav2_numpad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/viktus/osav2_numpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/sp111_v2/info.json b/keyboards/viktus/sp111_v2/keyboard.json
similarity index 100%
rename from keyboards/viktus/sp111_v2/info.json
rename to keyboards/viktus/sp111_v2/keyboard.json
diff --git a/keyboards/viktus/sp111_v2/rules.mk b/keyboards/viktus/sp111_v2/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/viktus/sp111_v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/werk_technica/one/info.json b/keyboards/werk_technica/one/keyboard.json
similarity index 100%
rename from keyboards/werk_technica/one/info.json
rename to keyboards/werk_technica/one/keyboard.json
diff --git a/keyboards/werk_technica/one/rules.mk b/keyboards/werk_technica/one/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/werk_technica/one/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/keyboard.json
similarity index 100%
rename from keyboards/westm/westm68/rev1/info.json
rename to keyboards/westm/westm68/rev1/keyboard.json
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/keyboard.json
similarity index 100%
rename from keyboards/westm/westm68/rev2/info.json
rename to keyboards/westm/westm68/rev2/keyboard.json
diff --git a/keyboards/westm/westm68/rev2/rules.mk b/keyboards/westm/westm68/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/keyboard.json
similarity index 100%
rename from keyboards/westm/westm9/rev1/info.json
rename to keyboards/westm/westm9/rev1/keyboard.json
diff --git a/keyboards/westm/westm9/rev1/rules.mk b/keyboards/westm/westm9/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/keyboard.json
similarity index 100%
rename from keyboards/westm/westm9/rev2/info.json
rename to keyboards/westm/westm9/rev2/keyboard.json
diff --git a/keyboards/westm/westm9/rev2/rules.mk b/keyboards/westm/westm9/rev2/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/wilba_tech/wt20_h1/info.json b/keyboards/wilba_tech/wt20_h1/keyboard.json
similarity index 100%
rename from keyboards/wilba_tech/wt20_h1/info.json
rename to keyboards/wilba_tech/wt20_h1/keyboard.json
diff --git a/keyboards/wilba_tech/wt20_h1/rules.mk b/keyboards/wilba_tech/wt20_h1/rules.mk
deleted file mode 100644
index c80812f6e0a..00000000000
--- a/keyboards/wilba_tech/wt20_h1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/wilba_tech/wt60_d/info.json b/keyboards/wilba_tech/wt60_d/keyboard.json
similarity index 100%
rename from keyboards/wilba_tech/wt60_d/info.json
rename to keyboards/wilba_tech/wt60_d/keyboard.json
diff --git a/keyboards/wilba_tech/wt60_d/rules.mk b/keyboards/wilba_tech/wt60_d/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/wilba_tech/wt60_d/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/wilba_tech/wt65_g3/info.json b/keyboards/wilba_tech/wt65_g3/keyboard.json
similarity index 100%
rename from keyboards/wilba_tech/wt65_g3/info.json
rename to keyboards/wilba_tech/wt65_g3/keyboard.json
diff --git a/keyboards/wilba_tech/wt65_g3/rules.mk b/keyboards/wilba_tech/wt65_g3/rules.mk
deleted file mode 100644
index c80812f6e0a..00000000000
--- a/keyboards/wilba_tech/wt65_g3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/wilba_tech/wt65_h2/info.json b/keyboards/wilba_tech/wt65_h2/keyboard.json
similarity index 100%
rename from keyboards/wilba_tech/wt65_h2/info.json
rename to keyboards/wilba_tech/wt65_h2/keyboard.json
diff --git a/keyboards/wilba_tech/wt65_h2/rules.mk b/keyboards/wilba_tech/wt65_h2/rules.mk
deleted file mode 100644
index c80812f6e0a..00000000000
--- a/keyboards/wilba_tech/wt65_h2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/wilba_tech/wt65_h3/info.json b/keyboards/wilba_tech/wt65_h3/keyboard.json
similarity index 100%
rename from keyboards/wilba_tech/wt65_h3/info.json
rename to keyboards/wilba_tech/wt65_h3/keyboard.json
diff --git a/keyboards/wilba_tech/wt65_h3/rules.mk b/keyboards/wilba_tech/wt65_h3/rules.mk
deleted file mode 100644
index c80812f6e0a..00000000000
--- a/keyboards/wilba_tech/wt65_h3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/willoucom/keypad/info.json b/keyboards/willoucom/keypad/keyboard.json
similarity index 100%
rename from keyboards/willoucom/keypad/info.json
rename to keyboards/willoucom/keypad/keyboard.json
diff --git a/keyboards/willoucom/keypad/rules.mk b/keyboards/willoucom/keypad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/willoucom/keypad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/wolf/silhouette/info.json b/keyboards/wolf/silhouette/keyboard.json
similarity index 100%
rename from keyboards/wolf/silhouette/info.json
rename to keyboards/wolf/silhouette/keyboard.json
diff --git a/keyboards/wolf/silhouette/rules.mk b/keyboards/wolf/silhouette/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/wolf/twilight/info.json b/keyboards/wolf/twilight/keyboard.json
similarity index 100%
rename from keyboards/wolf/twilight/info.json
rename to keyboards/wolf/twilight/keyboard.json
diff --git a/keyboards/wolf/twilight/rules.mk b/keyboards/wolf/twilight/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/wolf/twilight/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/wolf/ziggurat/info.json b/keyboards/wolf/ziggurat/keyboard.json
similarity index 100%
rename from keyboards/wolf/ziggurat/info.json
rename to keyboards/wolf/ziggurat/keyboard.json
diff --git a/keyboards/wolf/ziggurat/rules.mk b/keyboards/wolf/ziggurat/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/wolf/ziggurat/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/work_louder/loop/rev1/info.json b/keyboards/work_louder/loop/rev1/keyboard.json
similarity index 100%
rename from keyboards/work_louder/loop/rev1/info.json
rename to keyboards/work_louder/loop/rev1/keyboard.json
diff --git a/keyboards/work_louder/loop/rev1/rules.mk b/keyboards/work_louder/loop/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/work_louder/loop/rev3/info.json b/keyboards/work_louder/loop/rev3/keyboard.json
similarity index 100%
rename from keyboards/work_louder/loop/rev3/info.json
rename to keyboards/work_louder/loop/rev3/keyboard.json
diff --git a/keyboards/work_louder/loop/rev3/rules.mk b/keyboards/work_louder/loop/rev3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/work_louder/work_board/rev1/info.json b/keyboards/work_louder/work_board/rev1/keyboard.json
similarity index 100%
rename from keyboards/work_louder/work_board/rev1/info.json
rename to keyboards/work_louder/work_board/rev1/keyboard.json
diff --git a/keyboards/work_louder/work_board/rev1/rules.mk b/keyboards/work_louder/work_board/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/work_louder/work_board/rev3/info.json b/keyboards/work_louder/work_board/rev3/keyboard.json
similarity index 100%
rename from keyboards/work_louder/work_board/rev3/info.json
rename to keyboards/work_louder/work_board/rev3/keyboard.json
diff --git a/keyboards/work_louder/work_board/rev3/rules.mk b/keyboards/work_louder/work_board/rev3/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/keyboard.json
similarity index 100%
rename from keyboards/wuque/nemui65/info.json
rename to keyboards/wuque/nemui65/keyboard.json
diff --git a/keyboards/wuque/nemui65/rules.mk b/keyboards/wuque/nemui65/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/wuque/nemui65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/yandrstudio/transition80/info.json b/keyboards/yandrstudio/transition80/keyboard.json
similarity index 100%
rename from keyboards/yandrstudio/transition80/info.json
rename to keyboards/yandrstudio/transition80/keyboard.json
diff --git a/keyboards/yandrstudio/transition80/rules.mk b/keyboards/yandrstudio/transition80/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/yandrstudio/transition80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/yanghu/unicorne/f411/info.json b/keyboards/yanghu/unicorne/f411/keyboard.json
similarity index 100%
rename from keyboards/yanghu/unicorne/f411/info.json
rename to keyboards/yanghu/unicorne/f411/keyboard.json
diff --git a/keyboards/yanghu/unicorne/f411/rules.mk b/keyboards/yanghu/unicorne/f411/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ydkb/ydpm40/info.json b/keyboards/ydkb/ydpm40/keyboard.json
similarity index 100%
rename from keyboards/ydkb/ydpm40/info.json
rename to keyboards/ydkb/ydpm40/keyboard.json
diff --git a/keyboards/ydkb/ydpm40/rules.mk b/keyboards/ydkb/ydpm40/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ydkb/ydpm40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ymdk/melody96/hotswap/info.json b/keyboards/ymdk/melody96/hotswap/keyboard.json
similarity index 100%
rename from keyboards/ymdk/melody96/hotswap/info.json
rename to keyboards/ymdk/melody96/hotswap/keyboard.json
diff --git a/keyboards/ymdk/melody96/hotswap/rules.mk b/keyboards/ymdk/melody96/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ymdk/melody96/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ymdk/yd60mq/12led/info.json b/keyboards/ymdk/yd60mq/12led/keyboard.json
similarity index 100%
rename from keyboards/ymdk/yd60mq/12led/info.json
rename to keyboards/ymdk/yd60mq/12led/keyboard.json
diff --git a/keyboards/ymdk/yd60mq/12led/rules.mk b/keyboards/ymdk/yd60mq/12led/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ymdk/yd60mq/16led/info.json b/keyboards/ymdk/yd60mq/16led/keyboard.json
similarity index 100%
rename from keyboards/ymdk/yd60mq/16led/info.json
rename to keyboards/ymdk/yd60mq/16led/keyboard.json
diff --git a/keyboards/ymdk/yd60mq/16led/rules.mk b/keyboards/ymdk/yd60mq/16led/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/ymdk/ymd09/info.json b/keyboards/ymdk/ymd09/keyboard.json
similarity index 100%
rename from keyboards/ymdk/ymd09/info.json
rename to keyboards/ymdk/ymd09/keyboard.json
diff --git a/keyboards/ymdk/ymd09/rules.mk b/keyboards/ymdk/ymd09/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ymdk/ymd09/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/ymdk/ymd75/rev4/iso/info.json b/keyboards/ymdk/ymd75/rev4/iso/keyboard.json
similarity index 100%
rename from keyboards/ymdk/ymd75/rev4/iso/info.json
rename to keyboards/ymdk/ymd75/rev4/iso/keyboard.json
diff --git a/keyboards/ymdk/ymd75/rev4/iso/rules.mk b/keyboards/ymdk/ymd75/rev4/iso/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/ymdk/ymd75/rev4/iso/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/yushakobo/ergo68/info.json b/keyboards/yushakobo/ergo68/keyboard.json
similarity index 100%
rename from keyboards/yushakobo/ergo68/info.json
rename to keyboards/yushakobo/ergo68/keyboard.json
diff --git a/keyboards/yushakobo/ergo68/rules.mk b/keyboards/yushakobo/ergo68/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/yushakobo/ergo68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/keyboard.json
similarity index 100%
rename from keyboards/yushakobo/navpad/10/rev0/info.json
rename to keyboards/yushakobo/navpad/10/rev0/keyboard.json
diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/keyboard.json
similarity index 100%
rename from keyboards/yushakobo/navpad/10/rev1/info.json
rename to keyboards/yushakobo/navpad/10/rev1/keyboard.json
diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/yynmt/acperience12/rev1/info.json b/keyboards/yynmt/acperience12/rev1/keyboard.json
similarity index 100%
rename from keyboards/yynmt/acperience12/rev1/info.json
rename to keyboards/yynmt/acperience12/rev1/keyboard.json
diff --git a/keyboards/yynmt/acperience12/rev1/rules.mk b/keyboards/yynmt/acperience12/rev1/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/zeix/eden/info.json b/keyboards/zeix/eden/keyboard.json
similarity index 100%
rename from keyboards/zeix/eden/info.json
rename to keyboards/zeix/eden/keyboard.json
diff --git a/keyboards/zeix/eden/rules.mk b/keyboards/zeix/eden/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/zeix/eden/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/zeix/qwertyqop60hs/info.json b/keyboards/zeix/qwertyqop60hs/keyboard.json
similarity index 100%
rename from keyboards/zeix/qwertyqop60hs/info.json
rename to keyboards/zeix/qwertyqop60hs/keyboard.json
diff --git a/keyboards/zeix/qwertyqop60hs/rules.mk b/keyboards/zeix/qwertyqop60hs/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/zeix/qwertyqop60hs/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/keyboard.json
similarity index 100%
rename from keyboards/zicodia/tklfrlnrlmlao/info.json
rename to keyboards/zicodia/tklfrlnrlmlao/keyboard.json
diff --git a/keyboards/zicodia/tklfrlnrlmlao/rules.mk b/keyboards/zicodia/tklfrlnrlmlao/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/zicodia/tklfrlnrlmlao/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/zlabkeeb/15pad/info.json b/keyboards/zlabkeeb/15pad/keyboard.json
similarity index 100%
rename from keyboards/zlabkeeb/15pad/info.json
rename to keyboards/zlabkeeb/15pad/keyboard.json
diff --git a/keyboards/zlabkeeb/15pad/rules.mk b/keyboards/zlabkeeb/15pad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/zlabkeeb/15pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/zlabkeeb/6pad/info.json b/keyboards/zlabkeeb/6pad/keyboard.json
similarity index 100%
rename from keyboards/zlabkeeb/6pad/info.json
rename to keyboards/zlabkeeb/6pad/keyboard.json
diff --git a/keyboards/zlabkeeb/6pad/rules.mk b/keyboards/zlabkeeb/6pad/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/zlabkeeb/6pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/zos/65s/info.json b/keyboards/zos/65s/keyboard.json
similarity index 100%
rename from keyboards/zos/65s/info.json
rename to keyboards/zos/65s/keyboard.json
diff --git a/keyboards/zos/65s/rules.mk b/keyboards/zos/65s/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/zos/65s/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/zvecr/zv48/f411/info.json b/keyboards/zvecr/zv48/f411/keyboard.json
similarity index 100%
rename from keyboards/zvecr/zv48/f411/info.json
rename to keyboards/zvecr/zv48/f411/keyboard.json
diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/zwag/zwag75/info.json b/keyboards/zwag/zwag75/keyboard.json
similarity index 100%
rename from keyboards/zwag/zwag75/info.json
rename to keyboards/zwag/zwag75/keyboard.json
diff --git a/keyboards/zwag/zwag75/rules.mk b/keyboards/zwag/zwag75/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/zwag/zwag75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/keyboard.json
similarity index 100%
rename from keyboards/zykrah/fuyu/info.json
rename to keyboards/zykrah/fuyu/keyboard.json
diff --git a/keyboards/zykrah/fuyu/rules.mk b/keyboards/zykrah/fuyu/rules.mk
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/keyboards/zykrah/slime88/info.json b/keyboards/zykrah/slime88/keyboard.json
similarity index 100%
rename from keyboards/zykrah/slime88/info.json
rename to keyboards/zykrah/slime88/keyboard.json
diff --git a/keyboards/zykrah/slime88/rules.mk b/keyboards/zykrah/slime88/rules.mk
deleted file mode 100644
index 6e7633bfe01..00000000000
--- a/keyboards/zykrah/slime88/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank