Merge remote-tracking branch 'origin/master' into develop

51 files changed, 1 insertions, 52 deletions

diff --git a/keyboards/acheron/shark/info.json b/keyboards/acheron/shark/info.json
index a2ea784d9..1af8f8cdf 100644
--- a/keyboards/acheron/shark/info.json
+++ b/keyboards/acheron/shark/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "SharkPCB",
-  "keyboard_folder": "acheron/shark",
   "url": "https://gondolindrim.github.io/AcheronDocs/shark/intro.html",
   "maintainer": "Gondolindrim",
   "width": 12,
diff --git a/keyboards/at101_bh/info.json b/keyboards/at101_bh/info.json
index 1d28dc230..557c4d1bd 100644
--- a/keyboards/at101_bh/info.json
+++ b/keyboards/at101_bh/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "AT101 BH PCB",
-  "keyboard_folder": "at101_bh",
   "url": "https://deskthority.net/group-buys-f50/programmable-vintage-board-pcbs-omnikey-at101-and-z-150-t19325.html",
   "maintainer": "qmk, blindassassin111",
   "width": 22.5,
diff --git a/keyboards/chimera_ortho/info.json b/keyboards/chimera_ortho/info.json
index 3f8481be4..9e960e80c 100644
--- a/keyboards/chimera_ortho/info.json
+++ b/keyboards/chimera_ortho/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Chimera Ortho",
-  "keyboard_folder": "chimera_ortho",
   "maintainer": "qmk",
   "width": 15.5,
   "height": 4.25,
diff --git a/keyboards/chimera_ortho_plus/info.json b/keyboards/chimera_ortho_plus/info.json
index 7c892c441..3215ff522 100644
--- a/keyboards/chimera_ortho_plus/info.json
+++ b/keyboards/chimera_ortho_plus/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Chimera Ortho Plus",
-  "keyboard_folder": "chimera_ortho_plus", 
   "maintainer": "qmk",
   "width": 13.5,
   "height": 6,
diff --git a/keyboards/christmas_tree/info.json b/keyboards/christmas_tree/info.json
index 4153f0a6a..1d9cf2cc7 100644
--- a/keyboards/christmas_tree/info.json
+++ b/keyboards/christmas_tree/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Christmas Tree",
-  "keyboard_folder": "christmas_tree",
   "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
   "maintainer": "That-Canadian",
   "width": 3,
diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json
index 91dcf97ec..3d66074a3 100644
--- a/keyboards/converter/hp_46010a/info.json
+++ b/keyboards/converter/hp_46010a/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "HP_46010A",
-  "keyboard_folder": "converter/HP_46010A",
   "url": "https://deskthority.net/wiki/HP_46010A",
   "maintainer": "listofoptions",
   "width": 22,
diff --git a/keyboards/converter/ibm_5291/info.json b/keyboards/converter/ibm_5291/info.json
index 2cb3b76c2..b4b129309 100644
--- a/keyboards/converter/ibm_5291/info.json
+++ b/keyboards/converter/ibm_5291/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "IBM 5291",
-  "keyboard_folder": "converter/ibm_5291",
   "url": "https://deskthority.net/wiki/IBM_Model_F#IBM_5291_Keyboard",
   "maintainer": "listofoptions",
   "width": 21,
diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/info.json
index 8188d14bd..5e0b5f930 100644
--- a/keyboards/converter/palm_usb/stowaway/info.json
+++ b/keyboards/converter/palm_usb/stowaway/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Palm Stowaway Serial",
-  "keyboard_folder": "converter/palm_usb/stowaway",
   "url": "",
   "maintainer": "qmk",
   "width": 15.25,
diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/info.json
index f8525b15c..996f5dc0c 100644
--- a/keyboards/converter/sun_usb/type3/info.json
+++ b/keyboards/converter/sun_usb/type3/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Sun Type 3",
-  "keyboard_folder": "converter/sun_usb/type3",
   "url": "",
   "maintainer": "qmk",
   "width": 21,
diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/info.json
index 6785bbc07..2b4343ae6 100644
--- a/keyboards/converter/sun_usb/type5/info.json
+++ b/keyboards/converter/sun_usb/type5/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Sun Type 5",
-  "keyboard_folder": "converter/sun_usb/type5",
   "url": "",
   "maintainer": "qmk",
   "width": 24.75,
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json
index 2de390ae0..db8a03cac 100644
--- a/keyboards/converter/xt_usb/info.json
+++ b/keyboards/converter/xt_usb/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "IBM PC XT",
-  "keyboard_folder": "converter/xt_usb",
   "url": "",
   "maintainer": "qmk",
   "width": 21,
diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json
index 7b6766807..7d980ef0d 100644
--- a/keyboards/crbn/info.json
+++ b/keyboards/crbn/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "CRBN",
-  "keyboard_folder": "crbn",
   "url": "polarityworks.com",
   "maintainer": "qmk",
   "width": 12,
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index 318154d7d..7f909a774 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Plaid // Through Hole",
-  "keyboard_folder": "dm9records/plaid",
   "url": "https://github.com/hsgw/plaid",
   "maintainer": "hsgw(Takuya Urakawa)",
   "width": 12,
diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json
index ff0ddfdf9..0b76326d9 100644
--- a/keyboards/dm9records/tartan/info.json
+++ b/keyboards/dm9records/tartan/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Tartan # Through Hole",
-  "keyboard_folder": "dm9records/tartan",
   "url": "https://github.com/hsgw/tartan",
   "maintainer": "hsgw(Takuya Urakawa)",
   "width": 13,
diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json
index 950d179d9..d378a2869 100644
--- a/keyboards/dztech/dz96/info.json
+++ b/keyboards/dztech/dz96/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "DZ96",
-  "keyboard_folder": "dztech/dz96",
   "url": "",
   "maintainer": "kb-elmo",
   "width": 19,
diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
index e6c58bb2e..dadcaf084 100644
--- a/keyboards/ealdin/quadrant/info.json
+++ b/keyboards/ealdin/quadrant/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Quadrant E-C",
-    "keyboard_folder": "ealdin/quadrant",
     "url": "https://github.com/Ealdin/keyboards/tree/master/Quadrant", 
     "maintainer": "Ealdin Keyboards", 
     "width": 14, 
@@ -22,4 +21,4 @@
                 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
             }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/espectro/info.json b/keyboards/espectro/info.json
index dc8546f53..08796068d 100644
--- a/keyboards/espectro/info.json
+++ b/keyboards/espectro/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Espectro",
-  "keyboard_folder": "espectro",
   "url": "",
   "maintainer": "qmk",
   "width": 19,
diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json
index 3d57c8afc..e2c722589 100644
--- a/keyboards/handwired/angel/info.json
+++ b/keyboards/handwired/angel/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Angel",
-    "keyboard_folder": "angel",
     "url": "https://github.com/jamessa/Angel",
     "maintainer": "jamessa",
     "width": 13,
diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json
index 5e138508d..a8afd21e1 100644
--- a/keyboards/handwired/aranck/info.json
+++ b/keyboards/handwired/aranck/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Aranck",
-  "keyboard_folder": "handwired/aranck",
   "url": "https://github.com/Ardakilic",
   "maintainer": "Arda Kilicdagi",
   "width": 12,
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json
index 88e0f7ce4..1fe087586 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Heisenberg",
-  "keyboard_folder": "handwired/heisenberg",
   "url": "https://github.com/Ardakilic",
   "maintainer": "Arda Kilicdagi",
   "width": 12,
diff --git a/keyboards/hub20/info.json b/keyboards/hub20/info.json
index 9e0a7edf2..d60212c27 100644
--- a/keyboards/hub20/info.json
+++ b/keyboards/hub20/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Hub20",
-    "keyboard_folder": "hub20",
     "url": "https://github.com/joshajohnson/hub20",
     "maintainer": "joshajohnson",
     "width": 4,
diff --git a/keyboards/infinity60/info.json b/keyboards/infinity60/info.json
index b512d7d88..85ac5e685 100644
--- a/keyboards/infinity60/info.json
+++ b/keyboards/infinity60/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Infinity 60%",
-    "keyboard_folder": "infinity60",
     "url": "https://input.club/devices/infinity-keyboard/",
     "maintainer": "qmk",
     "width": 15,
