76 files changed, 4803 insertions, 1894 deletions
diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile
index e90dcedb67..7634c4280e 100644
--- a/keyboard/alps64/Makefile
+++ b/keyboard/alps64/Makefile
@@ -53,9 +53,9 @@ SRC =	keymap_common.c \
 	led.c
 
 ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
-    SRC := keymap_plain.c $(SRC)
+    SRC := keymaps/default.c $(SRC)
 endif
 
 CONFIG_H = config.h
diff --git a/keyboard/alps64/keymap_plain.c b/keyboard/alps64/keymaps/default.c
index a54899196a..a54899196a 100644
--- a/keyboard/alps64/keymap_plain.c
+++ b/keyboard/alps64/keymaps/default.c
diff --git a/keyboard/alps64/keymap_hasu.c b/keyboard/alps64/keymaps/hasu.c
index d297d72fea..d297d72fea 100644
--- a/keyboard/alps64/keymap_hasu.c
+++ b/keyboard/alps64/keymaps/hasu.c
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile
index e678b4efa8..da6d0ac60c 100644
--- a/keyboard/atomic/Makefile
+++ b/keyboard/atomic/Makefile
@@ -54,9 +54,9 @@ SRC = atomic.c \
 	backlight.c 
 
 ifdef KEYMAP
-    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
-    SRC := keymaps/keymap_default.c $(SRC)
+    SRC := keymaps/default.c $(SRC)
 endif
 
 CONFIG_H = config.h
diff --git a/keyboard/atomic/README.md b/keyboard/atomic/README.md
index c8e83cf55a..0e42370ba6 100644
--- a/keyboard/atomic/README.md
+++ b/keyboard/atomic/README.md
@@ -16,10 +16,10 @@ Depending on which keymap you would like to use, you will have to compile slight
 To build with the default keymap, simply run `make`.
 
 ### Other Keymaps
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
+Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a file in the keymaps folder named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
 
 To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like:
 ```
 $ make KEYMAP=[default|jack|<name>]
 ```
-Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder.
+Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
diff --git a/keyboard/atomic/keymaps/keymap_abienz.c b/keyboard/atomic/keymaps/abienz.c
index 589a64dc4e..589a64dc4e 100644
--- a/keyboard/atomic/keymaps/keymap_abienz.c
+++ b/keyboard/atomic/keymaps/abienz.c
diff --git a/keyboard/atomic/keymaps/keymap_default.c b/keyboard/atomic/keymaps/default.c
index f37d9d9a51..f37d9d9a51 100644
--- a/keyboard/atomic/keymaps/keymap_default.c
+++ b/keyboard/atomic/keymaps/default.c
diff --git a/keyboard/atomic/keymaps/keymap_michelle.c b/keyboard/atomic/keymaps/michelle.c
index 2364c46a15..2364c46a15 100644
--- a/keyboard/atomic/keymaps/keymap_michelle.c
+++ b/keyboard/atomic/keymaps/michelle.c
diff --git a/keyboard/atreus/Makefile b/keyboard/atreus/Makefile
index 2e542d62ed..a6fddd70d2 100644
--- a/keyboard/atreus/Makefile
+++ b/keyboard/atreus/Makefile
@@ -53,9 +53,9 @@ TARGET_DIR = .
 SRC = atreus.c
 
 ifdef KEYMAP
-    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/$(KEYMAP).c $(SRC)
 else
-    SRC := keymaps/keymap_default.c $(SRC)
+    SRC := keymaps/default.c $(SRC)
 endif
 
 ifdef TEENSY2
diff --git a/keyboard/atreus/README.md b/keyboard/atreus/README.md
index 4db7ac1203..aacf2841f4 100644
--- a/keyboard/atreus/README.md
+++ b/keyboard/atreus/README.md
@@ -177,10 +177,10 @@ Depending on which keymap you would like to use, you will have to compile slight
 To build with the default keymap, simply run `make`.
 
 ### Other Keymaps
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
+Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
 
 To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like:
 ```
 $ make KEYMAP=[default|jack|<name>]
 ```
-Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder.
+Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
diff --git a/keyboard/atreus/keymaps/keymap_default.c b/keyboard/atreus/keymaps/default.c
index 1c4280ff56..1c4280ff56 100644
--- a/keyboard/atreus/keymaps/keymap_default.c
+++ b/keyboard/atreus/keymaps/default.c
diff --git a/keyboard/atreus/keymaps/keymap_gerb.c b/keyboard/atreus/keymaps/gerb.c
index 1ba3942e3b..1ba3942e3b 100644
--- a/keyboard/atreus/keymaps/keymap_gerb.c
+++ b/keyboard/atreus/keymaps/gerb.c
diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md
new file mode 100644
index 0000000000..984106ff46
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md
@@ -0,0 +1,29 @@
+# ErgoDox EZ Dvorak International Squisher
+
+Dvorak layout adjusted with several (linux) applications in mind:
+
+* Easier Escape for VIM
+* Windows/Super key for awesome WM
+* Alt+Shift for international characters
+* PrintScreen for sys-rq
+* Insert for the X11 clip-board
+
+Major layer changes:
+
+* Common multimedia keys are integrated into layer 0, less common into layer 1
+* No mouse keys
+* Layer 2 is qwerty (for easier gaming & less fortunate keyboard users)
+
+Known issues:
+
+* Alt+Shift does not work reliably (depends on the X11 kb layout? Not
+  entirely clear...)
+
+![layer0](keyboard-layout0.png)
+![layer1](keyboard-layout1.png)
+![layer2](keyboard-layout2.png)
+
+## Changelog
+
+* 2016-03-29
+  * Initial release
diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex
new file mode 100644
index 0000000000..bd70f5829f
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/dvorak_intl_squisher.hex
@@ -0,0 +1,1127 @@
+:100000000C9465020C94AC020C94AC020C94AC02FF
+:100010000C94AC020C94AC020C94AC020C94AC02A8
+:100020000C94AC020C94AC020C94B50B0C94870CA1
+:100030000C94AC020C94AC020C94AC020C94AC0288
+:100040000C94AC020C943B210C94AC020C94AC02CA
+:100050000C94AC020C94C71A0C94AC020C94AC0235
+:100060000C94AC020C94AC020C94AC020C94AC0258
+:100070000C94AC020C94AC020C94AC020C94AC0248
+:100080000C94AC020C94AC020C94AC020C94AC0238
+:100090000C94AC020C94AC020C94AC020C94AC0228
+:1000A0000C94AC020C94AC020C94AC02F40C160D43
+:1000B000040E160D040E5B0D7E0D040ED30DE60D21
+:1000C000D110D11000110011431181119A139A130C
+:1000D0009A119A139B129B126E139A139A138513FB
+:1000E0000000F0A12E0029002A00E1003581000067
+:1000F0001E00340004003371E2004D001F00360082
+:1001000012001400E3002B002000370008000D004F
+:1001100050002C002100130018000E004F004A0070
+:1001200022001C000C001B0000006571B6004C0092
+:100130000000007F00000154AE004900000000777D
+:1001400000000254230009000700050000004600DB
+:1001500024000A000B00100052004B00250006008E
+:1001600017001A0051002800260015001100190080
+:100170002F00E51427000F0016001D7130004E00FF
+:10018000318238002D00E500C100000001000100AF
+:1001900001000100010000003A001E0220022202BC
+:1001A000010001003B001F022102230201000100A7
+:1001B0003C002F0226022F00AC0001003D0030025F
+:1001C00027023000AB0001003E003102350035024D
+:1001D000000001000100010000000100000001001A
+:1001E0000100010000000100000001003F0052007A
+:1001F00051002402000001004000240021001E00E4
+:100200000100A9004100250022001F003700010065
+:1002100042002600230020002700A80043002502FA
+:100220002E0231002E00AA0044004500010001000A
+:1002300001000000010001000100010001000000B8
+:100240000100140004001D710100010001001A00EA
+:1002500016001B0001000100010008000700060055
+:100260000100010001001500090019000100010052
+:10027000010017000A000500000001000100010054
+:100280000000010000000100010001000000010069
+:100290000000010001001C000B0011000000010023
+:1002A000010018000D0010000100010001000C0009
+:1002B0000E00360001000100010012000F0037009F
+:1002C00001000100010013003382387101000100B8
+:1002D00001000100010001000100000016034500BB
+:1002E000720067006F0044006F0078002000450036
+:1002F0005A00000016034500720067006F004400BA
+:100300006F007800200045005A0000000403090433
+:1003100009026D00040100A0FA09040000010301B4
+:100320000100092111010001223F00070581030896
+:10033000000A090401000103010200092111010062
+:1003400001224D000705820308000A09040200018A
+:100350000300000009211101000122360007058376
+:100360000308000A09040300010300000009211129
+:100370000100012239000705840310000112011059
+:100380000100000008EDFE07130100010200010555
+:10039000010906A101050719E029E71500250195C6
+:1003A0000875018102050819012905950575019156
+:1003B000029501750391010507190029771500259C
+:1003C00001957875018102C005010980A1018502AE
+:1003D00016010026B7001A01002AB7007510950112
+:1003E0008100C0050C0901A1018503160100269CAE
+:1003F000021A01002A9C02751095018100C00501B6
+:100400000902A1010901A100050919012905150029
+:10041000250195057501810295017503810105018D
+:10042000093009311581257F950275088106093843
+:100430001581257F950175088106050C0A3802157E
+:1004400081257F950175088106C0C005010906A1B7
+:1004500001050719E029E7150025019508750181B7
+:100460000295017508810105081901290595057591
+:100470000191029501750391010507190029FF15E6
+:100480000025FF950675088100C0000000000000EF
+:100490000000000000010204060A0F17202C3A4A4F
+:1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2
+:1004B000B39D87715D4A3A2C20170F0A060402018A
+:1004C0000000000000000000000011241FBECFEF5C
+:1004D000DAE0DEBFCDBF04B603FE27C08091EF0196
+:1004E0009091F001A091F101B091F2018730904B11
+:1004F000A740B04BD1F41092EF011092F00110928E
+:10050000F1011092F20114BE84B7877F84BF0FB649
+:10051000F894A895809160008861809360001092A3
+:1005200060000FBEE0E0FFE3099511E0A0E0B1E05C
+:10053000E8E1F6E402C005900D92A433B107D9F7C3
+:1005400021E0A4E3B1E001C01D92AF3EB207E1F7A4
+:100550000E94F6080C940A230C94000061110BC051
+:10056000FC018281882321F085EE0E94660F03C082
+:1005700085EE0E942E1080E090E00895089560912D
+:10058000B1017091B2018091B3019091B4010E94C8
+:10059000F01956985E9825982D9826982E982798A9
+:1005A0002F98813019F0823021F00895259A2D9AE4
+:1005B0000895269A2E9A08950C94BF0256985E9834
+:1005C00025982D9826982E9827982F988FEF90E0B1
+:1005D000909389008093880090938B0080938A0089
+:1005E00090938D0080938C00259A2D9A2FEF80E7B1
+:1005F00092E0215080409040E1F700C00000269A30
+:100600002E9A2FEF80E792E0215080409040E1F752
+:1006100000C00000279A2F9A2FEF80E792E0215028
+:1006200080409040E1F700C0000025982D982FEF02
+:1006300080E792E0215080409040E1F700C0000048
+:1006400026982E982FEF80E792E02150804090402E
+:10065000E1F700C0000027982F9856985E982598DB
+:100660002D9826982E9827982F98089589EA809398
+:10067000800089E08093810024982C983F988AB16B
+:100680008F748AB96E98479A8BB1806B8BB9769AC2
+:100690000E94DE020C94BE0280E2809300018091F1
+:1006A000340181110EC00E949B0381E080933401CC
+:1006B0002FEF83ED90E3215080409040E1F700C0A0
+:1006C000000080E40E94A1038093000181112EC0EC
+:1006D0000E94CB0380930001811128C00E94CB03AC
+:1006E00080930001811122C08FE30E94CB0380938D
+:1006F000000181111BC00E94C30380E40E94A1037A
+:1007000080930001811112C08CE00E94CB03809382
+:10071000000181110BC00E94CB0380930001811165
+:1007200005C08FE30E94CB03809300010E94C303A6
+:100730008091000108951092B9008AE08093B8007A
+:10074000089594EA9093BC009091BC0097FFFCCF71
+:100750009091B900987F983021F0903111F081E0AC
+:1007600008958093BB0084E88093BC008091BC0016
+:1007700087FFFCCF8091B900887F883111F08034E9
+:1007800071F780E0089584E98093BC008091BC00FB
+:1007900084FDFCCF08958093BB0084E88093BC0067
+:1007A0008091BC0087FFFCCF9091B900987F81E0D9
+:1007B000983209F480E0089584E88093BC00809129
+:1007C000BC0087FFFCCF8091BB00089580910001A1
+:1007D000811115C080E40E94A10380930001811162
+:1007E0000CC082E10E94CB0380930001811105C0FF
+:1007F0008FEF0E94CB03809300010E94C30384B15A
+:10080000807F84B985B1807F85B98AB1837F8AB9B9
+:100810008BB1837F8BB93E98469808950E944C0314
+:10082000809300010E94E60380B38C7080BB81B38B
+:10083000836F81BBA6E3B1E0E4E4F1E08EE08E0FCC
+:1008400011921D928E13FCCF0C943603BF92CF925F
+:10085000DF92EF92FF920F931F93CF93DF938091DC
+:100860000001882379F0809135018F5F80933501F5
+:10087000811108C00E944C0380930001811102C0C5
+:100880000E94DE0206E311E0C0E0D0E0DD24D39454
+:1008900082E0C82EEE24E394F12CC730D10500F598
+:1008A00080910001811164C080E40E94A1038093C3
+:1008B0000001811112C082E10E94CB0380930001EC
+:1008C00081110BC0C7010C2E01C0880F0A94EAF7F2
+:1008D00080950E94CB03809300010E94C30348C00F
+:1008E000CA30A1F028F4C83059F0C93061F005C011
+:1008F000CC3089F070F0CD3089F0209A289810C063
+:10090000219A29980DC0229A2A980AC0239A2B98D6
+:1009100007C0529A01C0539A5B9802C03E9A46980B
+:1009200090EA9A95F1F79FB1799902C082E001C0EF
+:1009300080E091709D25982B7C9902C084E001C0D5
+:1009400080E0892B7D9902C038E001C030E0832B24
+:100950007E9902C020E101C020E0822B9FB19095DA
+:10096000991F9927991F9295990F907E892B0FC0F7
+:1009700080910001811149C080E40E94A10380930D
+:100980000001882379F1B12C0E94C3038B2DF8015B
+:100990009081981719F08083C09201010E94E603AC
+:1009A00021960F5F1F4FCE30D10509F076CF809191
+:1009B0000101882361F1815080930101882339F07E
+:1009C0008FE99FE00197F1F700C0000020C0A4E488
+:1009D000B1E0E6E3F1E0CF01825F91919D938E1348
+:1009E000FCCF15C083E10E94CB03809300018111ED
+:1009F000CACF81E40E94A103809300018111C3CF7B
+:100A00000E94DC03B82EB094BFCF80E0C0CF0E941C
+:100A1000DC0281E0DF91CF911F910F91FF90EF9069
+:100A2000DF90CF90BF900895E82FF0E0EC5BFE4F91
+:100A30008081089508958B3B910578F4883A91055B
+:100A400040F5853A9105D0F48430910508F0B1C0A5
+:100A50008130910509F4ADC06BC0803E910508F46A
+:100A600067C0883E910508F4A4C09C01205F31094D
+:100A70002031310508F05CC090650895853A9105F4
+:100A800009F459C0863A910509F058C082E890E40B
+:100A90000895883A910509F454C0893A910509F4FA
+:100AA00053C08A3A910509F452C08B3A910509F472
+:100AB00051C