diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
new file mode 100644
index 000000000..05fb588d1
--- /dev/null
+++ b/keyboards/ergodox/Makefile
@@ -0,0 +1,34 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make = Make software.
+#
+# make clean = Clean out built project files.
+#
+# That's pretty much all you need. To compile, always go make clean, 
+# followed by make.
+#
+# For advanced users only:
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+#               (must have teensy_loader_cli installed).
+#
+#----------------------------------------------------------------------------
+SUBPROJECT_DEFAULT = ez
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE ?= no  # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE  ?= yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE  ?= yes # Audio control and System control(+450)
+CONSOLE_ENABLE   ?= no  # Console for debug(+400)
+COMMAND_ENABLE   ?= yes # Commands for debug and configuration
+CUSTOM_MATRIX    ?= yes # Custom matrix file for the ErgoDox EZ
+SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
+NKRO_ENABLE      ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+MIDI_ENABLE      ?= no  # MIDI controls
+UNICODE_ENABLE   ?= yes # Unicode
+
+ifndef QUANTUM_DIR
+	include ../../Makefile
+endif
diff --git a/keyboards/ergodox/ergodox.c b/keyboards/ergodox/ergodox.c
new file mode 100644
index 000000000..992e95d81
--- /dev/null
+++ b/keyboards/ergodox/ergodox.c
@@ -0,0 +1,8 @@
+/*
+ * ergodox.c
+ *
+ *  Created on: 7 jul 2016
+ *      Author: Fred Wales
+ */
+
+
diff --git a/keyboards/ergodox/ergodox.h b/keyboards/ergodox/ergodox.h
new file mode 100644
index 000000000..fe54e3260
--- /dev/null
+++ b/keyboards/ergodox/ergodox.h
@@ -0,0 +1,11 @@
+#ifndef KEYBOARDS_ERGODOX_ERGODOX_H_
+#define KEYBOARDS_ERGODOX_ERGODOX_H_
+
+#ifdef SUBPROJECT_ez
+    #include "ez.h"
+#endif
+#ifdef SUBPROJECT_infinity
+    #include "infinity.h"
+#endif
+
+#endif /* KEYBOARDS_ERGODOX_ERGODOX_H_ */
diff --git a/keyboards/ergodox_ez/190hotfix.sh b/keyboards/ergodox/ez/190hotfix.sh
similarity index 100%
rename from keyboards/ergodox_ez/190hotfix.sh
rename to keyboards/ergodox/ez/190hotfix.sh
diff --git a/keyboards/ergodox_ez/Makefile b/keyboards/ergodox/ez/Makefile
similarity index 79%
rename from keyboards/ergodox_ez/Makefile
rename to keyboards/ergodox/ez/Makefile
index 54edaed6d..37e554b30 100644
--- a/keyboards/ergodox_ez/Makefile
+++ b/keyboards/ergodox/ez/Makefile
@@ -70,17 +70,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE  ?= yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE   ?= no  # Console for debug(+400)
-COMMAND_ENABLE   ?= yes # Commands for debug and configuration
-CUSTOM_MATRIX    ?= yes # Custom matrix file for the ErgoDox EZ
-SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
-NKRO_ENABLE      ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-MIDI_ENABLE      ?= no  # MIDI controls
-UNICODE_ENABLE   ?= yes # Unicode
 
 ifndef QUANTUM_DIR
-	include ../../Makefile
+	include ../../../Makefile
 endif
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox/ez/config.h
similarity index 100%
rename from keyboards/ergodox_ez/config.h
rename to keyboards/ergodox/ez/config.h
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox/ez/ez.c
similarity index 99%
rename from keyboards/ergodox_ez/ergodox_ez.c
rename to keyboards/ergodox/ez/ez.c
index f0558d9f2..e7afc9859 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox/ez/ez.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ez.h"
 #include "i2cmaster.h"
 
 bool i2c_initialized = 0;
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox/ez/ez.h
similarity index 100%
rename from keyboards/ergodox_ez/ergodox_ez.h
rename to keyboards/ergodox/ez/ez.h
diff --git a/keyboards/ergodox_ez/i2cmaster.h b/keyboards/ergodox/ez/i2cmaster.h
similarity index 100%
rename from keyboards/ergodox_ez/i2cmaster.h
rename to keyboards/ergodox/ez/i2cmaster.h
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox/ez/matrix.c
similarity index 99%
rename from keyboards/ergodox_ez/matrix.c
rename to keyboards/ergodox/ez/matrix.c
index dc29cf5cd..a19bab90b 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox/ez/matrix.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#include "ergodox_ez.h"
+#include "ez.h"
 #include "i2cmaster.h"
 #ifdef DEBUG_MATRIX_SCAN_RATE
 #include  "timer.h"
