diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile
index 54cea1cec1..8066c7bb4b 100644
--- a/keyboard/ergodox_ez/Makefile
+++ b/keyboard/ergodox_ez/Makefile
@@ -31,15 +31,14 @@ SRC = ergodox_ez.c \
 	  matrix.c
 
 ifdef KEYMAP
-    SRC := keymaps/$(KEYMAP)/keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP)/keymap.c $(SRC)
 else
-    SRC := keymaps/default/keymap_default.c $(SRC)
+    SRC := keymaps/default/keymap.c $(SRC)
 endif
 
 CONFIG_H = config.h
 
 # MCU name
-#MCU = at90usb1287
 MCU = atmega32u4
 
 # Processor frequency.
diff --git a/keyboard/ergodox_ez/keymaps/andrew/keymap_andrew_osx.hex b/keyboard/ergodox_ez/keymaps/andrew/keymap_andrew_osx.hex
deleted file mode 100644
index e3ee9afd3e..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/andrew/keymap_andrew_osx.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/andrew/keymap_andrew_osx.c b/keyboard/ergodox_ez/keymaps/andrew_osx/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/andrew/keymap_andrew_osx.c
rename to keyboard/ergodox_ez/keymaps/andrew_osx/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap_coderkun_neo2.c b/keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap_coderkun_neo2.c
rename to keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap_coderkun_neo2.hex b/keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap_coderkun_neo2.hex
deleted file mode 100644
index c4804d4830..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap_coderkun_neo2.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/dave/keymap_dave.c b/keyboard/ergodox_ez/keymaps/dave/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/dave/keymap_dave.c
rename to keyboard/ergodox_ez/keymaps/dave/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/dave/keymap_dave.hex b/keyboard/ergodox_ez/keymaps/dave/keymap_dave.hex
deleted file mode 100644
index 767a9ca117..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/dave/keymap_dave.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/default/keymap_default.png b/keyboard/ergodox_ez/keymaps/default/default.png
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/default/keymap_default.png
rename to keyboard/ergodox_ez/keymaps/default/default.png
diff --git a/keyboard/ergodox_ez/keymaps/default/keymap_default_highres.png b/keyboard/ergodox_ez/keymaps/default/default_highres.png
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/default/keymap_default_highres.png
rename to keyboard/ergodox_ez/keymaps/default/default_highres.png
diff --git a/keyboard/ergodox_ez/keymaps/default/keymap_default.c b/keyboard/ergodox_ez/keymaps/default/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/default/keymap_default.c
rename to keyboard/ergodox_ez/keymaps/default/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/default/keymap_default.hex b/keyboard/ergodox_ez/keymaps/default/keymap_default.hex
deleted file mode 100644
index eedabc2db5..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/default/keymap_default.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/default/readme.md b/keyboard/ergodox_ez/keymaps/default/readme.md
index f8508fede3..a1a8ad44f8 100644
--- a/keyboard/ergodox_ez/keymaps/default/readme.md
+++ b/keyboard/ergodox_ez/keymaps/default/readme.md
@@ -2,4 +2,4 @@
 
 This is what we ship with out of the factory. :) The image says it all:
 
-![Default](keymap_default.png)
+![Default](default_highres.png)
diff --git a/keyboard/ergodox_ez/keymaps/default/keymap_default_osx_highres.png b/keyboard/ergodox_ez/keymaps/default_osx/default_osx_highres.png
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/default/keymap_default_osx_highres.png
rename to keyboard/ergodox_ez/keymaps/default_osx/default_osx_highres.png
diff --git a/keyboard/ergodox_ez/keymaps/default_osx/keymap_default_osx.c b/keyboard/ergodox_ez/keymaps/default_osx/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/default_osx/keymap_default_osx.c
rename to keyboard/ergodox_ez/keymaps/default_osx/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/default_osx/keymap_default_osx.hex b/keyboard/ergodox_ez/keymaps/default_osx/keymap_default_osx.hex
deleted file mode 100644
index 3a1cc4f79e..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/default_osx/keymap_default_osx.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/default_osx/readme.md b/keyboard/ergodox_ez/keymaps/default_osx/readme.md
index 809e8a5851..aa749aac90 100644
--- a/keyboard/ergodox_ez/keymaps/default_osx/readme.md
+++ b/keyboard/ergodox_ez/keymaps/default_osx/readme.md
@@ -4,3 +4,5 @@ So, I took the default firmware and just made a couple of tweaks that make it ea
 
 1. The Cmd key is now on the right side, making Cmd+Space easier.
 2. The media keys work on OSX (But not on Windows).
