49 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/amj40/amj40.c b/keyboards/amjkeyboard/amj40/amj40.c
index f0f3121c6a..f0f3121c6a 100755
--- a/keyboards/amj40/amj40.c
+++ b/keyboards/amjkeyboard/amj40/amj40.c
diff --git a/keyboards/amj40/amj40.h b/keyboards/amjkeyboard/amj40/amj40.h
index 14ea383811..14ea383811 100755
--- a/keyboards/amj40/amj40.h
+++ b/keyboards/amjkeyboard/amj40/amj40.h
diff --git a/keyboards/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h
index 71a8d34413..2f472eac01 100755
--- a/keyboards/amj40/config.h
+++ b/keyboards/amjkeyboard/amj40/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6072
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Han Chen
diff --git a/keyboards/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json
index 575fd1b034..575fd1b034 100644
--- a/keyboards/amj40/info.json
+++ b/keyboards/amjkeyboard/amj40/info.json
diff --git a/keyboards/amj40/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
index 658b4b3c55..658b4b3c55 100755
--- a/keyboards/amj40/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default/keymap.c
diff --git a/keyboards/amj40/keymaps/default/readme.md b/keyboards/amjkeyboard/amj40/keymaps/default/readme.md
index 2659292ae5..2659292ae5 100755
--- a/keyboards/amj40/keymaps/default/readme.md
+++ b/keyboards/amjkeyboard/amj40/keymaps/default/readme.md
diff --git a/keyboards/amj40/keymaps/default_625u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
index f5b33ad84f..f5b33ad84f 100644
--- a/keyboards/amj40/keymaps/default_625u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_625u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
index fe99884696..fe99884696 100644
--- a/keyboards/amj40/keymaps/default_ortho_275u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_275u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
index 527390cd1e..527390cd1e 100644
--- a/keyboards/amj40/keymaps/default_ortho_600u_space/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/default_ortho_600u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/fabian/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
index a35337a4e2..a35337a4e2 100755
--- a/keyboards/amj40/keymaps/fabian/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/fabian/keymap.c
diff --git a/keyboards/amj40/keymaps/fabian/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
index 59a2cb09a8..59a2cb09a8 100644
--- a/keyboards/amj40/keymaps/fabian/rules.mk
+++ b/keyboards/amjkeyboard/amj40/keymaps/fabian/rules.mk
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/config.h b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
index 7311833201..7311833201 100644
--- a/keyboards/amj40/keymaps/jetpacktuxedo/config.h
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/config.h
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
index caf6700bc3..caf6700bc3 100755
--- a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/keymap.c
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/readme.md b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
index 64ae16c7eb..64ae16c7eb 100755
--- a/keyboards/amj40/keymaps/jetpacktuxedo/readme.md
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
index 780d48a438..780d48a438 100644
--- a/keyboards/amj40/keymaps/jetpacktuxedo/rules.mk
+++ b/keyboards/amjkeyboard/amj40/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/amj40/keymaps/myee/build.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/build.sh
index 6b4b4568f5..6b4b4568f5 100644
--- a/keyboards/amj40/keymaps/myee/build.sh
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/build.sh
diff --git a/keyboards/amj40/keymaps/myee/config.h b/keyboards/amjkeyboard/amj40/keymaps/myee/config.h
index 8e6c4dfa43..8e6c4dfa43 100644
--- a/keyboards/amj40/keymaps/myee/config.h
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/config.h
diff --git a/keyboards/amj40/keymaps/myee/keymap.c b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
index ec8cdd87db..ec8cdd87db 100644
--- a/keyboards/amj40/keymaps/myee/keymap.c
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/keymap.c
diff --git a/keyboards/amj40/keymaps/myee/readme.md b/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
index 2659292ae5..2659292ae5 100644
--- a/keyboards/amj40/keymaps/myee/readme.md
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/readme.md
diff --git a/keyboards/amj40/keymaps/myee/rules.mk b/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
index b8cc8b42c7..b8cc8b42c7 100644
--- a/keyboards/amj40/keymaps/myee/rules.mk
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/rules.mk
diff --git a/keyboards/amj40/keymaps/myee/updatemerge.sh b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
index da5457e195..da5457e195 100644
--- a/keyboards/amj40/keymaps/myee/updatemerge.sh
+++ b/keyboards/amjkeyboard/amj40/keymaps/myee/updatemerge.sh
diff --git a/keyboards/amj40/readme.md b/keyboards/amjkeyboard/amj40/readme.md
index 1d7316fcf5..f557b9df49 100755
--- a/keyboards/amj40/readme.md
+++ b/keyboards/amjkeyboard/amj40/readme.md
@@ -12,11 +12,11 @@ DIY/Assembled compact 40% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amj40:default
+    make amjkeyboard/amj40:default
 
 Flashing example for this keyboard:
 
-    make amj40:default:flash
+    make amjkeyboard/amj40:default:flash
 
 To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).
 