diff --git a/keyboards/ergodox_ez/readme.md b/keyboards/ergodox/ez/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/readme.md
rename to keyboards/ergodox/ez/readme.md
diff --git a/keyboards/ergodox_ez/twimaster.c b/keyboards/ergodox/ez/twimaster.c
similarity index 100%
rename from keyboards/ergodox_ez/twimaster.c
rename to keyboards/ergodox/ez/twimaster.c
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py b/keyboards/ergodox/ez/util/compile_keymap.py
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py
rename to keyboards/ergodox/ez/util/compile_keymap.py
diff --git a/keyboards/ergodox_ez/util/readme.md b/keyboards/ergodox/ez/util/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/util/readme.md
rename to keyboards/ergodox/ez/util/readme.md
diff --git a/keyboards/infinity_ergodox/MEMO.txt b/keyboards/ergodox/infinity/MEMO.txt
similarity index 100%
rename from keyboards/infinity_ergodox/MEMO.txt
rename to keyboards/ergodox/infinity/MEMO.txt
diff --git a/keyboards/infinity_ergodox/Makefile b/keyboards/ergodox/infinity/Makefile
similarity index 81%
rename from keyboards/infinity_ergodox/Makefile
rename to keyboards/ergodox/infinity/Makefile
index 7edc03d8c..942032f83 100644
--- a/keyboards/infinity_ergodox/Makefile
+++ b/keyboards/ergodox/infinity/Makefile
@@ -57,14 +57,6 @@ OPT_DEFS = -DCORTEX_VTOR_INIT=0x00002000
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= yes	# Virtual DIP switch configuration
-## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
-MOUSEKEY_ENABLE ?= yes	# Mouse keys
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control
-CONSOLE_ENABLE ?= yes	# Console for debug
-COMMAND_ENABLE ?= yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE ?= yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE ?= yes	    # USB Nkey Rollover
 CUSTOM_MATRIX ?= yes # Custom matrix file
 SERIAL_LINK_ENABLE = yes
 VISUALIZER_ENABLE ?= yes
@@ -81,5 +73,5 @@ include drivers/gdisp/IS31FL3731C/driver.mk
 endif
 
 ifndef QUANTUM_DIR
-	include ../../Makefile
+	include ../../../Makefile
 endif
