diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index af97c39f0c..29a7a719f3 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -185,6 +185,9 @@
     "eek": {
         "target": "eek/silk_down"
     },
+    "epoch80": {
+        "target": "kbdfans/epoch80"
+    },
     "era/klein": {
         "target": "era/sirind/klein_sd"
 	},
@@ -311,6 +314,9 @@
     "jj50": {
         "target": "kprepublic/jj50"
     },
+    "jm60": {
+        "target": "kbdfans/jm60"
+    },
     "jones": {
         "target": "jones/v03_1"
     },
diff --git a/keyboards/epoch80/info.json b/keyboards/kbdfans/epoch80/info.json
similarity index 100%
rename from keyboards/epoch80/info.json
rename to keyboards/kbdfans/epoch80/info.json
diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/default/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/default/keymap.c
diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/iso/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/tsangan/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
diff --git a/keyboards/epoch80/keymaps/via/keymap.c b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/via/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/via/keymap.c
diff --git a/keyboards/epoch80/keymaps/via/rules.mk b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/epoch80/keymaps/via/rules.mk
rename to keyboards/kbdfans/epoch80/keymaps/via/rules.mk
diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/wkl/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
diff --git a/keyboards/epoch80/readme.md b/keyboards/kbdfans/epoch80/readme.md
similarity index 92%
rename from keyboards/epoch80/readme.md
rename to keyboards/kbdfans/epoch80/readme.md
index a78f9ce87b..b029b5bd99 100644
--- a/keyboards/epoch80/readme.md
+++ b/keyboards/kbdfans/epoch80/readme.md
@@ -11,10 +11,10 @@ The board was also sold in a zFrontier groupbuy under the name Dolch.CR 80.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make epoch80:default
+    make kbdfans/epoch80:default
 
 Flashing example for this keyboard:
 
-    make epoch80:default:flash
+    make kbdfans/epoch80: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/epoch80/rules.mk b/keyboards/kbdfans/epoch80/rules.mk
similarity index 100%
rename from keyboards/epoch80/rules.mk
rename to keyboards/kbdfans/epoch80/rules.mk
diff --git a/keyboards/jm60/board.h b/keyboards/kbdfans/jm60/board.h
similarity index 100%
rename from keyboards/jm60/board.h
rename to keyboards/kbdfans/jm60/board.h
diff --git a/keyboards/jm60/chconf.h b/keyboards/kbdfans/jm60/chconf.h
similarity index 100%
rename from keyboards/jm60/chconf.h
rename to keyboards/kbdfans/jm60/chconf.h
diff --git a/keyboards/jm60/config.h b/keyboards/kbdfans/jm60/config.h
similarity index 100%
rename from keyboards/jm60/config.h
rename to keyboards/kbdfans/jm60/config.h
diff --git a/keyboards/jm60/info.json b/keyboards/kbdfans/jm60/info.json
similarity index 100%
rename from keyboards/jm60/info.json
rename to keyboards/kbdfans/jm60/info.json
diff --git a/keyboards/jm60/jm60.c b/keyboards/kbdfans/jm60/jm60.c
similarity index 100%
rename from keyboards/jm60/jm60.c
rename to keyboards/kbdfans/jm60/jm60.c
diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
similarity index 97%
rename from keyboards/jm60/keymaps/default/keymap.c
rename to keyboards/kbdfans/jm60/keymaps/default/keymap.c
index 2bb26fccf6..d063afa0fd 100644
--- a/keyboards/jm60/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright QMK
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 enum layer_names {
diff --git a/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c b/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c
new file mode 100644
index 0000000000..ee1583eab7
--- /dev/null
+++ b/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c
@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _BL,
+    _FL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BL] = LAYOUT_60_ansi(
+        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        MO(_FL), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(_FL), KC_RCTL
+    ),
+
+    [_FL] = LAYOUT_60_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______,
+        KC_CAPS, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,           _______,
+        _______,          KC_APP,  _______, _______, _______, _______, KC_END,  _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jm60/ld/jm60_bootloader.ld b/keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
similarity index 100%
rename from keyboards/jm60/ld/jm60_bootloader.ld
rename to keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
diff --git a/keyboards/jm60/mcuconf.h b/keyboards/kbdfans/jm60/mcuconf.h
similarity index 100%
rename from keyboards/jm60/mcuconf.h
rename to keyboards/kbdfans/jm60/mcuconf.h
diff --git a/keyboards/jm60/readme.md b/keyboards/kbdfans/jm60/readme.md
similarity index 96%
rename from keyboards/jm60/readme.md
rename to keyboards/kbdfans/jm60/readme.md
index bb790d6d07..545124f3aa 100644
--- a/keyboards/jm60/readme.md
+++ b/keyboards/kbdfans/jm60/readme.md
@@ -8,7 +8,7 @@ A compact 60% keyboard with full RGB led support.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jm60:default
+    make kbdfans/jm60: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/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk
similarity index 100%
rename from keyboards/jm60/rules.mk
rename to keyboards/kbdfans/jm60/rules.mk