89 files changed, 293 insertions, 105 deletions

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 7b27f3415b..a656288a8f 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -41,6 +41,9 @@
     "angel64": {
         "target": "angel64/alpha"
     },
+    "ashpil/modelm_usbc": {
+        "target": "ibm/model_m/ashpil_usbc"
+    },
     "at101_blackheart": {
         "target": "viktus/at101_bh"
     },
@@ -113,6 +116,15 @@
     "cmm_studio/saka68": {
         "target": "cmm_studio/saka68/solder"
     },
+    "converter/modelm101": {
+        "target": "ibm/model_m/teensypp"
+    },
+    "converter/modelm101_teensy2": {
+        "target": "ibm/model_m/teensy2"
+    },
+    "converter/modelm_ssk": {
+        "target": "ibm/model_m_ssk/teensypp_ssk"
+    },
     "cospad": {
         "target": "kprepublic/cospad"
     },
@@ -203,6 +215,9 @@
     "handwired/ferris": {
         "target": "ferris/0_1"
     },
+    "handwired/ibm122m": {
+        "target": "ibm/model_m_122/ibm122m"
+    },
     "handwired/p1800fl": {
         "target": "team0110/p1800fl"
     },
@@ -425,6 +440,9 @@
     "montsinger/rebound": {
         "target": "montsinger/rebound/rev1"
     },