+
+![default osx](default_osx_highres.png)
diff --git a/keyboard/ergodox_ez/keymaps/dragon788/keymap_dragon788.c b/keyboard/ergodox_ez/keymaps/dragon788/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/dragon788/keymap_dragon788.c
rename to keyboard/ergodox_ez/keymaps/dragon788/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/dragon788/keymap_dragon788.hex b/keyboard/ergodox_ez/keymaps/dragon788/keymap_dragon788.hex
deleted file mode 100644
index 36adaad1dc..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/dragon788/keymap_dragon788.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.png b/keyboard/ergodox_ez/keymaps/dvorak/dvorak.png
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.png
rename to keyboard/ergodox_ez/keymaps/dvorak/dvorak.png
diff --git a/keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.c b/keyboard/ergodox_ez/keymaps/dvorak/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.c
rename to keyboard/ergodox_ez/keymaps/dvorak/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.hex b/keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.hex
deleted file mode 100644
index 8e1ac3f21b..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/dvorak/keymap_dvorak.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap_erez_experimental.c b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/erez_experimental/keymap_erez_experimental.c
rename to keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap_erez_experimental.hex b/keyboard/ergodox_ez/keymaps/erez_experimental/keymap_erez_experimental.hex
deleted file mode 100644
index d18d061b96..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap_erez_experimental.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/german/keymap_german.c b/keyboard/ergodox_ez/keymaps/german/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/german/keymap_german.c
rename to keyboard/ergodox_ez/keymaps/german/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/german/keymap_german.hex b/keyboard/ergodox_ez/keymaps/german/keymap_german.hex
deleted file mode 100644
index a2f30d7cb6..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/german/keymap_german.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/j3rn/keymap_j3rn.c b/keyboard/ergodox_ez/keymaps/j3rn/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/j3rn/keymap_j3rn.c
rename to keyboard/ergodox_ez/keymaps/j3rn/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/j3rn/keymap_j3rn.hex b/keyboard/ergodox_ez/keymaps/j3rn/keymap_j3rn.hex
deleted file mode 100644
index 61af86e722..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/j3rn/keymap_j3rn.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymap_j3rn_README.md b/keyboard/ergodox_ez/keymaps/j3rn/readme.md
similarity index 100%
rename from keyboard/ergodox_ez/keymap_j3rn_README.md
rename to keyboard/ergodox_ez/keymaps/j3rn/readme.md
diff --git a/keyboard/ergodox_ez/keymaps/jack/keymap_jack.c b/keyboard/ergodox_ez/keymaps/jack/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/jack/keymap_jack.c
rename to keyboard/ergodox_ez/keymaps/jack/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/jack/keymap_jack.hex b/keyboard/ergodox_ez/keymaps/jack/keymap_jack.hex
deleted file mode 100644
index 5651572ab0..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/jack/keymap_jack.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/jgarr/keymap_jgarr.c b/keyboard/ergodox_ez/keymaps/jgarr/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/jgarr/keymap_jgarr.c
rename to keyboard/ergodox_ez/keymaps/jgarr/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/jgarr/keymap_jgarr.hex b/keyboard/ergodox_ez/keymaps/jgarr/keymap_jgarr.hex
deleted file mode 100644
index f87413b56d..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/jgarr/keymap_jgarr.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/kastyle/keymap_kastyle.c b/keyboard/ergodox_ez/keymaps/kastyle/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/kastyle/keymap_kastyle.c
rename to keyboard/ergodox_ez/keymaps/kastyle/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/kastyle/keymap_kastyle.hex b/keyboard/ergodox_ez/keymaps/kastyle/keymap_kastyle.hex
deleted file mode 100644
index 8c5409ac62..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/kastyle/keymap_kastyle.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/kines-ish/keymap_kines-ish.c b/keyboard/ergodox_ez/keymaps/kines-ish/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/kines-ish/keymap_kines-ish.c
rename to keyboard/ergodox_ez/keymaps/kines-ish/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/kines-ish/keymap_kines-ish.hex b/keyboard/ergodox_ez/keymaps/kines-ish/keymap_kines-ish.hex
deleted file mode 100644
index eea5130bde..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/kines-ish/keymap_kines-ish.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de.c
deleted file mode 100644
index cc9076eec8..0000000000
--- a/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de.c
+++ /dev/null
@@ -1,277 +0,0 @@
-#include "ergodox_ez.h"
-#include "debug.h"
-#include "action_layer.h"
-#include "keymap_extras/keymap_german_osx.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-#define CRSR 3 // media keys
-#define NUMB 4 // number keys
-
-#define M_CTRL_CMDV 1
-#define M_CTRL_CMDC 2
-#define M_MEH_SH_ACUT 3
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |   1  |   2  |   3  |   4  |   5  |CMD-V |           |CMD-C |   6  |   7  |   8  |   9  |   0  |   ß    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  TAB   |   Q  |   W  |   E  |   R  |   T  | CMD  |           | CMD  |   Z  |   U  |   I  |   O  |   P  |   ü    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  L3    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ö  |  ä/L2  |
- * |--------+------+------+------+------+------| LALT |           | RALT |------+------+------+------+------+--------|
- * | LShift |Y/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |-/Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |</L1|  ^°  |AltShf| Left | Right|                                       |  Up  | Down | CMD-SHIFT |  +  | #/L1 |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        | MDIA | Meh  |       | Hyper|  NUM   |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Back-|  Del |------|       |------|  Enter | Space|
- *                                 | Space|      | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = KEYMAP(  // layer 0 : default
-        // left hand
-        KC_ESC,                  DE_1,         DE_2,   DE_3,   DE_4,   DE_5,   M(M_CTRL_CMDV),
-        KC_TAB,                  DE_Q,         DE_W,   DE_E,   DE_R,   DE_T,   KC_LGUI,
-        TG(3),                   DE_A,         DE_S,   DE_D,   DE_F,   DE_G,
-        KC_LSFT,                 CTL_T(DE_Y),  DE_X,   DE_C,   DE_V,   DE_B,   KC_LALT,
-        LT(SYMB,KC_GRV),         DE_LESS,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                               					TG(2),  	M(M_MEH_SH_ACUT), //MEH_T(LSFT(DE_ACUT)), //need to create macro for that
-                                                              					KC_HOME,
-                                               				KC_BSPC,KC_DEL,		KC_END,
-        // right hand
-             M(M_CTRL_CMDC),  DE_6,   DE_7,   DE_8,   DE_9,   DE_0,             DE_SS,
-             KC_RGUI,     DE_Z,   DE_U,   DE_I,   DE_O,   DE_P,             DE_UE,
-                          DE_H,   DE_J,   DE_K,   DE_L,   DE_OE,LT(MDIA,DE_AE),
-             KC_RALT,	  DE_N,   DE_M,   DE_COMM,DE_DOT, CTL_T(DE_MINS),   KC_RSFT,
-                                  KC_UP,  KC_DOWN,LGUI(KC_LSFT),DE_PLUS,          LT(SYMB,DE_HASH),
-             ALL_T(DE_ACUT),      TG(4),
-             KC_PGUP,
-             KC_PGDN,KC_ENT, KC_SPC
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |  <   |  >   |   !  |  ?   |      |      |           |      |   \  |   [  |   ]  |   |  |   #  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   \  |   /  |   .  |------|           |------|   /  |   (  |   )  |   {  |   }  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |   ^  |   %  |   |  |   ~  |      |           |      |   &  |   <  |   >  |   "  |   '  |    ?   |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |   .  |   !  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = KEYMAP(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,DE_LESS,DE_MORE,DE_EXLM,DE_QST, KC_TRNS,KC_TRNS,
-       KC_TRNS,DE_HASH,DE_DLR, DE_BSLS,DE_SLSH,KC_DOT,
-       KC_TRNS,KC_TRNS,DE_LESS,DE_PERC,DE_PIPE,DE_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_DEL,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, LALT(LSFT(KC_7)),   LALT(KC_5),   LALT(KC_6),    LALT(KC_7),    DE_HASH, KC_F12,
-                DE_SLSH,   DE_LPRN,   DE_RPRN,    LALT(KC_8),    LALT(KC_9), KC_TRNS,
-       KC_TRNS, DE_AMPR, KC_GRV,   LSFT(KC_GRV),    DE_DQOT,    DE_QUOT, DE_QST,
-                         KC_TRNS,KC_DOT,  KC_EXLM,    KC_TRNS,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_MUTE, KC_MPRV, KC_MNXT, KC_UP,   KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_RIGHT,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-// Cursor layer
-KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS,
-                          KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-//number pad
-KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    LSFT(KC_RBRC), KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_RBRC, KC_TRNS,
-       KC_TRNS, LSFT(KC_6), KC_1,   KC_2,    KC_3,    LSFT(KC_7), KC_TRNS,
-                         KC_0,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB),                // FN1 - Momentary Layer 1 (Symbols)
-    [2] = ACTION_LAYER_TAP_TOGGLE(CRSR)                // FN2 - Momentary Layer 2 (Cursors)
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-		static uint16_t start;
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
-		if (record->event.pressed) {
-		  register_code(KC_RSFT);
-		} else {
-		  unregister_code(KC_RSFT);
-		}
-		break;
-	case 1:
-		if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL), END);
-		} else {
-			if (timer_elapsed(start) > 150) {
-			    return MACRO(U(LCTRL), END);
-			} else {
-			    return MACRO(U(LCTRL), D(LGUI), T(V), U(LGUI), END);
-			}
-		}
-		break;
-	case 2:
-		if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),END);
-		} else {
-			if (timer_elapsed(start) > 150){
-				return MACRO(U(LCTRL),END);
-			} else {
-				return MACRO(U(LCTRL),D(LGUI),T(C),U(LGUI),END);
-			}
-		}
-		break;
-	case 3:
-		if (record->event.pressed) {
-			start = timer_read();
-			return MACRO(D(LCTRL),D(LSFT),D(LALT),END);
-		} else {
-			if (timer_elapsed(start) > 150){
-				return MACRO(U(LCTRL),U(LSFT),U(LALT),END);
-			} else {
-				return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); //cannot use DE_ACUT here, as macro needs KC_ prefix
-			}
-		}
-		break;
-      }
-    return MACRO_NONE;
-};
-
-// Runs just one time when the keyboard initializes.
-void * matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void * matrix_scan_user(void) {
-
-    uint8_t layer = biton32(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-	    break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-	    ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-	    //ergodox_board_led_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de.hex b/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de.hex
deleted file mode 100644
index eb82384d54..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de_highres.png b/keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de_highres.png
rename to keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png
diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de_adnw_koy.c b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/osx_de/keymap_osx_de_adnw_koy.c
rename to keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/osx_fr/keymap_osx_fr.c b/keyboard/ergodox_ez/keymaps/osx_fr/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/osx_fr/keymap_osx_fr.c
rename to keyboard/ergodox_ez/keymaps/osx_fr/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/osx_fr/keymap_osx_fr.hex b/keyboard/ergodox_ez/keymaps/osx_fr/keymap_osx_fr.hex
deleted file mode 100644
index 8915d9caa5..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/osx_fr/keymap_osx_fr.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap_osx_kinesis_pnut.c b/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap_osx_kinesis_pnut.c
rename to keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/plover/keymap_plover.c b/keyboard/ergodox_ez/keymaps/plover/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/plover/keymap_plover.c
rename to keyboard/ergodox_ez/keymaps/plover/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/plover/keymap_plover.hex b/keyboard/ergodox_ez/keymaps/plover/keymap_plover.hex
deleted file mode 100644
index 53b0747d7e..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/plover/keymap_plover.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/keymap_software_neo2.c b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/software_neo2/keymap_software_neo2.c
rename to keyboard/ergodox_ez/keymaps/software_neo2/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap_workman_osx_mdw.c b/keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap.c
similarity index 100%
rename from keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap_workman_osx_mdw.c
rename to keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap.c
diff --git a/keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap_workman_osx_mdw.hex b/keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap_workman_osx_mdw.hex
deleted file mode 100644
index e6fe6a368b..0000000000
Binary files a/keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap_workman_osx_mdw.hex and /dev/null differ
diff --git a/keyboard/ergodox_ez/README.md b/keyboard/ergodox_ez/readme.md
similarity index 80%
rename from keyboard/ergodox_ez/README.md
rename to keyboard/ergodox_ez/readme.md
index 7c41072a14..a41a29e1ad 100644
--- a/keyboard/ergodox_ez/README.md
+++ b/keyboard/ergodox_ez/readme.md
@@ -17,9 +17,9 @@ This requires a little bit of familiarity with coding.
 2. Clone the repository (download it)
 3. Set up a build environment as per [pjrc.com/teensy/gcc.html](https://www.pjrc.com/teensy/gcc.html)
     - Using a Mac and have homebrew? just run `brew tap osx-cross/avr && brew install avr-libc`
-4. Copy `keymaps/default/keymap_default.c` into `keymaps/your_name/keymap_your_name.c` (for example, `keymaps/german/keymap_german.c`)
+4. Copy `keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`)
 5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly. See below for more tips on sharing your work.
-6. Compile your firmware by running `make clean` followed by `make KEYMAP=your_name`. Note that you must omit the `keymap_` prefix for your filename in this command -- for example, `make KEYMAP=german`. This will result in a hex file, which will always be called `ergodox_ez.hex`, regardless of your keymap name.
+6. Compile your firmware by running `make clean` followed by `make KEYMAP=your_name`. For example, `make KEYMAP=german`. This will result in a hex file, which will always be called `ergodox_ez.hex`, regardless of your keymap name.
 6. Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above.
 7. Submit your work as a pull request to this repository, so others can also use it. :) See below on specifics.
 
@@ -29,11 +29,9 @@ Good luck! :)
 
 The ErgoDox EZ firmware is open-source, so it would be wonderful to have your contribution! Within a very short time after launching we already amassed almost 20 user-contributed keymaps, with all sorts of creative improvements and tweaks. This is very valuable for people who aren't comfortable coding, but do want to customize their ErgoDox EZ. To make it easy for these people to use your layout, I recommend submitting your PR in the following format. 
 
