diff --git a/keyboards/ca66/ca66.c b/keyboards/playkbtw/ca66/ca66.c
similarity index 100%
rename from keyboards/ca66/ca66.c
rename to keyboards/playkbtw/ca66/ca66.c
diff --git a/keyboards/ca66/ca66.h b/keyboards/playkbtw/ca66/ca66.h
similarity index 100%
rename from keyboards/ca66/ca66.h
rename to keyboards/playkbtw/ca66/ca66.h
diff --git a/keyboards/ca66/config.h b/keyboards/playkbtw/ca66/config.h
similarity index 100%
rename from keyboards/ca66/config.h
rename to keyboards/playkbtw/ca66/config.h
diff --git a/keyboards/ca66/info.json b/keyboards/playkbtw/ca66/info.json
similarity index 100%
rename from keyboards/ca66/info.json
rename to keyboards/playkbtw/ca66/info.json
diff --git a/keyboards/ca66/keymaps/default/keymap.c b/keyboards/playkbtw/ca66/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ca66/keymaps/default/keymap.c
rename to keyboards/playkbtw/ca66/keymaps/default/keymap.c
diff --git a/keyboards/ca66/keymaps/kelorean/keymap.c b/keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
similarity index 100%
rename from keyboards/ca66/keymaps/kelorean/keymap.c
rename to keyboards/playkbtw/ca66/keymaps/kelorean/keymap.c
diff --git a/keyboards/ca66/keymaps/kelorean/layers.json b/keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
similarity index 100%
rename from keyboards/ca66/keymaps/kelorean/layers.json
rename to keyboards/playkbtw/ca66/keymaps/kelorean/layers.json
diff --git a/keyboards/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
similarity index 100%
rename from keyboards/ca66/keymaps/olivia/keymap.c
rename to keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
diff --git a/keyboards/ca66/readme.md b/keyboards/playkbtw/ca66/readme.md
similarity index 61%
rename from keyboards/ca66/readme.md
rename to keyboards/playkbtw/ca66/readme.md
index f8464fdd1..74f060604 100644
--- a/keyboards/ca66/readme.md
+++ b/keyboards/playkbtw/ca66/readme.md
@@ -3,11 +3,13 @@ CA66
 
 Custom 65%
 
-Keyboard Maintainer: QMK Community
-Hardware Supported: CA66
+Keyboard Maintainer: QMK Community   
+Hardware Supported: CA66   
+Hardware Availability: [Play Keyboard](http://playkeyboard.qdm.com.tw/)
+
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ca66:default
+    make playkbtw/ca66:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/ca66/rules.mk b/keyboards/playkbtw/ca66/rules.mk
similarity index 100%
rename from keyboards/ca66/rules.mk
rename to keyboards/playkbtw/ca66/rules.mk
diff --git a/keyboards/pk60/config.h b/keyboards/playkbtw/pk60/config.h
similarity index 100%
rename from keyboards/pk60/config.h
rename to keyboards/playkbtw/pk60/config.h
diff --git a/keyboards/pk60/info.json b/keyboards/playkbtw/pk60/info.json
similarity index 100%
rename from keyboards/pk60/info.json
rename to keyboards/playkbtw/pk60/info.json
diff --git a/keyboards/pk60/keymaps/default/keymap.c b/keyboards/playkbtw/pk60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pk60/keymaps/default/keymap.c
rename to keyboards/playkbtw/pk60/keymaps/default/keymap.c
diff --git a/keyboards/pk60/keymaps/default/readme.md b/keyboards/playkbtw/pk60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pk60/keymaps/default/readme.md
rename to keyboards/playkbtw/pk60/keymaps/default/readme.md
diff --git a/keyboards/pk60/pk60.c b/keyboards/playkbtw/pk60/pk60.c
similarity index 100%
rename from keyboards/pk60/pk60.c
rename to keyboards/playkbtw/pk60/pk60.c
diff --git a/keyboards/pk60/pk60.h b/keyboards/playkbtw/pk60/pk60.h
similarity index 100%
rename from keyboards/pk60/pk60.h
rename to keyboards/playkbtw/pk60/pk60.h
diff --git a/keyboards/pk60/readme.md b/keyboards/playkbtw/pk60/readme.md
similarity index 80%
rename from keyboards/pk60/readme.md
rename to keyboards/playkbtw/pk60/readme.md
index 53d57272b..8b14d4021 100644
--- a/keyboards/pk60/readme.md
+++ b/keyboards/playkbtw/pk60/readme.md
@@ -10,4 +10,7 @@ Keyboard Maintainer: [Barry Huang](https://github.com/yj7272098)
 Hardware Supported: Play Keyboard60  
 Hardware Availability: [Play Keyboard](http://playkeyboard.qdm.com.tw/)
 
-Powered by QMK Firmware.
\ No newline at end of file
+Make example for this keyboard (after setting up your build environment):
+
+    make playkbtw/pk60:default
+
diff --git a/keyboards/pk60/rules.mk b/keyboards/playkbtw/pk60/rules.mk
similarity index 100%
rename from keyboards/pk60/rules.mk
rename to keyboards/playkbtw/pk60/rules.mk
diff --git a/keyboards/playkbtw/readme.md b/keyboards/playkbtw/readme.md
new file mode 100644
index 000000000..adb1ca8c8
--- /dev/null
+++ b/keyboards/playkbtw/readme.md
@@ -0,0 +1,5 @@
+# PlayKeyboardTW
+
+[PlayKeyboardTW]((http://playkeyboard.qdm.com.tw/)) is a Taiwan based company responsible for keyboards such as the CA66 and the PK60. 
+
+This directory is a collection of all their keyboards.