diff --git a/keyboards/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h
similarity index 100%
rename from keyboards/sixshooter/config.h
rename to keyboards/bpiphany/sixshooter/config.h
diff --git a/keyboards/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json
similarity index 100%
rename from keyboards/sixshooter/info.json
rename to keyboards/bpiphany/sixshooter/info.json
diff --git a/keyboards/sixshooter/keymaps/default/keymap.c b/keyboards/bpiphany/sixshooter/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/sixshooter/keymaps/default/keymap.c
rename to keyboards/bpiphany/sixshooter/keymaps/default/keymap.c
diff --git a/keyboards/sixshooter/keymaps/default/readme.md b/keyboards/bpiphany/sixshooter/keymaps/default/readme.md
similarity index 100%
rename from keyboards/sixshooter/keymaps/default/readme.md
rename to keyboards/bpiphany/sixshooter/keymaps/default/readme.md
diff --git a/keyboards/sixshooter/readme.md b/keyboards/bpiphany/sixshooter/readme.md
similarity index 51%
rename from keyboards/sixshooter/readme.md
rename to keyboards/bpiphany/sixshooter/readme.md
index 1fcf26a5109..f5d92600348 100644
--- a/keyboards/sixshooter/readme.md
+++ b/keyboards/bpiphany/sixshooter/readme.md
@@ -2,12 +2,12 @@
 
 A PCB for the CM Storm switch tester utilizing a Teensy 2.0 designed by Bpiphany. Because the PCB was designed with individual pins for each LED, there are custom keycodes (`SS_LON` and `SS_LOFF`) for turning on and off the backlight LEDs.
 
-Keyboard Maintainer: QMK Community\
-Hardware Supported: Six Shooter PCB, Teensy 2.0\
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Six Shooter PCB, Teensy 2.0  
 Hardware Availability: [GeekHack.org](https://geekhack.org/index.php?topic=70033.0)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make sixshooter:default
+    make bpiphany/sixshooter: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.
+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/sixshooter/rules.mk b/keyboards/bpiphany/sixshooter/rules.mk
similarity index 100%
rename from keyboards/sixshooter/rules.mk
rename to keyboards/bpiphany/sixshooter/rules.mk
diff --git a/keyboards/sixshooter/sixshooter.c b/keyboards/bpiphany/sixshooter/sixshooter.c
similarity index 100%
rename from keyboards/sixshooter/sixshooter.c
rename to keyboards/bpiphany/sixshooter/sixshooter.c
diff --git a/keyboards/sixshooter/sixshooter.h b/keyboards/bpiphany/sixshooter/sixshooter.h
similarity index 100%
rename from keyboards/sixshooter/sixshooter.h
rename to keyboards/bpiphany/sixshooter/sixshooter.h