diff --git a/keyboards/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
similarity index 100%
rename from keyboards/frosty_flake/config.h
rename to keyboards/bpiphany/frosty_flake/config.h
diff --git a/keyboards/frosty_flake/frosty_flake.c b/keyboards/bpiphany/frosty_flake/frosty_flake.c
similarity index 100%
rename from keyboards/frosty_flake/frosty_flake.c
rename to keyboards/bpiphany/frosty_flake/frosty_flake.c
diff --git a/keyboards/frosty_flake/frosty_flake.h b/keyboards/bpiphany/frosty_flake/frosty_flake.h
similarity index 100%
rename from keyboards/frosty_flake/frosty_flake.h
rename to keyboards/bpiphany/frosty_flake/frosty_flake.h
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/config.h b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
similarity index 100%
rename from keyboards/frosty_flake/keymaps/QFR_JM/config.h
rename to keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
similarity index 100%
rename from keyboards/frosty_flake/keymaps/QFR_JM/keymap.c
rename to keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
similarity index 100%
rename from keyboards/frosty_flake/keymaps/QFR_JM/readme.md
rename to keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
similarity index 100%
rename from keyboards/frosty_flake/keymaps/QFR_JM/rules.mk
rename to keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
diff --git a/keyboards/frosty_flake/keymaps/default/config.h b/keyboards/bpiphany/frosty_flake/keymaps/default/config.h
similarity index 100%
rename from keyboards/frosty_flake/keymaps/default/config.h
rename to keyboards/bpiphany/frosty_flake/keymaps/default/config.h
diff --git a/keyboards/frosty_flake/keymaps/default/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/frosty_flake/keymaps/default/keymap.c
rename to keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/default/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/default/readme.md
similarity index 100%
rename from keyboards/frosty_flake/keymaps/default/readme.md
rename to keyboards/bpiphany/frosty_flake/keymaps/default/readme.md
diff --git a/keyboards/frosty_flake/keymaps/default/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/frosty_flake/keymaps/default/rules.mk
rename to keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk
diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
similarity index 100%
rename from keyboards/frosty_flake/keymaps/nikchi/config.h
rename to keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
similarity index 100%
rename from keyboards/frosty_flake/keymaps/nikchi/keymap.c
rename to keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/nikchi/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
similarity index 100%
rename from keyboards/frosty_flake/keymaps/nikchi/readme.md
rename to keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
diff --git a/keyboards/frosty_flake/keymaps/nikchi/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
similarity index 100%
rename from keyboards/frosty_flake/keymaps/nikchi/rules.mk
rename to keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
diff --git a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
similarity index 100%
rename from keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md
rename to keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
diff --git a/keyboards/frosty_flake/keymaps/tkl/config.h b/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h
similarity index 100%
rename from keyboards/frosty_flake/keymaps/tkl/config.h
rename to keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h
diff --git a/keyboards/frosty_flake/keymaps/tkl/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
similarity index 100%
rename from keyboards/frosty_flake/keymaps/tkl/keymap.c
rename to keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/tkl/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md
similarity index 100%
rename from keyboards/frosty_flake/keymaps/tkl/readme.md
rename to keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md
diff --git a/keyboards/frosty_flake/keymaps/tkl/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/tkl/rules.mk
similarity index 100%
rename from keyboards/frosty_flake/keymaps/tkl/rules.mk
rename to keyboards/bpiphany/frosty_flake/keymaps/tkl/rules.mk
diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/bpiphany/frosty_flake/matrix.c
similarity index 94%
rename from keyboards/frosty_flake/matrix.c
rename to keyboards/bpiphany/frosty_flake/matrix.c
index cde7f63b95..480e3455ba 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/bpiphany/frosty_flake/matrix.c
@@ -32,6 +32,24 @@ static uint8_t debouncing = DEBOUNCING_DELAY;
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
 static matrix_row_t scan_col(void) {
     return (
         (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) |
diff --git a/keyboards/frosty_flake/readme.md b/keyboards/bpiphany/frosty_flake/readme.md
similarity index 74%
rename from keyboards/frosty_flake/readme.md
rename to keyboards/bpiphany/frosty_flake/readme.md
index 822377a719..0d6a4779f6 100644
--- a/keyboards/frosty_flake/readme.md
+++ b/keyboards/bpiphany/frosty_flake/readme.md
@@ -25,22 +25,19 @@ Make example for this keyboard (after setting up your build environment):
 104 key default layout:
 
 ```
-make frosty_flake:default
+make bpiphany/frosty_flake:default
 ```
 
 To directly flash the frosty_flake after compiling use
 
 ```
-make frosty_flake:default:dfu
+make bpiphany/frosty_flake:default:dfu
 ```
 
 87 key tkl layout:
 
 ```
-make frosty_flake:tkl:dfu
+make bpiphany/frosty_flake:tkl:dfu
 ```
 
-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.
+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/frosty_flake/rules.mk b/keyboards/bpiphany/frosty_flake/rules.mk
similarity index 100%
rename from keyboards/frosty_flake/rules.mk
rename to keyboards/bpiphany/frosty_flake/rules.mk
diff --git a/keyboards/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
similarity index 100%
rename from keyboards/kitten_paw/config.h
rename to keyboards/bpiphany/kitten_paw/config.h
diff --git a/keyboards/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
similarity index 100%
rename from keyboards/kitten_paw/info.json
rename to keyboards/bpiphany/kitten_paw/info.json
diff --git a/keyboards/kitten_paw/keymaps/default/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kitten_paw/keymaps/default/keymap.c
rename to keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/config.h b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/config.h
similarity index 100%
rename from keyboards/kitten_paw/keymaps/ickerwx/config.h
rename to keyboards/bpiphany/kitten_paw/keymaps/ickerwx/config.h
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
similarity index 100%
rename from keyboards/kitten_paw/keymaps/ickerwx/keymap.c
rename to keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
diff --git a/keyboards/kitten_paw/keymaps/ickerwx/readme.md b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/readme.md
similarity index 100%
rename from keyboards/kitten_paw/keymaps/ickerwx/readme.md
rename to keyboards/bpiphany/kitten_paw/keymaps/ickerwx/readme.md
diff --git a/keyboards/kitten_paw/kitten_paw.c b/keyboards/bpiphany/kitten_paw/kitten_paw.c
similarity index 100%
rename from keyboards/kitten_paw/kitten_paw.c
rename to keyboards/bpiphany/kitten_paw/kitten_paw.c
diff --git a/keyboards/kitten_paw/kitten_paw.h b/keyboards/bpiphany/kitten_paw/kitten_paw.h
similarity index 100%
rename from keyboards/kitten_paw/kitten_paw.h
rename to keyboards/bpiphany/kitten_paw/kitten_paw.h
diff --git a/keyboards/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c
similarity index 94%
rename from keyboards/kitten_paw/matrix.c
rename to keyboards/bpiphany/kitten_paw/matrix.c
index d436ad56ca..6fdbfffd62 100644
--- a/keyboards/kitten_paw/matrix.c
+++ b/keyboards/bpiphany/kitten_paw/matrix.c
@@ -35,6 +35,24 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 static uint8_t read_rows(void);
 static void select_col(uint8_t col);
 
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
 inline uint8_t matrix_rows(void) {
   return MATRIX_ROWS;
 }
@@ -48,7 +66,7 @@ inline uint8_t matrix_cols(void) {
  * col: 0    1    2    3    4    5    6    7
  * pin: PC7  PD5  PD3  PD1  PC2  PD6  PD4  PD2
  *
- * Rrr pin configuration 
+ * Rrr pin configuration
  *
  * These rrrs uses one 74HC154 4 to 16 bit demultiplexer (low
  * active), together with 2 rrrs driven directly from the micro
@@ -84,7 +102,7 @@ uint8_t matrix_scan(void) {
       }
     }
   }
-  
+
   if (debouncing) {
     if (--debouncing) {
       _delay_ms(1);
diff --git a/keyboards/kitten_paw/readme.md b/keyboards/bpiphany/kitten_paw/readme.md
similarity index 65%
rename from keyboards/kitten_paw/readme.md
rename to keyboards/bpiphany/kitten_paw/readme.md
index d5fa9aa8b2..15737a3a9b 100644
--- a/keyboards/kitten_paw/readme.md
+++ b/keyboards/bpiphany/kitten_paw/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=46700.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kitten_paw:default
+    make bpiphany/kitten_paw: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.
+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/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk
similarity index 100%
rename from keyboards/kitten_paw/rules.mk
rename to keyboards/bpiphany/kitten_paw/rules.mk
diff --git a/keyboards/bpiphany/pegasushoof/README.md b/keyboards/bpiphany/pegasushoof/README.md
new file mode 100644
index 0000000000..1b3d631901
--- /dev/null
+++ b/keyboards/bpiphany/pegasushoof/README.md
@@ -0,0 +1,12 @@
+Pegasus Hoof Controller
+===
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Pegasus Hoof  
+Hardware Availability: https://1upkeyboards.com/filco-pegasus-hoof-controller.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bpiphany/pegasus_hoof:default
+
+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/pegasushoof/config.h b/keyboards/bpiphany/pegasushoof/config.h
similarity index 100%
rename from keyboards/pegasushoof/config.h
rename to keyboards/bpiphany/pegasushoof/config.h
diff --git a/keyboards/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
similarity index 100%
rename from keyboards/pegasushoof/keymaps/blowrak/keymap.c
rename to keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c
diff --git a/keyboards/pegasushoof/keymaps/blowrak/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
similarity index 100%
rename from keyboards/pegasushoof/keymaps/blowrak/rules.mk
rename to keyboards/bpiphany/pegasushoof/keymaps/blowrak/rules.mk
diff --git a/keyboards/pegasushoof/keymaps/citadel/config.h b/keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
similarity index 100%
rename from keyboards/pegasushoof/keymaps/citadel/config.h
rename to keyboards/bpiphany/pegasushoof/keymaps/citadel/config.h
diff --git a/keyboards/pegasushoof/keymaps/citadel/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
similarity index 100%
rename from keyboards/pegasushoof/keymaps/citadel/keymap.c
rename to keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c
diff --git a/keyboards/pegasushoof/keymaps/citadel/readme.md b/keyboards/bpiphany/pegasushoof/keymaps/citadel/readme.md
similarity index 100%
rename from keyboards/pegasushoof/keymaps/citadel/readme.md
rename to keyboards/bpiphany/pegasushoof/keymaps/citadel/readme.md
diff --git a/keyboards/pegasushoof/keymaps/citadel/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/citadel/rules.mk
similarity index 100%
rename from keyboards/pegasushoof/keymaps/citadel/rules.mk
rename to keyboards/bpiphany/pegasushoof/keymaps/citadel/rules.mk
diff --git a/keyboards/pegasushoof/keymaps/default/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pegasushoof/keymaps/default/keymap.c
rename to keyboards/bpiphany/pegasushoof/keymaps/default/keymap.c
diff --git a/keyboards/pegasushoof/keymaps/default/rules.mk b/keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/pegasushoof/keymaps/default/rules.mk
rename to keyboards/bpiphany/pegasushoof/keymaps/default/rules.mk
diff --git a/keyboards/pegasushoof/matrix.c b/keyboards/bpiphany/pegasushoof/matrix.c
similarity index 94%
rename from keyboards/pegasushoof/matrix.c
rename to keyboards/bpiphany/pegasushoof/matrix.c
index d2a74b8d72..127433875d 100644
--- a/keyboards/pegasushoof/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/matrix.c
@@ -33,6 +33,24 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 static matrix_row_t read_cols(void);
 static void select_row(uint8_t col);
 
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
 inline uint8_t matrix_rows(void)
 {
 	return MATRIX_ROWS;
diff --git a/keyboards/pegasushoof/pegasushoof.c b/keyboards/bpiphany/pegasushoof/pegasushoof.c
similarity index 100%
rename from keyboards/pegasushoof/pegasushoof.c
rename to keyboards/bpiphany/pegasushoof/pegasushoof.c
diff --git a/keyboards/pegasushoof/pegasushoof.h b/keyboards/bpiphany/pegasushoof/pegasushoof.h
similarity index 100%
rename from keyboards/pegasushoof/pegasushoof.h
rename to keyboards/bpiphany/pegasushoof/pegasushoof.h
diff --git a/keyboards/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk
similarity index 100%
rename from keyboards/pegasushoof/rules.mk
rename to keyboards/bpiphany/pegasushoof/rules.mk
diff --git a/keyboards/bpiphany/readme.md b/keyboards/bpiphany/readme.md
new file mode 100644
index 0000000000..992b7c908d
--- /dev/null
+++ b/keyboards/bpiphany/readme.md
@@ -0,0 +1,6 @@
+# Bathroom Epiphanies 
+
+bpiphany is the owner and designer of [Bathroom Epiphanies](http://bathroomepiphanies.com/).
+
+He is based in Sweden and creates several controller boards as a swappable component for some off the shelf keyboards. 
+
diff --git a/keyboards/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
similarity index 100%
rename from keyboards/tiger_lily/config.h
rename to keyboards/bpiphany/tiger_lily/config.h
diff --git a/keyboards/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
similarity index 100%
rename from keyboards/tiger_lily/info.json
rename to keyboards/bpiphany/tiger_lily/info.json
diff --git a/keyboards/tiger_lily/keymaps/default/config.h b/keyboards/bpiphany/tiger_lily/keymaps/default/config.h
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default/config.h
rename to keyboards/bpiphany/tiger_lily/keymaps/default/config.h
diff --git a/keyboards/tiger_lily/keymaps/default/keymap.c b/keyboards/bpiphany/tiger_lily/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default/keymap.c
rename to keyboards/bpiphany/tiger_lily/keymaps/default/keymap.c
diff --git a/keyboards/tiger_lily/keymaps/default/readme.md b/keyboards/bpiphany/tiger_lily/keymaps/default/readme.md
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default/readme.md
rename to keyboards/bpiphany/tiger_lily/keymaps/default/readme.md
diff --git a/keyboards/tiger_lily/keymaps/default/rules.mk b/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default/rules.mk
rename to keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
diff --git a/keyboards/tiger_lily/keymaps/default_ansi/config.h b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/config.h
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default_ansi/config.h
rename to keyboards/bpiphany/tiger_lily/keymaps/default_ansi/config.h
diff --git a/keyboards/tiger_lily/keymaps/default_ansi/keymap.c b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/keymap.c
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default_ansi/keymap.c
rename to keyboards/bpiphany/tiger_lily/keymaps/default_ansi/keymap.c
diff --git a/keyboards/tiger_lily/keymaps/default_ansi/readme.md b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/readme.md
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default_ansi/readme.md
rename to keyboards/bpiphany/tiger_lily/keymaps/default_ansi/readme.md
diff --git a/keyboards/tiger_lily/keymaps/default_ansi/rules.mk b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
similarity index 100%
rename from keyboards/tiger_lily/keymaps/default_ansi/rules.mk
rename to keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
diff --git a/keyboards/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c
similarity index 94%
rename from keyboards/tiger_lily/matrix.c
rename to keyboards/bpiphany/tiger_lily/matrix.c
index d3a0d7ebd1..3b48f6b368 100644
--- a/keyboards/tiger_lily/matrix.c
+++ b/keyboards/bpiphany/tiger_lily/matrix.c
@@ -32,6 +32,24 @@ static uint8_t debouncing = DEBOUNCING_DELAY;
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
 static matrix_row_t scan_col(void) {
     return (
 		(PINC&(1<<2) ? 0 : ((matrix_row_t)1<<0)) | \
@@ -134,4 +152,4 @@ uint8_t matrix_key_count(void) {
     for (uint8_t row = 0; row < MATRIX_ROWS; row++)
         count += bitpop32(matrix[row]);
     return count;
-}
\ No newline at end of file
+}
diff --git a/keyboards/tiger_lily/readme.md b/keyboards/bpiphany/tiger_lily/readme.md
similarity index 72%
rename from keyboards/tiger_lily/readme.md
rename to keyboards/bpiphany/tiger_lily/readme.md
index 37073def51..1fcb6c3d6c 100644
--- a/keyboards/tiger_lily/readme.md
+++ b/keyboards/bpiphany/tiger_lily/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: https://geekhack.org/index.php?topic=46700.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tiger_lily:default
+    make bpiphany/tiger_lily: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.
+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/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk
similarity index 100%
rename from keyboards/tiger_lily/rules.mk
rename to keyboards/bpiphany/tiger_lily/rules.mk
diff --git a/keyboards/tiger_lily/tiger_lily.c b/keyboards/bpiphany/tiger_lily/tiger_lily.c
similarity index 100%
rename from keyboards/tiger_lily/tiger_lily.c
rename to keyboards/bpiphany/tiger_lily/tiger_lily.c
diff --git a/keyboards/tiger_lily/tiger_lily.h b/keyboards/bpiphany/tiger_lily/tiger_lily.h
similarity index 100%
rename from keyboards/tiger_lily/tiger_lily.h
rename to keyboards/bpiphany/tiger_lily/tiger_lily.h
diff --git a/keyboards/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
similarity index 100%
rename from keyboards/unloved_bastard/config.h
rename to keyboards/bpiphany/unloved_bastard/config.h
diff --git a/keyboards/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
similarity index 100%
rename from keyboards/unloved_bastard/info.json
rename to keyboards/bpiphany/unloved_bastard/info.json
diff --git a/keyboards/unloved_bastard/keymaps/default/config.h b/keyboards/bpiphany/unloved_bastard/keymaps/default/config.h
similarity index 100%
rename from keyboards/unloved_bastard/keymaps/default/config.h
rename to keyboards/bpiphany/unloved_bastard/keymaps/default/config.h
diff --git a/keyboards/unloved_bastard/keymaps/default/keymap.c b/keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/unloved_bastard/keymaps/default/keymap.c
rename to keyboards/bpiphany/unloved_bastard/keymaps/default/keymap.c
diff --git a/keyboards/unloved_bastard/keymaps/default/readme.md b/keyboards/bpiphany/unloved_bastard/keymaps/default/readme.md
similarity index 100%
rename from keyboards/unloved_bastard/keymaps/default/readme.md
rename to keyboards/bpiphany/unloved_bastard/keymaps/default/readme.md
diff --git a/keyboards/unloved_bastard/keymaps/default_ansi/config.h b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/config.h
similarity index 100%
rename from keyboards/unloved_bastard/keymaps/default_ansi/config.h
rename to keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/config.h
diff --git a/keyboards/unloved_bastard/keymaps/default_ansi/keymap.c b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
similarity index 100%
rename from keyboards/unloved_bastard/keymaps/default_ansi/keymap.c
rename to keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/keymap.c
diff --git a/keyboards/unloved_bastard/keymaps/default_ansi/readme.md b/keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/readme.md
similarity index 100%
rename from keyboards/unloved_bastard/keymaps/default_ansi/readme.md
rename to keyboards/bpiphany/unloved_bastard/keymaps/default_ansi/readme.md
diff --git a/keyboards/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c
similarity index 94%
rename from keyboards/unloved_bastard/matrix.c
rename to keyboards/bpiphany/unloved_bastard/matrix.c
index 65773879bc..bb6de8613a 100644
--- a/keyboards/unloved_bastard/matrix.c
+++ b/keyboards/bpiphany/unloved_bastard/matrix.c
@@ -25,6 +25,24 @@
 #include "util.h"
 #include "matrix.h"
 
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
 #ifndef DEBOUNCING_DELAY
 #   define DEBOUNCING_DELAY 5
 #endif
diff --git a/keyboards/unloved_bastard/readme.md b/keyboards/bpiphany/unloved_bastard/readme.md
similarity index 56%
rename from keyboards/unloved_bastard/readme.md
rename to keyboards/bpiphany/unloved_bastard/readme.md
index 33c74d4b04..9909d5af3f 100644
--- a/keyboards/unloved_bastard/readme.md
+++ b/keyboards/bpiphany/unloved_bastard/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Pretty much anywhere
 
 Make example for this keyboard (after setting up your build environment):
 
-    make unloved_bastard:default
+    make bpiphany/unloved_bastard: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.
+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/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
similarity index 100%
rename from keyboards/unloved_bastard/rules.mk
rename to keyboards/bpiphany/unloved_bastard/rules.mk
diff --git a/keyboards/unloved_bastard/unloved_bastard.c b/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
similarity index 100%
rename from keyboards/unloved_bastard/unloved_bastard.c
rename to keyboards/bpiphany/unloved_bastard/unloved_bastard.c
diff --git a/keyboards/unloved_bastard/unloved_bastard.h b/keyboards/bpiphany/unloved_bastard/unloved_bastard.h
similarity index 100%
rename from keyboards/unloved_bastard/unloved_bastard.h
rename to keyboards/bpiphany/unloved_bastard/unloved_bastard.h
diff --git a/keyboards/pegasushoof/README.md b/keyboards/pegasushoof/README.md
deleted file mode 100644
index debf7f7372..0000000000
--- a/keyboards/pegasushoof/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Pegasus Hoof Controller
-===
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: Pegasus Hoof  
-Hardware Availability: https://1upkeyboards.com/filco-pegasus-hoof-controller.html
-
-Make example for this keyboard (after setting up your build environment):
-
-    make pegasus_hoof: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.