diff --git a/keyboards/atom47/keymaps/LEdiodes/keymap.c b/keyboards/maartenwut/atom47/keymaps/LEdiodes/keymap.c
similarity index 100%
rename from keyboards/atom47/keymaps/LEdiodes/keymap.c
rename to keyboards/maartenwut/atom47/keymaps/LEdiodes/keymap.c
diff --git a/keyboards/atom47/keymaps/LEdiodes/rules.mk b/keyboards/maartenwut/atom47/keymaps/LEdiodes/rules.mk
similarity index 100%
rename from keyboards/atom47/keymaps/LEdiodes/rules.mk
rename to keyboards/maartenwut/atom47/keymaps/LEdiodes/rules.mk
diff --git a/keyboards/atom47/keymaps/default/keymap.c b/keyboards/maartenwut/atom47/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/atom47/keymaps/default/keymap.c
rename to keyboards/maartenwut/atom47/keymaps/default/keymap.c
diff --git a/keyboards/atom47/keymaps/default/readme.md b/keyboards/maartenwut/atom47/keymaps/default/readme.md
similarity index 100%
rename from keyboards/atom47/keymaps/default/readme.md
rename to keyboards/maartenwut/atom47/keymaps/default/readme.md
diff --git a/keyboards/atom47/keymaps/maartenwut/keymap.c b/keyboards/maartenwut/atom47/keymaps/maartenwut/keymap.c
similarity index 100%
rename from keyboards/atom47/keymaps/maartenwut/keymap.c
rename to keyboards/maartenwut/atom47/keymaps/maartenwut/keymap.c
diff --git a/keyboards/atom47/keymaps/maartenwut/readme.md b/keyboards/maartenwut/atom47/keymaps/maartenwut/readme.md
similarity index 100%
rename from keyboards/atom47/keymaps/maartenwut/readme.md
rename to keyboards/maartenwut/atom47/keymaps/maartenwut/readme.md
diff --git a/keyboards/atom47/readme.md b/keyboards/maartenwut/atom47/readme.md
similarity index 100%
rename from keyboards/atom47/readme.md
rename to keyboards/maartenwut/atom47/readme.md
diff --git a/keyboards/atom47/rev2/config.h b/keyboards/maartenwut/atom47/rev2/config.h
similarity index 100%
rename from keyboards/atom47/rev2/config.h
rename to keyboards/maartenwut/atom47/rev2/config.h
diff --git a/keyboards/atom47/rev2/info.json b/keyboards/maartenwut/atom47/rev2/info.json
similarity index 100%
rename from keyboards/atom47/rev2/info.json
rename to keyboards/maartenwut/atom47/rev2/info.json
diff --git a/keyboards/atom47/rev2/readme.md b/keyboards/maartenwut/atom47/rev2/readme.md
similarity index 100%
rename from keyboards/atom47/rev2/readme.md
rename to keyboards/maartenwut/atom47/rev2/readme.md
diff --git a/keyboards/atom47/rev2/rev2.c b/keyboards/maartenwut/atom47/rev2/rev2.c
similarity index 100%
rename from keyboards/atom47/rev2/rev2.c
rename to keyboards/maartenwut/atom47/rev2/rev2.c
diff --git a/keyboards/atom47/rev2/rev2.h b/keyboards/maartenwut/atom47/rev2/rev2.h
similarity index 100%
rename from keyboards/atom47/rev2/rev2.h
rename to keyboards/maartenwut/atom47/rev2/rev2.h
diff --git a/keyboards/atom47/rev2/rules.mk b/keyboards/maartenwut/atom47/rev2/rules.mk
similarity index 100%
rename from keyboards/atom47/rev2/rules.mk
rename to keyboards/maartenwut/atom47/rev2/rules.mk
diff --git a/keyboards/atom47/rev3/config.h b/keyboards/maartenwut/atom47/rev3/config.h
similarity index 100%
rename from keyboards/atom47/rev3/config.h
rename to keyboards/maartenwut/atom47/rev3/config.h
diff --git a/keyboards/atom47/rev3/info.json b/keyboards/maartenwut/atom47/rev3/info.json
similarity index 100%
rename from keyboards/atom47/rev3/info.json
rename to keyboards/maartenwut/atom47/rev3/info.json
diff --git a/keyboards/atom47/rev3/rev3.c b/keyboards/maartenwut/atom47/rev3/rev3.c
similarity index 100%
rename from keyboards/atom47/rev3/rev3.c
rename to keyboards/maartenwut/atom47/rev3/rev3.c
diff --git a/keyboards/atom47/rev3/rev3.h b/keyboards/maartenwut/atom47/rev3/rev3.h
similarity index 100%
rename from keyboards/atom47/rev3/rev3.h
rename to keyboards/maartenwut/atom47/rev3/rev3.h
diff --git a/keyboards/atom47/rev3/rules.mk b/keyboards/maartenwut/atom47/rev3/rules.mk
similarity index 100%
rename from keyboards/atom47/rev3/rules.mk
rename to keyboards/maartenwut/atom47/rev3/rules.mk
diff --git a/keyboards/atom47/rules.mk b/keyboards/maartenwut/atom47/rules.mk
similarity index 100%
rename from keyboards/atom47/rules.mk
rename to keyboards/maartenwut/atom47/rules.mk
diff --git a/keyboards/plain60/config.h b/keyboards/maartenwut/plain60/config.h
similarity index 100%
rename from keyboards/plain60/config.h
rename to keyboards/maartenwut/plain60/config.h
diff --git a/keyboards/plain60/info.json b/keyboards/maartenwut/plain60/info.json
similarity index 100%
rename from keyboards/plain60/info.json
rename to keyboards/maartenwut/plain60/info.json
diff --git a/keyboards/plain60/keymaps/RGB/config.h b/keyboards/maartenwut/plain60/keymaps/RGB/config.h
similarity index 100%
rename from keyboards/plain60/keymaps/RGB/config.h
rename to keyboards/maartenwut/plain60/keymaps/RGB/config.h
diff --git a/keyboards/plain60/keymaps/RGB/keymap.c b/keyboards/maartenwut/plain60/keymaps/RGB/keymap.c
similarity index 100%
rename from keyboards/plain60/keymaps/RGB/keymap.c
rename to keyboards/maartenwut/plain60/keymaps/RGB/keymap.c
diff --git a/keyboards/plain60/keymaps/RGB/rules.mk b/keyboards/maartenwut/plain60/keymaps/RGB/rules.mk
similarity index 100%
rename from keyboards/plain60/keymaps/RGB/rules.mk
rename to keyboards/maartenwut/plain60/keymaps/RGB/rules.mk
diff --git a/keyboards/plain60/keymaps/default/keymap.c b/keyboards/maartenwut/plain60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/plain60/keymaps/default/keymap.c
rename to keyboards/maartenwut/plain60/keymaps/default/keymap.c
diff --git a/keyboards/plain60/keymaps/yanfali/keymap.c b/keyboards/maartenwut/plain60/keymaps/yanfali/keymap.c
similarity index 100%
rename from keyboards/plain60/keymaps/yanfali/keymap.c
rename to keyboards/maartenwut/plain60/keymaps/yanfali/keymap.c
diff --git a/keyboards/plain60/keymaps/yanfali/readme.md b/keyboards/maartenwut/plain60/keymaps/yanfali/readme.md
similarity index 100%
rename from keyboards/plain60/keymaps/yanfali/readme.md
rename to keyboards/maartenwut/plain60/keymaps/yanfali/readme.md
diff --git a/keyboards/plain60/keymaps/yanfali/rules.mk b/keyboards/maartenwut/plain60/keymaps/yanfali/rules.mk
similarity index 100%
rename from keyboards/plain60/keymaps/yanfali/rules.mk
rename to keyboards/maartenwut/plain60/keymaps/yanfali/rules.mk
diff --git a/keyboards/plain60/plain60.c b/keyboards/maartenwut/plain60/plain60.c
similarity index 100%
rename from keyboards/plain60/plain60.c
rename to keyboards/maartenwut/plain60/plain60.c
diff --git a/keyboards/plain60/plain60.h b/keyboards/maartenwut/plain60/plain60.h
similarity index 100%
rename from keyboards/plain60/plain60.h
rename to keyboards/maartenwut/plain60/plain60.h
diff --git a/keyboards/plain60/readme.md b/keyboards/maartenwut/plain60/readme.md
similarity index 100%
rename from keyboards/plain60/readme.md
rename to keyboards/maartenwut/plain60/readme.md
diff --git a/keyboards/plain60/rules.mk b/keyboards/maartenwut/plain60/rules.mk
similarity index 100%
rename from keyboards/plain60/rules.mk
rename to keyboards/maartenwut/plain60/rules.mk
diff --git a/keyboards/ta65/config.h b/keyboards/maartenwut/ta65/config.h
similarity index 100%
rename from keyboards/ta65/config.h
rename to keyboards/maartenwut/ta65/config.h
diff --git a/keyboards/ta65/info.json b/keyboards/maartenwut/ta65/info.json
similarity index 100%
rename from keyboards/ta65/info.json
rename to keyboards/maartenwut/ta65/info.json
diff --git a/keyboards/ta65/keymaps/default/keymap.c b/keyboards/maartenwut/ta65/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ta65/keymaps/default/keymap.c
rename to keyboards/maartenwut/ta65/keymaps/default/keymap.c
diff --git a/keyboards/ta65/keymaps/default_ansi/keymap.c b/keyboards/maartenwut/ta65/keymaps/default_ansi/keymap.c
similarity index 100%
rename from keyboards/ta65/keymaps/default_ansi/keymap.c
rename to keyboards/maartenwut/ta65/keymaps/default_ansi/keymap.c
diff --git a/keyboards/ta65/keymaps/default_ansi_tsangan/keymap.c b/keyboards/maartenwut/ta65/keymaps/default_ansi_tsangan/keymap.c
similarity index 100%
rename from keyboards/ta65/keymaps/default_ansi_tsangan/keymap.c
rename to keyboards/maartenwut/ta65/keymaps/default_ansi_tsangan/keymap.c
diff --git a/keyboards/ta65/keymaps/default_iso/keymap.c b/keyboards/maartenwut/ta65/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/ta65/keymaps/default_iso/keymap.c
rename to keyboards/maartenwut/ta65/keymaps/default_iso/keymap.c
diff --git a/keyboards/ta65/keymaps/default_iso_tsangan/keymap.c b/keyboards/maartenwut/ta65/keymaps/default_iso_tsangan/keymap.c
similarity index 100%
rename from keyboards/ta65/keymaps/default_iso_tsangan/keymap.c
rename to keyboards/maartenwut/ta65/keymaps/default_iso_tsangan/keymap.c
diff --git a/keyboards/ta65/keymaps/maartenwut/config.h b/keyboards/maartenwut/ta65/keymaps/maartenwut/config.h
similarity index 100%
rename from keyboards/ta65/keymaps/maartenwut/config.h
rename to keyboards/maartenwut/ta65/keymaps/maartenwut/config.h
diff --git a/keyboards/ta65/keymaps/maartenwut/keymap.c b/keyboards/maartenwut/ta65/keymaps/maartenwut/keymap.c
similarity index 100%
rename from keyboards/ta65/keymaps/maartenwut/keymap.c
rename to keyboards/maartenwut/ta65/keymaps/maartenwut/keymap.c
diff --git a/keyboards/ta65/readme.md b/keyboards/maartenwut/ta65/readme.md
similarity index 100%
rename from keyboards/ta65/readme.md
rename to keyboards/maartenwut/ta65/readme.md
diff --git a/keyboards/ta65/rules.mk b/keyboards/maartenwut/ta65/rules.mk
similarity index 100%
rename from keyboards/ta65/rules.mk
rename to keyboards/maartenwut/ta65/rules.mk
diff --git a/keyboards/ta65/ta65.c b/keyboards/maartenwut/ta65/ta65.c
similarity index 100%
rename from keyboards/ta65/ta65.c
rename to keyboards/maartenwut/ta65/ta65.c
diff --git a/keyboards/ta65/ta65.h b/keyboards/maartenwut/ta65/ta65.h
similarity index 100%
rename from keyboards/ta65/ta65.h
rename to keyboards/maartenwut/ta65/ta65.h
diff --git a/keyboards/wasdat/config.h b/keyboards/maartenwut/wasdat/config.h
similarity index 100%
rename from keyboards/wasdat/config.h
rename to keyboards/maartenwut/wasdat/config.h
diff --git a/keyboards/wasdat/info.json b/keyboards/maartenwut/wasdat/info.json
similarity index 100%
rename from keyboards/wasdat/info.json
rename to keyboards/maartenwut/wasdat/info.json
diff --git a/keyboards/wasdat/keymaps/default/keymap.c b/keyboards/maartenwut/wasdat/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wasdat/keymaps/default/keymap.c
rename to keyboards/maartenwut/wasdat/keymaps/default/keymap.c
diff --git a/keyboards/wasdat/keymaps/default/readme.md b/keyboards/maartenwut/wasdat/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wasdat/keymaps/default/readme.md
rename to keyboards/maartenwut/wasdat/keymaps/default/readme.md
diff --git a/keyboards/wasdat/keymaps/default_iso/keymap.c b/keyboards/maartenwut/wasdat/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/wasdat/keymaps/default_iso/keymap.c
rename to keyboards/maartenwut/wasdat/keymaps/default_iso/keymap.c
diff --git a/keyboards/wasdat/keymaps/default_iso/readme.md b/keyboards/maartenwut/wasdat/keymaps/default_iso/readme.md
similarity index 100%
rename from keyboards/wasdat/keymaps/default_iso/readme.md
rename to keyboards/maartenwut/wasdat/keymaps/default_iso/readme.md
diff --git a/keyboards/wasdat/keymaps/konstantin/config.h b/keyboards/maartenwut/wasdat/keymaps/konstantin/config.h
similarity index 100%
rename from keyboards/wasdat/keymaps/konstantin/config.h
rename to keyboards/maartenwut/wasdat/keymaps/konstantin/config.h
diff --git a/keyboards/wasdat/keymaps/konstantin/keymap.c b/keyboards/maartenwut/wasdat/keymaps/konstantin/keymap.c
similarity index 100%
rename from keyboards/wasdat/keymaps/konstantin/keymap.c
rename to keyboards/maartenwut/wasdat/keymaps/konstantin/keymap.c
diff --git a/keyboards/wasdat/keymaps/konstantin/rules.mk b/keyboards/maartenwut/wasdat/keymaps/konstantin/rules.mk
similarity index 100%
rename from keyboards/wasdat/keymaps/konstantin/rules.mk
rename to keyboards/maartenwut/wasdat/keymaps/konstantin/rules.mk
diff --git a/keyboards/wasdat/matrix.c b/keyboards/maartenwut/wasdat/matrix.c
similarity index 100%
rename from keyboards/wasdat/matrix.c
rename to keyboards/maartenwut/wasdat/matrix.c
diff --git a/keyboards/wasdat/readme.md b/keyboards/maartenwut/wasdat/readme.md
similarity index 100%
rename from keyboards/wasdat/readme.md
rename to keyboards/maartenwut/wasdat/readme.md
diff --git a/keyboards/wasdat/rules.mk b/keyboards/maartenwut/wasdat/rules.mk
similarity index 100%
rename from keyboards/wasdat/rules.mk
rename to keyboards/maartenwut/wasdat/rules.mk
diff --git a/keyboards/wasdat/wasdat.c b/keyboards/maartenwut/wasdat/wasdat.c
similarity index 100%
rename from keyboards/wasdat/wasdat.c
rename to keyboards/maartenwut/wasdat/wasdat.c
diff --git a/keyboards/wasdat/wasdat.h b/keyboards/maartenwut/wasdat/wasdat.h
similarity index 100%
rename from keyboards/wasdat/wasdat.h
rename to keyboards/maartenwut/wasdat/wasdat.h