-Assuming a keymap named `keymap_josh.c`:
-
-1. All work goes inside `keymaps/josh`.
-2. `keymap_josh.c` - this is your actual keymap file; please update the ASCII comments in the file so they correspond with what you did.
-3. `keymap_josh.hex` - a compiled version of your keymap. Commit it to the repo with `git add -f` as hex files are ignored by default. This allows people to just download your hex file and flash it without having to set up a build toolchain to make it.
+1. All work goes inside your keymap subdirectory (`keymaps/german` in this example).
+2. `keymap.c` - this is your actual keymap file; please update the ASCII comments in the file so they correspond with what you did.
+3. `german.hex` - a compiled version of your keymap. Commit it to the repo with `git add -f` as hex files are ignored by default. This allows people to just download your hex file and flash it without having to set up a build toolchain to make it.
 3. `readme.md` - a Readme file, which GitHub would display by default when people go to your directory. Explain what's different about your keymap, what you tweaked or how it works. No specific format to follow, just communicate what you did. :)
 4. Any graphics you wish to add. This is absolutely not a must. If you feel like it, you can use [Keyboard Layout Editor](http://keyboard-layout-editor.com) to make something and grab a screenshot, but it's really not a must. If you do have graphics, your Readme can just embed the graphic as a link, just like I did with the default layout. 
 
diff --git a/keyboard/ergodox_ez/reference_compiled_default_firmware.hex b/keyboard/ergodox_ez/reference_compiled_default_firmware.hex
deleted file mode 100644
index 69577c549c..0000000000
Binary files a/keyboard/ergodox_ez/reference_compiled_default_firmware.hex and /dev/null differ