diff --git a/keyboards/keebio/rorschach/info.json b/keyboards/keebio/rorschach/info.json
index a5856fa59..8d6ec6abd 100644
--- a/keyboards/keebio/rorschach/info.json
+++ b/keyboards/keebio/rorschach/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Rorschach",
-  "keyboard_folder": "rorschach",
   "url": "https://keeb.io",
   "maintainer": "nooges",
   "width": 15,
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
index 66bea171d..4e24e0fb8 100644
--- a/keyboards/keyboardio/model01/info.json
+++ b/keyboards/keyboardio/model01/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "model01",
-  "keyboard_folder": "keyboardio/model01",
   "url": "https://keyboard.io",
   "maintainer": "qmk",
   "width": 18.5,
diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index b2eb8ad51..bd2d5f632 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "O4L 5x12",
-    "keyboard_folder": "keycapsss/o4l_5x12",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/keycapsss/o4l_5x12",
     "maintainer": "BenRoe",
     "width": 12,
diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json
index cbc2b5210..007f8bb5f 100644
--- a/keyboards/keycapsss/plaid_pad/info.json
+++ b/keyboards/keycapsss/plaid_pad/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Plaid-Pad",
-    "keyboard_folder": "plaid_pad",
     "url": "https://keycapsss.com/diy-kits/104/plaid-pad-4x4-numpad",
     "maintainer": "BenRoe",
     "width": 4,
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index 8d9dbab99..1b00ceeaa 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "smd_milk",
-  "keyboard_folder": "kinlgy_keys/smd_milk",
   "url": "",
   "maintainer": "TheRoyalSweatshirt",
   "width": 1,
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index a30907356..7518afb9d 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Lx3 Whale 75",
-  "keyboard_folder": "linworks/whale75",
   "maintainer": "ebastler",
   "width": 16.25,
   "height": 6.5,
diff --git a/keyboards/littlealby/mute/info.json b/keyboards/littlealby/mute/info.json
index 47a936d29..9d6ff1a8d 100644
--- a/keyboards/littlealby/mute/info.json
+++ b/keyboards/littlealby/mute/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Little Alby",
-  "keyboard_folder": "mute",
   "url": "",
   "maintainer": "albybarber",
   "width": 1,
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index f5d81cc6f..df46464f1 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Phoebe",
-  "keyboard_folder": "maxr1998/phoebe",
   "url": "https://github.com/Maxr1998/Phoebe_Keyboard",
   "maintainer": "Maxr1998",
   "width": 12,
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index a653f8e09..0f2bb4b31 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Pulse 4k",
-  "keyboard_folder": "maxr1998/pulse4k",
   "url": "https://github.com/Maxr1998/Pulse_4k",
   "maintainer": "Maxr1998",
   "width": 3,
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index 3d7eab847..ccb793b10 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Meson",
-    "keyboard_folder": "meson",
     "maintainer": "qmk",
     "width": 15.5,
     "height": 4,
diff --git a/keyboards/nullbitsco/scramble/info.json b/keyboards/nullbitsco/scramble/info.json
index 348db649c..71d532366 100644
--- a/keyboards/nullbitsco/scramble/info.json
+++ b/keyboards/nullbitsco/scramble/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "SCRAMBLE switch tester",
-    "keyboard_folder": "nullbitsco/scramble",
     "url": "https://nullbits.co/scramble",
     "maintainer": "jaygreco",
     "width": 3,
diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json
index 934e499a3..8f60708f6 100644
--- a/keyboards/ortho5by12/info.json
+++ b/keyboards/ortho5by12/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "ortho5by12",
-  "keyboard_folder": "ortho5by12",
   "url": "https://github.com/itsnoteasy/misc/blob/master/ortho5by12.zip",
   "maintainer": "itsnoteasy",
   "width": 12,
diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json
index b8382bfe0..7444444c1 100644
--- a/keyboards/planck/ez/info.json
+++ b/keyboards/planck/ez/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck EZ",
-  "keyboard_folder": "planck/ez",
   "url": "https://ergodox-ez.com/pages/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json