diff --git a/keyboards/amj40/rules.mk b/keyboards/amjkeyboard/amj40/rules.mk
index b27013f863..b27013f863 100755
--- a/keyboards/amj40/rules.mk
+++ b/keyboards/amjkeyboard/amj40/rules.mk
diff --git a/keyboards/amj60/amj60.c b/keyboards/amjkeyboard/amj60/amj60.c
index af0539a679..af0539a679 100644
--- a/keyboards/amj60/amj60.c
+++ b/keyboards/amjkeyboard/amj60/amj60.c
diff --git a/keyboards/amj60/amj60.h b/keyboards/amjkeyboard/amj60/amj60.h
index feda680030..feda680030 100644
--- a/keyboards/amj60/amj60.h
+++ b/keyboards/amjkeyboard/amj60/amj60.h
diff --git a/keyboards/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h
index 1c25e4fea0..4e894a45fc 100644
--- a/keyboards/amj60/config.h
+++ b/keyboards/amjkeyboard/amj60/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6066
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Han Chen
diff --git a/keyboards/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json
index 2c1781738e..2c1781738e 100644
--- a/keyboards/amj60/info.json
+++ b/keyboards/amjkeyboard/amj60/info.json
diff --git a/keyboards/amj60/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj60/keymaps/default/keymap.c
index 6a0a394f54..6a0a394f54 100644
--- a/keyboards/amj60/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj60/keymaps/default/keymap.c
diff --git a/keyboards/amj60/readme.md b/keyboards/amjkeyboard/amj60/readme.md
index 50cf3cfcb2..8f276bd89f 100644
--- a/keyboards/amj60/readme.md
+++ b/keyboards/amjkeyboard/amj60/readme.md
@@ -11,11 +11,11 @@ A 60% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amj60:default
+    make amjkeyboard/amj60:default
 
 Flashing example for this keyboard:
 
-    make amj60:default:flash
+    make amjkeyboard/amj60:default:flash
 
 To reset the board into bootloader mode, tap the Reset switch mounted on the bottom side of the PCB.
 
diff --git a/keyboards/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk
index 602667e948..602667e948 100644
--- a/keyboards/amj60/rules.mk
+++ b/keyboards/amjkeyboard/amj60/rules.mk
diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h
index 1f8a930a6a..cc84524b0b 100644
--- a/keyboards/amjkeyboard/amj66/config.h
+++ b/keyboards/amjkeyboard/amj66/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0xBD66
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    AMJKeyboard
diff --git a/keyboards/amj96/amj96.c b/keyboards/amjkeyboard/amj96/amj96.c
index 65fca6f12a..65fca6f12a 100644
--- a/keyboards/amj96/amj96.c
+++ b/keyboards/amjkeyboard/amj96/amj96.c
diff --git a/keyboards/amj96/amj96.h b/keyboards/amjkeyboard/amj96/amj96.h
index bd4e688360..bd4e688360 100644
--- a/keyboards/amj96/amj96.h
+++ b/keyboards/amjkeyboard/amj96/amj96.h
diff --git a/keyboards/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index f5b26220b7..67b3699047 100644
--- a/keyboards/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6074
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Han Chen
diff --git a/keyboards/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index b2aac215c0..b2aac215c0 100644
--- a/keyboards/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
diff --git a/keyboards/amj96/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
index baa4bef9dc..baa4bef9dc 100644
--- a/keyboards/amj96/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj96/keymaps/default/keymap.c
diff --git a/keyboards/amj96/matrix.c b/keyboards/amjkeyboard/amj96/matrix.c
index 2999c6241b..2999c6241b 100644
--- a/keyboards/amj96/matrix.c
+++ b/keyboards/amjkeyboard/amj96/matrix.c
diff --git a/keyboards/amj96/readme.md b/keyboards/amjkeyboard/amj96/readme.md
index 8cd4ea94a1..0941b6f3e1 100644
--- a/keyboards/amj96/readme.md
+++ b/keyboards/amjkeyboard/amj96/readme.md
@@ -8,11 +8,11 @@ The AMD96 is a 96 key custom keyboard with anodized aluminum case, twin usb port
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amj96:default
+    make amjkeyboard/amj96:default
 
 Flashing example for this keyboard:
 
-    make amj96:default:flash
+    make amjkeyboard/amj96:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk
index 9e9f03f764..9e9f03f764 100644
--- a/keyboards/amj96/rules.mk
+++ b/keyboards/amjkeyboard/amj96/rules.mk
diff --git a/keyboards/amjpad/amjpad.c b/keyboards/amjkeyboard/amjpad/amjpad.c
index 83cdedf688..83cdedf688 100644
--- a/keyboards/amjpad/amjpad.c
+++ b/keyboards/amjkeyboard/amjpad/amjpad.c
diff --git a/keyboards/amjpad/amjpad.h b/keyboards/amjkeyboard/amjpad/amjpad.h
index 976a7ab041..976a7ab041 100644
--- a/keyboards/amjpad/amjpad.h
+++ b/keyboards/amjkeyboard/amjpad/amjpad.h
diff --git a/keyboards/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index dd8ed34e47..fe621b7bf3 100644
--- a/keyboards/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x00D8 //A+M+J
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0003
 #define MANUFACTURER    AMJ
diff --git a/keyboards/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 76147716d2..76147716d2 100644
--- a/keyboards/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
diff --git a/keyboards/amjpad/keymaps/default/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
index 9df4317bb0..9df4317bb0 100644
--- a/keyboards/amjpad/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/default/keymap.c
diff --git a/keyboards/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
index 7bfaed5999..7bfaed5999 100644
--- a/keyboards/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
diff --git a/keyboards/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
index 815ac2a681..815ac2a681 100644
--- a/keyboards/amjpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
diff --git a/keyboards/amjpad/keymaps/ortho_right/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
index cbb81a2eab..cbb81a2eab 100644
--- a/keyboards/amjpad/keymaps/ortho_right/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
diff --git a/keyboards/amjpad/readme.md b/keyboards/amjkeyboard/amjpad/readme.md
index c069af25ad..98af32edef 100644
--- a/keyboards/amjpad/readme.md
+++ b/keyboards/amjkeyboard/amjpad/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=83546.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make amjpad:default
+    make amjkeyboard/amjpad:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/amjpad/rules.mk b/keyboards/amjkeyboard/amjpad/rules.mk
index c56fff39b3..c56fff39b3 100644
--- a/keyboards/amjpad/rules.mk
+++ b/keyboards/amjkeyboard/amjpad/rules.mk