+    "mschwingen/modelm": {
+        "target": "ibm/model_m/mschwingen"
+    },
     "noxary/268_2": {
         "layouts": {
             "LAYOUT": "LAYOUT_65_ansi_blocker"
@@ -1246,6 +1264,9 @@
     "treadstone48/rev2": {
         "target": "marksard/treadstone48/rev2"
     },
+    "tronguylabs/m122_3270": {
+        "target": "ibm/model_m_122/m122_3270"
+    },
     "ua62": {
         "target": "nacly/ua62"
     },
@@ -1306,6 +1327,9 @@
     "ymdk_np21": {
         "target": "ymdk/np21"
     },
+    "yugo_m/model_m_101": {
+        "target": "ibm/model_m/yugo_m"
+    },
     "yurei": {
         "target": "kkatano/yurei"
     },
diff --git a/docs/ChangeLog/20230528/PR14996.md b/docs/ChangeLog/20230528/PR14996.md
new file mode 100644
index 0000000000..d59b407e4c
--- /dev/null
+++ b/docs/ChangeLog/20230528/PR14996.md
@@ -0,0 +1,21 @@
+# QMK Breaking Changes - 2023 May 28 Changelog
+
+## Notable Features :id=notable-features
+
+### Consolidate modelm ([#14996](https://github.com/qmk/qmk_firmware/pull/14996)
+
+Several build targets for the IBM Model M were cluttered in different folders.
+The maintainers of several Model M replacement controller projects agreed to
+consolidate them under one common folder.
+
+List of the consolidations now in keyboards/modelm/:
+
+- ashpil_usbc 
+- ibm122m
+- mschwingen
+- teensy2 (renamed from modelm101_teensy2)
+- teensypp (renamed from modelm101)
+- teensypp_ssk (renamed from modelm_ssk)
+- ibm122m
+- m122_3270
+- yugo_m
diff --git a/keyboards/handwired/ibm122m/readme.md b/keyboards/handwired/ibm122m/readme.md
deleted file mode 100644
index de89d7596e..0000000000
--- a/keyboards/handwired/ibm122m/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# ibm122m
-
-![IBM Model M 122 key](https://i.imgur.com/Oo3Ozqz.jpg)
-
-This is a keymap for the IBM Model M 122 key terminal keyboard running on a Teensy 2.0++
-I wired it to weird pins on mine (mainly to accomodate speakers), so make sure to update the pin arrays.
-
-Keyboard Maintainer: [Luke Stanley](https://github.com/lukexorz)  
-Hardware Supported: Teensy 2.0++  
-Hardware Availability: https://www.pjrc.com/store/teensypp.html 
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/ibm122m:default
-
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.c b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c
index 92b577635c..92b577635c 100644
--- a/keyboards/ashpil/modelm_usbc/modelm_usbc.c
+++ b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c
diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ibm/model_m/ashpil_usbc/info.json
index 4d8eec3167..ffdb608edc 100644
--- a/keyboards/ashpil/modelm_usbc/info.json
+++ b/keyboards/ibm/model_m/ashpil_usbc/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "IBM Model M 101/102",
     "manufacturer": "ashpil",
-    "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/ashpil_usbc",
     "maintainer": "ashpil",
     "usb": {
         "vid": "0xFEED",
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h
index 59cec33010..59cec33010 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h
+++ b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c
index e8df1f0c81..e8df1f0c81 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
+++ b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk
index 23b7c173b8..23b7c173b8 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk
+++ b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c b/keyboards/ibm/model_m/ashpil_usbc/keymaps/default/keymap.c
index d8f80a5c72..d8f80a5c72 100644
--- a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c
+++ b/keyboards/ibm/model_m/ashpil_usbc/keymaps/default/keymap.c
diff --git a/keyboards/ashpil/modelm_usbc/readme.md b/keyboards/ibm/model_m/ashpil_usbc/readme.md
index 261d97ab49..801cb612fd 100644
--- a/keyboards/ashpil/modelm_usbc/readme.md
+++ b/keyboards/ibm/model_m/ashpil_usbc/readme.md
@@ -9,6 +9,6 @@ This is a configuration of QMK intended to be used with the [USB C Model M alt c
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ashpil/modelm_usbc:default
+    make ibm/model_m/ashpil_usbc:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ashpil/modelm_usbc/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/rules.mk
index 6fe874e748..6fe874e748 100644
--- a/keyboards/ashpil/modelm_usbc/rules.mk
+++ b/keyboards/ibm/model_m/ashpil_usbc/rules.mk
diff --git a/keyboards/ibm/model_m/modelm/readme.md b/keyboards/ibm/model_m/modelm/readme.md
new file mode 100644
index 0000000000..048b02495a
--- /dev/null
+++ b/keyboards/ibm/model_m/modelm/readme.md
@@ -0,0 +1,24 @@
+# IBM Model M
+
+This is the parent directory for all projects that replace the controller
+of IBM's Model M Keyboard and then run QMK on it.
+
+These controllers differ in their use of microcontrollers, connection (mainly
+USB) optional speakers etc.
+
+Some of them can be bought fully assembled others are do-it-yourself.
+
+## Warning - Model M Variants
+
+**Not all of these projects will fit into your keyboard!**
+
+As the Model M was produced over several years there are many variants of the
+controller PCB. Check what fits your keyboard before you build/order one.
+
+The variants built for PCs differ in:
+* PCB size
+* Connectors (8/12 pin flex, location)
+* Ground wire connector location
+
+Additionally IBM built Model M variants for terminals with 122 keys, the 
+space saving keyboard (SSK, 84-key) etc.
diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/ibm/model_m/mschwingen/config.h
index c828bd36ff..b1dc81b8c7 100644
--- a/keyboards/mschwingen/modelm/config.h
+++ b/keyboards/ibm/model_m/mschwingen/config.h
@@ -56,15 +56,15 @@
 #define MODELM_LED2 B6
 #define MODELM_LED3 D0
 
-#if defined(KEYBOARD_mschwingen_modelm_led_wired)
+#if defined(KEYBOARD_ibm_model_m_mschwingen_led_wired)
 # define MODELM_LED_CAPSLOCK  MODELM_LED1
 # define MODELM_LED_SCROLLOCK MODELM_LED2
 # define MODELM_LED_NUMLOCK   MODELM_LED3
-#elif defined(KEYBOARD_mschwingen_modelm_led_ffc)
+#elif defined(KEYBOARD_ibm_model_m_mschwingen_led_ffc)
 # define MODELM_LED_CAPSLOCK  MODELM_LED2
 # define MODELM_LED_SCROLLOCK MODELM_LED3
 # define MODELM_LED_NUMLOCK   MODELM_LED1
-#elif defined(KEYBOARD_mschwingen_modelm_led_ws2812)
+#elif defined(KEYBOARD_ibm_model_m_mschwingen_led_ws2812)
 #else
 # error one of MODELM_LEDS_FFC, MODELM_LEDS_WIRED or MODELM_LEDS_WS2812 must be set!
 #endif
diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/ibm/model_m/mschwingen/info.json
index 8005f5e7f7..1ba525de6c 100644
--- a/