index 765d7d06a..dc5160021 100644
--- a/keyboards/planck/info.json
+++ b/keyboards/planck/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck",
-  "keyboard_folder": "planck",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json
index fa8f4c43b..53d2d77ce 100644
--- a/keyboards/planck/light/info.json
+++ b/keyboards/planck/light/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck Light",
-  "keyboard_folder": "planck/light",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json
index c64cdbfde..6291cc96d 100644
--- a/keyboards/planck/rev1/info.json
+++ b/keyboards/planck/rev1/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck rev 1",
-  "keyboard_folder": "planck/rev1",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json
index 68f89f601..555e717cd 100644
--- a/keyboards/planck/rev2/info.json
+++ b/keyboards/planck/rev2/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck rev 2",
-  "keyboard_folder": "planck/rev2",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json
index 65e59adc8..7302aa2b0 100644
--- a/keyboards/planck/rev3/info.json
+++ b/keyboards/planck/rev3/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck rev 3",
-  "keyboard_folder": "planck/rev3",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json
index ad135b6cb..40f8b6d02 100644
--- a/keyboards/planck/rev4/info.json
+++ b/keyboards/planck/rev4/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck rev 4",
-  "keyboard_folder": "planck/rev4",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json
index 6f31472f5..1f7942ec0 100644
--- a/keyboards/planck/rev5/info.json
+++ b/keyboards/planck/rev5/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck rev 5",
-  "keyboard_folder": "planck/rev5",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json
index 66dd8f575..0e15f4e2c 100644
--- a/keyboards/planck/rev6/info.json
+++ b/keyboards/planck/rev6/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Planck rev 6",
-  "keyboard_folder": "planck/rev6",
   "url": "https://olkb.com/planck",
   "maintainer": "jackhumbert",
   "width": 12,
diff --git a/keyboards/preonic/info.json b/keyboards/preonic/info.json
index 8de5e24d9..c9c76cc21 100644
--- a/keyboards/preonic/info.json
+++ b/keyboards/preonic/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Preonic",
-    "keyboard_folder": "preonic",
     "url": "https://olkb.com/preonic",
     "maintainer": "jackhumbert",
     "width": 12,
diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json
index fd72055e1..506c2610e 100644
--- a/keyboards/preonic/rev3/info.json
+++ b/keyboards/preonic/rev3/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Preonic rev. 3",
-    "keyboard_folder": "preonic/rev3",
     "url": "https://olkb.com/preonic",
     "maintainer": "jackhumbert",
     "width": 12,
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index 6c2bd78b2..4ca2df290 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "2% Milk",
-  "keyboard_folder": "2_milk",
   "url": "",
   "maintainer": "Spaceman",
   "width": 1,
diff --git a/keyboards/spaceman/pancake/info.json b/keyboards/spaceman/pancake/info.json
index 9a21f09e1..6f88d5337 100644
--- a/keyboards/spaceman/pancake/info.json
+++ b/keyboards/spaceman/pancake/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Pancake",
-  "keyboard_folder": "Pancake",
   "url": "",
   "maintainer": "Spaceman",
   "width": 12,
diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json
index 033d6d587..68b6893b1 100644
--- a/keyboards/spaceman/yun65/info.json
+++ b/keyboards/spaceman/yun65/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "yun65",
-  "keyboard_folder": "spaceman/yun65",
   "url": "",
   "maintainer": "Spaceman",
   "width": 1,
diff --git a/keyboards/uno/info.json b/keyboards/uno/info.json
index 3460c25d5..e3ae1c243 100644
--- a/keyboards/uno/info.json
+++ b/keyboards/uno/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Uno",
-    "keyboard_folder": "uno",
     "url": "https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/",
     "maintainer": "Snipeye",
     "width": 1,
diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json
index 972a42e80..649cbfc15 100644
--- a/keyboards/viktus/styrka/info.json
+++ b/keyboards/viktus/styrka/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Styrka",
-  "keyboard_folder": "viktus/styrka",
   "url": "https",
   "maintainer": "jrfhoutx",
   "width": 18.25,
diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 8e38fbfb9..319248f34 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "winkeyless.kr B.mini EX",
-  "keyboard_folder": "bminiex",
   "url": "https://winkeyless.kr/product/b-mini-ex-x2-pcb/",
   "maintainer": "qmk",
   "width": 20.25,