\ No newline at end of file
diff --git a/keyboards/infinity_ergodox/bootloader_defs.h b/keyboards/ergodox/infinity/bootloader_defs.h
similarity index 100%
rename from keyboards/infinity_ergodox/bootloader_defs.h
rename to keyboards/ergodox/infinity/bootloader_defs.h
diff --git a/keyboards/infinity_ergodox/chconf.h b/keyboards/ergodox/infinity/chconf.h
similarity index 100%
rename from keyboards/infinity_ergodox/chconf.h
rename to keyboards/ergodox/infinity/chconf.h
diff --git a/keyboards/infinity_ergodox/config.h b/keyboards/ergodox/infinity/config.h
similarity index 100%
rename from keyboards/infinity_ergodox/config.h
rename to keyboards/ergodox/infinity/config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk
rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk
rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c
rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk
rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c
rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h
rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk
rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
similarity index 100%
rename from keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h
rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
diff --git a/keyboards/infinity_ergodox/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h
similarity index 100%
rename from keyboards/infinity_ergodox/gfxconf.h
rename to keyboards/ergodox/infinity/gfxconf.h
diff --git a/keyboards/infinity_ergodox/halconf.h b/keyboards/ergodox/infinity/halconf.h
similarity index 100%
rename from keyboards/infinity_ergodox/halconf.h
rename to keyboards/ergodox/infinity/halconf.h
diff --git a/keyboards/infinity_ergodox/infinity_ergodox.c b/keyboards/ergodox/infinity/infinity.c
similarity index 100%
rename from keyboards/infinity_ergodox/infinity_ergodox.c
rename to keyboards/ergodox/infinity/infinity.c
diff --git a/keyboards/infinity_ergodox/infinity_ergodox.h b/keyboards/ergodox/infinity/infinity.h
similarity index 100%
rename from keyboards/infinity_ergodox/infinity_ergodox.h
rename to keyboards/ergodox/infinity/infinity.h
diff --git a/keyboards/infinity_ergodox/keymaps/default/keymap.c b/keyboards/ergodox/infinity/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/infinity_ergodox/keymaps/default/keymap.c
rename to keyboards/ergodox/infinity/keymaps/default/keymap.c
diff --git a/keyboards/infinity_ergodox/keymaps/default/visualizer.c b/keyboards/ergodox/infinity/keymaps/default/visualizer.c
similarity index 100%
rename from keyboards/infinity_ergodox/keymaps/default/visualizer.c
rename to keyboards/ergodox/infinity/keymaps/default/visualizer.c
diff --git a/keyboards/infinity_ergodox/led.c b/keyboards/ergodox/infinity/led.c
similarity index 100%
rename from keyboards/infinity_ergodox/led.c
rename to keyboards/ergodox/infinity/led.c
diff --git a/keyboards/infinity_ergodox/matrix.c b/keyboards/ergodox/infinity/matrix.c
similarity index 100%
rename from keyboards/infinity_ergodox/matrix.c
rename to keyboards/ergodox/infinity/matrix.c
diff --git a/keyboards/infinity_ergodox/mcuconf.h b/keyboards/ergodox/infinity/mcuconf.h
similarity index 100%
rename from keyboards/infinity_ergodox/mcuconf.h
rename to keyboards/ergodox/infinity/mcuconf.h
diff --git a/keyboards/ergodox_ez/keymaps/ab/Makefile b/keyboards/ergodox/keymaps/ab/Makefile
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ab/Makefile
rename to keyboards/ergodox/keymaps/ab/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json b/keyboards/ergodox/keymaps/ab/keyboard-layout.json
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json
rename to keyboards/ergodox/keymaps/ab/keyboard-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png b/keyboards/ergodox/keymaps/ab/keyboard-layout.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png
rename to keyboards/ergodox/keymaps/ab/keyboard-layout.png
diff --git a/keyboards/ergodox_ez/keymaps/ab/keymap.c b/keyboards/ergodox/keymaps/ab/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ab/keymap.c
rename to keyboards/ergodox/keymaps/ab/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/ab/readme.md b/keyboards/ergodox/keymaps/ab/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ab/readme.md
rename to keyboards/ergodox/keymaps/ab/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
rename to keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md b/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md
rename to keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/keymap.c b/keyboards/ergodox/keymaps/alexjj/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/alexjj/keymap.c
rename to keyboards/ergodox/keymaps/alexjj/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/readme.md b/keyboards/ergodox/keymaps/alexjj/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/alexjj/readme.md
rename to keyboards/ergodox/keymaps/alexjj/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg b/keyboards/ergodox/keymaps/alexjj/rl-layout.jpg
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg
rename to keyboards/ergodox/keymaps/alexjj/rl-layout.jpg
diff --git a/keyboards/ergodox_ez/keymaps/algernon/COPYING b/keyboards/ergodox/keymaps/algernon/COPYING
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/COPYING
rename to keyboards/ergodox/keymaps/algernon/COPYING
diff --git a/keyboards/ergodox_ez/keymaps/algernon/Makefile b/keyboards/ergodox/keymaps/algernon/Makefile
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/Makefile
rename to keyboards/ergodox/keymaps/algernon/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/algernon/config.h b/keyboards/ergodox/keymaps/algernon/config.h
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/config.h
rename to keyboards/ergodox/keymaps/algernon/config.h
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png
rename to keyboards/ergodox/keymaps/algernon/images/adore-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png
rename to keyboards/ergodox/keymaps/algernon/images/base-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png b/keyboards/ergodox/keymaps/algernon/images/heatmap.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png
rename to keyboards/ergodox/keymaps/algernon/images/heatmap.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png b/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png
rename to keyboards/ergodox/keymaps/algernon/images/hun-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png b/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png
rename to keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png b/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png
rename to keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png b/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png
rename to keyboards/ergodox/keymaps/algernon/images/steno-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/keymap.c
rename to keyboards/ergodox/keymaps/algernon/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/algernon/readme.md b/keyboards/ergodox/keymaps/algernon/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/readme.md
rename to keyboards/ergodox/keymaps/algernon/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-adore-layout.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-adore-layout.json
rename to keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json
rename to keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py b/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py
rename to keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/max-focused b/keyboards/ergodox/keymaps/algernon/tools/max-focused
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/algernon/tools/max-focused
rename to keyboards/ergodox/keymaps/algernon/tools/max-focused
diff --git a/keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c
rename to keyboards/ergodox/keymaps/andrew_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/bepo/bepo.png b/keyboards/ergodox/keymaps/bepo/bepo.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/bepo/bepo.png
rename to keyboards/ergodox/keymaps/bepo/bepo.png
diff --git a/keyboards/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/bepo/keymap.c
rename to keyboards/ergodox/keymaps/bepo/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/bepo/readme.md b/keyboards/ergodox/keymaps/bepo/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/bepo/readme.md
rename to keyboards/ergodox/keymaps/bepo/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile b/keyboards/ergodox/keymaps/coderkun_neo2/Makefile
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile
rename to keyboards/ergodox/keymaps/coderkun_neo2/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c
rename to keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md b/keyboards/ergodox/keymaps/coderkun_neo2/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md
rename to keyboards/ergodox/keymaps/coderkun_neo2/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/colemak/keymap.c b/keyboards/ergodox/keymaps/colemak/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/colemak/keymap.c
rename to keyboards/ergodox/keymaps/colemak/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/colemak/readme.md b/keyboards/ergodox/keymaps/colemak/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/colemak/readme.md
rename to keyboards/ergodox/keymaps/colemak/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png
rename to keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
rename to keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md b/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md
rename to keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png
rename to keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png
rename to keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c
rename to keyboards/ergodox/keymaps/csharp_dev/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/readme.md b/keyboards/ergodox/keymaps/csharp_dev/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/csharp_dev/readme.md
rename to keyboards/ergodox/keymaps/csharp_dev/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dave/keymap.c b/keyboards/ergodox/keymaps/dave/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dave/keymap.c
rename to keyboards/ergodox/keymaps/dave/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dave/readme.md b/keyboards/ergodox/keymaps/dave/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dave/readme.md
rename to keyboards/ergodox/keymaps/dave/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/default/default.png b/keyboards/ergodox/keymaps/default/default.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/default/default.png
rename to keyboards/ergodox/keymaps/default/default.png
diff --git a/keyboards/ergodox_ez/keymaps/default/default_highres.png b/keyboards/ergodox/keymaps/default/default_highres.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/default/default_highres.png
rename to keyboards/ergodox/keymaps/default/default_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c
similarity index 99%
rename from keyboards/ergodox_ez/keymaps/default/keymap.c
rename to keyboards/ergodox/keymaps/default/keymap.c
index b48a54a43..f1a83f4e7 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/default/readme.md b/keyboards/ergodox/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/default/readme.md
rename to keyboards/ergodox/keymaps/default/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png b/keyboards/ergodox/keymaps/default_osx/default_osx_highres.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png
rename to keyboards/ergodox/keymaps/default_osx/default_osx_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox/keymaps/default_osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/default_osx/keymap.c
rename to keyboards/ergodox/keymaps/default_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/readme.md b/keyboards/ergodox/keymaps/default_osx/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/default_osx/readme.md
rename to keyboards/ergodox/keymaps/default_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dragon788/keymap.c b/keyboards/ergodox/keymaps/dragon788/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dragon788/keymap.c
rename to keyboards/ergodox/keymaps/dragon788/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak/dvorak.png b/keyboards/ergodox/keymaps/dvorak/dvorak.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak/dvorak.png
rename to keyboards/ergodox/keymaps/dvorak/dvorak.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak/keymap.c b/keyboards/ergodox/keymaps/dvorak/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak/keymap.c
rename to keyboards/ergodox/keymaps/dvorak/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png
rename to keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png
rename to keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png
rename to keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c
rename to keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md b/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md
rename to keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c
rename to keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md b/keyboards/ergodox/keymaps/dvorak_spanish/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md
rename to keyboards/ergodox/keymaps/dvorak_spanish/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png b/keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png
rename to keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c
rename to keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md b/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md
rename to keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/Makefile b/keyboards/ergodox/keymaps/erez_experimental/Makefile
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/erez_experimental/Makefile
rename to keyboards/ergodox/keymaps/erez_experimental/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/config.h b/keyboards/ergodox/keymaps/erez_experimental/config.h
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/erez_experimental/config.h
rename to keyboards/ergodox/keymaps/erez_experimental/config.h
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c
rename to keyboards/ergodox/keymaps/erez_experimental/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/readme.md b/keyboards/ergodox/keymaps/erez_experimental/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/erez_experimental/readme.md
rename to keyboards/ergodox/keymaps/erez_experimental/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c
rename to keyboards/ergodox/keymaps/german-kinergo/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png b/keyboards/ergodox/keymaps/german-kinergo/layout-code.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png
rename to keyboards/ergodox/keymaps/german-kinergo/layout-code.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png b/keyboards/ergodox/keymaps/german-kinergo/layout-media.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png
rename to keyboards/ergodox/keymaps/german-kinergo/layout-media.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout.png b/keyboards/ergodox/keymaps/german-kinergo/layout.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-kinergo/layout.png
rename to keyboards/ergodox/keymaps/german-kinergo/layout.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/readme.md b/keyboards/ergodox/keymaps/german-kinergo/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-kinergo/readme.md
rename to keyboards/ergodox/keymaps/german-kinergo/readme.md
diff --git a/keyboards/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
similarity index 100%
rename from keyboards/ergodox_ez/util/compile_keymap.py
rename to keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c
rename to keyboards/ergodox/keymaps/german-manuneo/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md
rename to keyboards/ergodox/keymaps/german-manuneo/keymap.md
diff --git a/keyboards/ergodox_ez/keymaps/german/keymap.c b/keyboards/ergodox/keymaps/german/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/german/keymap.c
rename to keyboards/ergodox/keymaps/german/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/j3rn/keymap.c b/keyboards/ergodox/keymaps/j3rn/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/j3rn/keymap.c
rename to keyboards/ergodox/keymaps/j3rn/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/j3rn/readme.md b/keyboards/ergodox/keymaps/j3rn/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/j3rn/readme.md
rename to keyboards/ergodox/keymaps/j3rn/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/jack/keymap.c b/keyboards/ergodox/keymaps/jack/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jack/keymap.c
rename to keyboards/ergodox/keymaps/jack/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png b/keyboards/ergodox/keymaps/jacobono/img/colemak-default-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png
rename to keyboards/ergodox/keymaps/jacobono/img/colemak-default-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png b/keyboards/ergodox/keymaps/jacobono/img/number-dpad-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png
rename to keyboards/ergodox/keymaps/jacobono/img/number-dpad-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png b/keyboards/ergodox/keymaps/jacobono/img/symbol-layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png
rename to keyboards/ergodox/keymaps/jacobono/img/symbol-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/keymap.c b/keyboards/ergodox/keymaps/jacobono/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jacobono/keymap.c
rename to keyboards/ergodox/keymaps/jacobono/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/readme.md b/keyboards/ergodox/keymaps/jacobono/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jacobono/readme.md
rename to keyboards/ergodox/keymaps/jacobono/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/jgarr/keymap.c b/keyboards/ergodox/keymaps/jgarr/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/jgarr/keymap.c
rename to keyboards/ergodox/keymaps/jgarr/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/josh/keymap.c b/keyboards/ergodox/keymaps/josh/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/josh/keymap.c
rename to keyboards/ergodox/keymaps/josh/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/josh/readme.md b/keyboards/ergodox/keymaps/josh/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/josh/readme.md
rename to keyboards/ergodox/keymaps/josh/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/kastyle/keymap.c b/keyboards/ergodox/keymaps/kastyle/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/kastyle/keymap.c
rename to keyboards/ergodox/keymaps/kastyle/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/kines-ish/keymap.c b/keyboards/ergodox/keymaps/kines-ish/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/kines-ish/keymap.c
rename to keyboards/ergodox/keymaps/kines-ish/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/kines-ish/readme.md b/keyboards/ergodox/keymaps/kines-ish/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/kines-ish/readme.md
rename to keyboards/ergodox/keymaps/kines-ish/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/maz/keymap.c b/keyboards/ergodox/keymaps/maz/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/maz/keymap.c
rename to keyboards/ergodox/keymaps/maz/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/maz/readme.md b/keyboards/ergodox/keymaps/maz/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/maz/readme.md
rename to keyboards/ergodox/keymaps/maz/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c
rename to keyboards/ergodox/keymaps/mpiechotka/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/mpiechotka/readme.md b/keyboards/ergodox/keymaps/mpiechotka/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/mpiechotka/readme.md
rename to keyboards/ergodox/keymaps/mpiechotka/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/code_layer.png b/keyboards/ergodox/keymaps/msc/img/code_layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/msc/img/code_layer.png
rename to keyboards/ergodox/keymaps/msc/img/code_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/main_layer.png b/keyboards/ergodox/keymaps/msc/img/main_layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/msc/img/main_layer.png
rename to keyboards/ergodox/keymaps/msc/img/main_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/media_layer.png b/keyboards/ergodox/keymaps/msc/img/media_layer.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/msc/img/media_layer.png
rename to keyboards/ergodox/keymaps/msc/img/media_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/keymap.c b/keyboards/ergodox/keymaps/msc/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/msc/keymap.c
rename to keyboards/ergodox/keymaps/msc/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/msc/readme.md b/keyboards/ergodox/keymaps/msc/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/msc/readme.md
rename to keyboards/ergodox/keymaps/msc/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/naps62/keymap.c b/keyboards/ergodox/keymaps/naps62/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/naps62/keymap.c
rename to keyboards/ergodox/keymaps/naps62/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/naps62/readme.md b/keyboards/ergodox/keymaps/naps62/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/naps62/readme.md
rename to keyboards/ergodox/keymaps/naps62/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/keymap.c
rename to keyboards/ergodox/keymaps/ordinary/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboards/ergodox/keymaps/ordinary/ordinary-base.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png
rename to keyboards/ergodox/keymaps/ordinary/ordinary-base.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt
rename to keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboards/ergodox/keymaps/ordinary/ordinary-media.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png
rename to keyboards/ergodox/keymaps/ordinary/ordinary-media.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt
rename to keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png b/keyboards/ergodox/keymaps/ordinary/ordinary-special.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png
rename to keyboards/ergodox/keymaps/ordinary/ordinary-special.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt
rename to keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
rename to keyboards/ergodox/keymaps/ordinary/ordinary-symbol.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
rename to keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/readme.md b/keyboards/ergodox/keymaps/ordinary/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/ordinary/readme.md
rename to keyboards/ergodox/keymaps/ordinary/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/keymap.c b/keyboards/ergodox/keymaps/osx_de/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de/keymap.c
rename to keyboards/ergodox/keymaps/osx_de/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png b/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png
rename to keyboards/ergodox/keymaps/osx_de/osx_de_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/readme.md b/keyboards/ergodox/keymaps/osx_de/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de/readme.md
rename to keyboards/ergodox/keymaps/osx_de/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
rename to keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png b/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
rename to keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c
rename to keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png b/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png
rename to keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md b/keyboards/ergodox/keymaps/osx_de_experimental/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md
rename to keyboards/ergodox/keymaps/osx_de_experimental/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_fr/keymap.c b/keyboards/ergodox/keymaps/osx_fr/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_fr/keymap.c
rename to keyboards/ergodox/keymaps/osx_fr/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
rename to keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/plover/keymap.c b/keyboards/ergodox/keymaps/plover/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/plover/keymap.c
rename to keyboards/ergodox/keymaps/plover/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/plums/keymap.c b/keyboards/ergodox/keymaps/plums/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/plums/keymap.c
rename to keyboards/ergodox/keymaps/plums/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/plums/plums.png b/keyboards/ergodox/keymaps/plums/plums.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/plums/plums.png
rename to keyboards/ergodox/keymaps/plums/plums.png
diff --git a/keyboards/ergodox_ez/keymaps/plums/readme.md b/keyboards/ergodox/keymaps/plums/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/plums/readme.md
rename to keyboards/ergodox/keymaps/plums/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
rename to keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/sneako/keymap.c b/keyboards/ergodox/keymaps/sneako/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/sneako/keymap.c
rename to keyboards/ergodox/keymaps/sneako/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/sneako/readme.md b/keyboards/ergodox/keymaps/sneako/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/sneako/readme.md
rename to keyboards/ergodox/keymaps/sneako/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboards/ergodox/keymaps/software_neo2/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/software_neo2/keymap.c
rename to keyboards/ergodox/keymaps/software_neo2/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/config_user.h b/keyboards/ergodox/keymaps/supercoder/config_user.h
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/supercoder/config_user.h
rename to keyboards/ergodox/keymaps/supercoder/config_user.h
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/images/layout.png b/keyboards/ergodox/keymaps/supercoder/images/layout.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/supercoder/images/layout.png
rename to keyboards/ergodox/keymaps/supercoder/images/layout.png
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg b/keyboards/ergodox/keymaps/supercoder/images/supercoder_2000.jpg
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg
rename to keyboards/ergodox/keymaps/supercoder/images/supercoder_2000.jpg
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/keymap.c b/keyboards/ergodox/keymaps/supercoder/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/supercoder/keymap.c
rename to keyboards/ergodox/keymaps/supercoder/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/makefile.mk b/keyboards/ergodox/keymaps/supercoder/makefile.mk
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/supercoder/makefile.mk
rename to keyboards/ergodox/keymaps/supercoder/makefile.mk
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/readme.md b/keyboards/ergodox/keymaps/supercoder/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/supercoder/readme.md
rename to keyboards/ergodox/keymaps/supercoder/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/techtomas/keymap.c b/keyboards/ergodox/keymaps/techtomas/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/techtomas/keymap.c
rename to keyboards/ergodox/keymaps/techtomas/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/techtomas/readme.md b/keyboards/ergodox/keymaps/techtomas/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/techtomas/readme.md
rename to keyboards/ergodox/keymaps/techtomas/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/keymap.c b/keyboards/ergodox/keymaps/teckinesis/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/keymap.c
rename to keyboards/ergodox/keymaps/teckinesis/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.png b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.png
rename to keyboards/ergodox/keymaps/teckinesis/ordinary-special.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.txt b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.txt
rename to keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/readme.md b/keyboards/ergodox/keymaps/teckinesis/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/readme.md
rename to keyboards/ergodox/keymaps/teckinesis/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json
rename to keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png
rename to keyboards/ergodox/keymaps/teckinesis/teckinesis-base.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.json
rename to keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.png
rename to keyboards/ergodox/keymaps/teckinesis/teckinesis-media.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.json
rename to keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.png
rename to keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.png
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/README.md b/keyboards/ergodox/keymaps/tkuichooseyou/README.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tkuichooseyou/README.md
rename to keyboards/ergodox/keymaps/tkuichooseyou/README.md
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/compiled.hex b/keyboards/ergodox/keymaps/tkuichooseyou/compiled.hex
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tkuichooseyou/compiled.hex
rename to keyboards/ergodox/keymaps/tkuichooseyou/compiled.hex
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/keymap.c b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tkuichooseyou/keymap.c
rename to keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/tm2030/keymap.c b/keyboards/ergodox/keymaps/tm2030/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tm2030/keymap.c
rename to keyboards/ergodox/keymaps/tm2030/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/tm2030/readme.md b/keyboards/ergodox/keymaps/tm2030/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tm2030/readme.md
rename to keyboards/ergodox/keymaps/tm2030/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c
rename to keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md b/keyboards/ergodox/keymaps/tonyabra_osx/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md
rename to keyboards/ergodox/keymaps/tonyabra_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/config.h b/keyboards/ergodox/keymaps/townk_osx/config.h
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/config.h
rename to keyboards/ergodox/keymaps/townk_osx/config.h
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboards/ergodox/keymaps/townk_osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/keymap.c
rename to keyboards/ergodox/keymaps/townk_osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk b/keyboards/ergodox/keymaps/townk_osx/makefile.mk
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk
rename to keyboards/ergodox/keymaps/townk_osx/makefile.mk
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/readme.md b/keyboards/ergodox/keymaps/townk_osx/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/readme.md
rename to keyboards/ergodox/keymaps/townk_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_base.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png
rename to keyboards/ergodox/keymaps/townk_osx/townk_osx_base.png
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_fn.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png
rename to keyboards/ergodox/keymaps/townk_osx/townk_osx_fn.png
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_keypad.png
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png
rename to keyboards/ergodox/keymaps/townk_osx/townk_osx_keypad.png
diff --git a/keyboards/ergodox_ez/keymaps/twey/keymap.c b/keyboards/ergodox/keymaps/twey/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/twey/keymap.c
rename to keyboards/ergodox/keymaps/twey/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/twey/readme.md b/keyboards/ergodox/keymaps/twey/readme.md
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/twey/readme.md
rename to keyboards/ergodox/keymaps/twey/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c
rename to keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c
rename to keyboards/ergodox/keymaps/zweihander-osx/keymap.c
diff --git a/keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
similarity index 100%
rename from keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown
rename to keyboards/ergodox/keymaps/zweihander-osx/readme.markdown