qmk · tzarc · Apr 19, 2022 · Jan 4, 2022 · Jan 5, 2022 · Apr 19, 2022
diff --git a/keyboards/amj40/amj40.c → keyboards/amjkeyboard/amj40/amj40.c b/keyboards/amj40/amj40.c → keyboards/amjkeyboard/amj40/amj40.c
diff --git a/keyboards/amj40/amj40.h → keyboards/amjkeyboard/amj40/amj40.h b/keyboards/amj40/amj40.h → keyboards/amjkeyboard/amj40/amj40.h
diff --git a/keyboards/amj40/config.h → keyboards/amjkeyboard/amj40/config.h b/keyboards/amj40/config.h → 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 → keyboards/amjkeyboard/amj40/info.json b/keyboards/amj40/info.json → keyboards/amjkeyboard/amj40/info.json
diff --git a/keyboards/amj40/keymaps/default/keymap.c → ...mjkeyboard/amj40/keymaps/default/keymap.c b/keyboards/amj40/keymaps/default/keymap.c → ...mjkeyboard/amj40/keymaps/default/keymap.c
diff --git a/keyboards/amj40/keymaps/default/readme.md → ...jkeyboard/amj40/keymaps/default/readme.md b/keyboards/amj40/keymaps/default/readme.md → ...jkeyboard/amj40/keymaps/default/readme.md
diff --git a/...amj40/keymaps/default_625u_space/keymap.c → ...amj40/keymaps/default_625u_space/keymap.c b/...amj40/keymaps/default_625u_space/keymap.c → ...amj40/keymaps/default_625u_space/keymap.c
diff --git a/...keymaps/default_ortho_275u_space/keymap.c → ...keymaps/default_ortho_275u_space/keymap.c b/...keymaps/default_ortho_275u_space/keymap.c → ...keymaps/default_ortho_275u_space/keymap.c
diff --git a/...keymaps/default_ortho_600u_space/keymap.c → ...keymaps/default_ortho_600u_space/keymap.c b/...keymaps/default_ortho_600u_space/keymap.c → ...keymaps/default_ortho_600u_space/keymap.c
diff --git a/keyboards/amj40/keymaps/fabian/keymap.c → ...amjkeyboard/amj40/keymaps/fabian/keymap.c b/keyboards/amj40/keymaps/fabian/keymap.c → ...amjkeyboard/amj40/keymaps/fabian/keymap.c
diff --git a/keyboards/amj40/keymaps/fabian/rules.mk → ...amjkeyboard/amj40/keymaps/fabian/rules.mk b/keyboards/amj40/keymaps/fabian/rules.mk → ...amjkeyboard/amj40/keymaps/fabian/rules.mk
diff --git a/...ards/amj40/keymaps/jetpacktuxedo/config.h → ...oard/amj40/keymaps/jetpacktuxedo/config.h b/...ards/amj40/keymaps/jetpacktuxedo/config.h → ...oard/amj40/keymaps/jetpacktuxedo/config.h
diff --git a/...ards/amj40/keymaps/jetpacktuxedo/keymap.c → ...oard/amj40/keymaps/jetpacktuxedo/keymap.c b/...ards/amj40/keymaps/jetpacktuxedo/keymap.c → ...oard/amj40/keymaps/jetpacktuxedo/keymap.c
diff --git a/...rds/amj40/keymaps/jetpacktuxedo/readme.md → ...ard/amj40/keymaps/jetpacktuxedo/readme.md b/...rds/amj40/keymaps/jetpacktuxedo/readme.md → ...ard/amj40/keymaps/jetpacktuxedo/readme.md
diff --git a/...ards/amj40/keymaps/jetpacktuxedo/rules.mk → ...oard/amj40/keymaps/jetpacktuxedo/rules.mk b/...ards/amj40/keymaps/jetpacktuxedo/rules.mk → ...oard/amj40/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/amj40/keymaps/myee/build.sh → ...s/amjkeyboard/amj40/keymaps/myee/build.sh b/keyboards/amj40/keymaps/myee/build.sh → ...s/amjkeyboard/amj40/keymaps/myee/build.sh
diff --git a/keyboards/amj40/keymaps/myee/config.h → ...s/amjkeyboard/amj40/keymaps/myee/config.h b/keyboards/amj40/keymaps/myee/config.h → ...s/amjkeyboard/amj40/keymaps/myee/config.h
diff --git a/keyboards/amj40/keymaps/myee/keymap.c → ...s/amjkeyboard/amj40/keymaps/myee/keymap.c b/keyboards/amj40/keymaps/myee/keymap.c → ...s/amjkeyboard/amj40/keymaps/myee/keymap.c
diff --git a/keyboards/amj40/keymaps/myee/readme.md → .../amjkeyboard/amj40/keymaps/myee/readme.md b/keyboards/amj40/keymaps/myee/readme.md → .../amjkeyboard/amj40/keymaps/myee/readme.md
diff --git a/keyboards/amj40/keymaps/myee/rules.mk → ...s/amjkeyboard/amj40/keymaps/myee/rules.mk b/keyboards/amj40/keymaps/myee/rules.mk → ...s/amjkeyboard/amj40/keymaps/myee/rules.mk
diff --git a/keyboards/amj40/keymaps/myee/updatemerge.sh → ...eyboard/amj40/keymaps/myee/updatemerge.sh b/keyboards/amj40/keymaps/myee/updatemerge.sh → ...eyboard/amj40/keymaps/myee/updatemerge.sh
diff --git a/keyboards/amj40/readme.md → keyboards/amjkeyboard/amj40/readme.md b/keyboards/amj40/readme.md → 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 → keyboards/amjkeyboard/amj40/rules.mk b/keyboards/amj40/rules.mk → keyboards/amjkeyboard/amj40/rules.mk
diff --git a/keyboards/amj60/amj60.c → keyboards/amjkeyboard/amj60/amj60.c b/keyboards/amj60/amj60.c → keyboards/amjkeyboard/amj60/amj60.c
diff --git a/keyboards/amj60/amj60.h → keyboards/amjkeyboard/amj60/amj60.h b/keyboards/amj60/amj60.h → keyboards/amjkeyboard/amj60/amj60.h
diff --git a/keyboards/amj60/config.h → keyboards/amjkeyboard/amj60/config.h b/keyboards/amj60/config.h → 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 → keyboards/amjkeyboard/amj60/info.json b/keyboards/amj60/info.json → keyboards/amjkeyboard/amj60/info.json
diff --git a/keyboards/amj60/keymaps/default/keymap.c → ...mjkeyboard/amj60/keymaps/default/keymap.c b/keyboards/amj60/keymaps/default/keymap.c → ...mjkeyboard/amj60/keymaps/default/keymap.c
diff --git a/keyboards/amj60/readme.md → keyboards/amjkeyboard/amj60/readme.md b/keyboards/amj60/readme.md → 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 → keyboards/amjkeyboard/amj60/rules.mk b/keyboards/amj60/rules.mk → keyboards/amjkeyboard/amj60/rules.mk
diff --git 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 → keyboards/amjkeyboard/amj96/amj96.c b/keyboards/amj96/amj96.c → keyboards/amjkeyboard/amj96/amj96.c
diff --git a/keyboards/amj96/amj96.h → keyboards/amjkeyboard/amj96/amj96.h b/keyboards/amj96/amj96.h → keyboards/amjkeyboard/amj96/amj96.h
diff --git a/keyboards/amj96/config.h → keyboards/amjkeyboard/amj96/config.h b/keyboards/amj96/config.h → 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 → keyboards/amjkeyboard/amj96/info.json b/keyboards/amj96/info.json → keyboards/amjkeyboard/amj96/info.json
diff --git a/keyboards/amj96/keymaps/default/keymap.c → ...mjkeyboard/amj96/keymaps/default/keymap.c b/keyboards/amj96/keymaps/default/keymap.c → ...mjkeyboard/amj96/keymaps/default/keymap.c
diff --git a/keyboards/amj96/matrix.c → keyboards/amjkeyboard/amj96/matrix.c b/keyboards/amj96/matrix.c → keyboards/amjkeyboard/amj96/matrix.c
diff --git a/keyboards/amj96/readme.md → keyboards/amjkeyboard/amj96/readme.md b/keyboards/amj96/readme.md → 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 → keyboards/amjkeyboard/amj96/rules.mk b/keyboards/amj96/rules.mk → keyboards/amjkeyboard/amj96/rules.mk
diff --git a/keyboards/amjpad/amjpad.c → keyboards/amjkeyboard/amjpad/amjpad.c b/keyboards/amjpad/amjpad.c → keyboards/amjkeyboard/amjpad/amjpad.c
diff --git a/keyboards/amjpad/amjpad.h → keyboards/amjkeyboard/amjpad/amjpad.h b/keyboards/amjpad/amjpad.h → keyboards/amjkeyboard/amjpad/amjpad.h
diff --git a/keyboards/amjpad/config.h → keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjpad/config.h → 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 → keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjpad/info.json → keyboards/amjkeyboard/amjpad/info.json
diff --git a/keyboards/amjpad/keymaps/default/keymap.c → ...jkeyboard/amjpad/keymaps/default/keymap.c b/keyboards/amjpad/keymaps/default/keymap.c → ...jkeyboard/amjpad/keymaps/default/keymap.c
diff --git a/keyboards/amjpad/keymaps/max/keymap.c → ...s/amjkeyboard/amjpad/keymaps/max/keymap.c b/keyboards/amjpad/keymaps/max/keymap.c → ...s/amjkeyboard/amjpad/keymaps/max/keymap.c
diff --git a/keyboards/amjpad/keymaps/ortho_left/keymap.c → ...yboard/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjpad/keymaps/ortho_left/keymap.c → ...yboard/amjpad/keymaps/ortho_left/keymap.c
diff --git a/...oards/amjpad/keymaps/ortho_right/keymap.c → ...board/amjpad/keymaps/ortho_right/keymap.c b/...oards/amjpad/keymaps/ortho_right/keymap.c → ...board/amjpad/keymaps/ortho_right/keymap.c
diff --git a/keyboards/amjpad/readme.md → keyboards/amjkeyboard/amjpad/readme.md b/keyboards/amjpad/readme.md → 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 → keyboards/amjkeyboard/amjpad/rules.mk b/keyboards/amjpad/rules.mk → keyboards/amjkeyboard/amjpad/rules.mk