diff --git a/config/cantor/readme.md b/config/cantor/readme.md
deleted file mode 100644
index 9a45d7b..0000000
--- a/config/cantor/readme.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# cantor
-
-![cantor](https://i.imgur.com/Uvxm3zVh.jpg)
-
-The Cantor keyboard is a 42 key diodeless split keyboard, designed with simplicity in mind. It is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design.
-
-* Keyboard Maintainer: [Diego Palacios](https://github.com/diepala)
-* Hardware Supported: Blackpill STM32F401
-* Hardware Availability: https://github.com/diepala/cantor
-
-Make example for this keyboard (after setting up your build environment):
-
-    make cantor:default
-
-Flashing example for this keyboard:
-
-    make cantor: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).
-
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. For the right side, hold the top right key and plug the keyboard.
-* **Physical reset button**: 
-  * Press and hold the BOOT0 button.
-  * Press and release the NRST button.
-  * Release the BOOT0 button.
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/config/cantor/config.h b/keyboards/custom-cantor-8mhz/config.h
similarity index 100%
rename from config/cantor/config.h
rename to keyboards/custom-cantor-8mhz/config.h
diff --git a/config/cantor/halconf.h b/keyboards/custom-cantor-8mhz/halconf.h
similarity index 100%
rename from config/cantor/halconf.h
rename to keyboards/custom-cantor-8mhz/halconf.h
diff --git a/config/cantor/keyboard.json b/keyboards/custom-cantor-8mhz/keyboard.json
similarity index 100%
rename from config/cantor/keyboard.json
rename to keyboards/custom-cantor-8mhz/keyboard.json
diff --git a/config/cantor/keymaps/vial/config.h b/keyboards/custom-cantor-8mhz/keymaps/vial/config.h
similarity index 100%
rename from config/cantor/keymaps/vial/config.h
rename to keyboards/custom-cantor-8mhz/keymaps/vial/config.h
diff --git a/config/cantor/keymaps/vial/keymap.c b/keyboards/custom-cantor-8mhz/keymaps/vial/keymap.c
similarity index 100%
rename from config/cantor/keymaps/vial/keymap.c
rename to keyboards/custom-cantor-8mhz/keymaps/vial/keymap.c
diff --git a/config/cantor/keymaps/vial/rules.mk b/keyboards/custom-cantor-8mhz/keymaps/vial/rules.mk
similarity index 100%
rename from config/cantor/keymaps/vial/rules.mk
rename to keyboards/custom-cantor-8mhz/keymaps/vial/rules.mk
diff --git a/config/cantor/keymaps/vial/vial.json b/keyboards/custom-cantor-8mhz/keymaps/vial/vial.json
similarity index 100%
rename from config/cantor/keymaps/vial/vial.json
rename to keyboards/custom-cantor-8mhz/keymaps/vial/vial.json
diff --git a/config/cantor/mcuconf.h b/keyboards/custom-cantor-8mhz/mcuconf.h
similarity index 100%
rename from config/cantor/mcuconf.h
rename to keyboards/custom-cantor-8mhz/mcuconf.h
diff --git a/keyboards/custom-cantor/config.h b/keyboards/custom-cantor/config.h
new file mode 100644
index 0000000..0b65007
--- /dev/null
+++ b/keyboards/custom-cantor/config.h
@@ -0,0 +1,24 @@
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
+#define SERIAL_USART_TX_PIN B6     // USART TX pin
+#define SERIAL_USART_RX_PIN B7     // USART RX pin
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/custom-cantor/halconf.h b/keyboards/custom-cantor/halconf.h
new file mode 100644
index 0000000..8214c4b
--- /dev/null
+++ b/keyboards/custom-cantor/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/custom-cantor/keyboard.json b/keyboards/custom-cantor/keyboard.json
new file mode 100644
index 0000000..26b79c0
--- /dev/null
+++ b/keyboards/custom-cantor/keyboard.json
@@ -0,0 +1,96 @@
+{
+    "manufacturer": "Diego Palacios",
+    "keyboard_name": "cantor",
+    "maintainer": "diepala",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "blackpill_f401",
+    "url": "https://github.com/diepala/cantor",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B1", "B10", "A8", "B15", "B14", "B13"],
+            ["B9", "B8", "B5", "B4", "B3", "A15"],
+            ["A3", "A4", "A5", "A6", "A7", "B0"],
+            ["A2", "A1", "A0", null, null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["B13", "B14", "B15", "A8", "B10", "B1"],
+                    ["A15", "B3", "B4", "B5", "B8", "B9"],
+                    ["B0", "A7", "A6", "A5", "A4", "A3"],
+                    ["A0", "A1", "A2", null, null, null]
+                ]
+            }
+        },
+        "serial": {
+            "driver": "usart"
+        }
+    },
+    "community_layouts": ["split_3x6_3"],
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 5.5, "y": 3.75},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/config/cantor/keymaps/default/keymap.c b/keyboards/custom-cantor/keymaps/default/keymap.c
similarity index 100%
rename from config/cantor/keymaps/default/keymap.c
rename to keyboards/custom-cantor/keymaps/default/keymap.c
diff --git a/keyboards/custom-cantor/keymaps/vial/config.h b/keyboards/custom-cantor/keymaps/vial/config.h
new file mode 100644
index 0000000..9290fd2
--- /dev/null
+++ b/keyboards/custom-cantor/keymaps/vial/config.h
@@ -0,0 +1,11 @@
+
+/* keyboard uid */
+#define VIAL_KEYBOARD_UID {0xF0, 0x67, 0x2F, 0x54, 0x23, 0xB3, 0x7B, 0x55}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 4 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 5 }
+
+/* default layer count */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+
diff --git a/keyboards/custom-cantor/keymaps/vial/keymap.c b/keyboards/custom-cantor/keymaps/vial/keymap.c
new file mode 100644
index 0000000..602d8f2
--- /dev/null
+++ b/keyboards/custom-cantor/keymaps/vial/keymap.c
@@ -0,0 +1,47 @@
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┐
+      * │Tab│ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │Bsp│
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Ctl│ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │ ' │
+      * ├───┼───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┼───┤
+      * │Sft│ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │Sft│
+      * └───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┘
+      *               ┌───┐                   ┌───┐
+      *               │GUI├───┐           ┌───┤Alt│
+      *               └───┤   ├───┐   ┌───┤   ├───┘
+      *                   └───┤Bsp│   │Ent├───┘
+      *                       └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x6_3(
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        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_LGUI, KC_SPC, KC_BSPC,          KC_ENT, KC_SPC, KC_RALT
+    ),
+
+    [1] = LAYOUT_split_3x6_3(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_split_3x6_3(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_split_3x6_3(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                               KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+                                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/custom-cantor/keymaps/vial/rules.mk b/keyboards/custom-cantor/keymaps/vial/rules.mk
new file mode 100644
index 0000000..1b709f0
--- /dev/null
+++ b/keyboards/custom-cantor/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE  = yes    # Enable VIA
+VIAL_ENABLE = yes    # Enable VIAL
diff --git a/keyboards/custom-cantor/keymaps/vial/vial.json b/keyboards/custom-cantor/keymaps/vial/vial.json
new file mode 100644
index 0000000..e2f28ae
--- /dev/null
+++ b/keyboards/custom-cantor/keymaps/vial/vial.json
@@ -0,0 +1,262 @@
+{
+    "name": "cantor",
+    "lighting": "none",
+    "vendorId": "0xFEED",
+    "productId": "0x0000",
+    "matrix": {
+        "rows": 8,
+        "cols": 6
+    },
+    "layouts": {
+        "keymap": [
+          [
+            {
+              "x": 3
+            },
+            "0,3",
+            {
+              "x": 7.5
+            },
+            "4,2"
+          ],
+          [
+            {
+              "y": -0.75,
+              "x": 2
+            },
+            "0,2",
+            {
+              "x": 1
+            },
+            "0,4",
+            {
+              "x": 5.5
+            },
+            "4,1",
+            {
+              "x": 1
+            },
+            "4,3"
+          ],
+          [
+            {
+              "y": -0.9,
+              "x": 5
+            },
+            "0,5",
+            {
+              "x": 3.5
+            },
+            "4,0"
+          ],
+          [
+            {
+              "y": -0.3500000000000001
+            },
+            "0,0",
+            "0,1",
+            {
+              "x": 1
+            },
+            "1,3",
+            {
+              "x": 7.5
+            },
+            "5,2",
+            {
+              "x": 1
+            },
+            "4,4",
+            "4,5"
+          ],
+          [
+            {
+              "y": -0.75,
+              "x": 2
+            },
+            "1,2",
+            {
+              "x": 1
+            },
+            "1,4",
+            {
+              "x": 5.5
+            },
+            "5,1",
+            {
+              "x": 1
+            },
+            "5,3"
+          ],
+          [
+            {
+              "y": -0.8999999999999999,
+              "x": 5
+            },
+            "1,5",
+            {
+              "x": 3.5
+            },
+            "5,0"
+          ],
+          [
+            {
+              "y": -0.3500000000000001
+            },
+            "1,0",
+            "1,1",
+            {
+              "x": 1
+            },
+            "2,3",
+            {
+              "x": 7.5
+            },
+            "6,2",
+            {
+              "x": 1
+            },
+            "5,4",
+            "5,5"
+          ],
+          [
+            {
+              "y": -0.75,
+              "x": 2
+            },
+            "2,2",
+            {
+              "x": 1
+            },
+            "2,4",
+            {
+              "x": 5.5
+            },
+            "6,1",
+            {
+              "x": 1
+            },
+            "6,3"
+          ],
+          [
+            {
+              "y": -0.8999999999999999,
+              "x": 5
+            },
+            "2,5",
+            {
+              "x": 3.5
+            },
+            "6,0"
+          ],
+          [
+            {
+              "y": -0.3500000000000001
+            },
+            "2,0",
+            "2,1",
+            {
+              "x": 11.5
+            },
+            "6,4",
+            "6,5"
+          ],
+          [
+            {
+              "r": 5,
+              "rx": 5,
+              "ry": 3.5,
+              "x": 0.09999999999999964
+            },
+            "3,1"
+          ],
+          [
+            {
+              "rx": 10.75
+            },
+            "7,2"
+          ],
+          [
+            {
+              "r": 15,
+              "rx": 6.5,
+              "y": 0.20000000000000018,
+              "x": -0.04999999999999982
+            },
+            "3,2"
+          ],
+          [
+            {
+              "r": -15,
+              "rx": 8.25,
+              "y": 0.3900000000000001,
+              "x": -0.15000000000000036
+            },
+            "7,0"
+          ],
+          [
+            {
+              "r": -5,
+              "rx": 3.6,
+              "y": 0.10000000000000009,
+              "x": 0.20000000000000018
+            },
+            "3,0"
+          ],
+          [
+            {
+              "rx": 9.5,
+              "y": 0.10000000000000009,
+              "x": -0.05000000000000071
+            },
+            "7,1"
+          ]
+        ],
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.25 },
+                { "matrix": [0, 2], "x": 2, "y": 0.125 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0.125 },
+                { "matrix": [0, 5], "x": 5, "y": 0.25 },
+                { "matrix": [4, 0], "x": 8, "y": 0.25 },
+                { "matrix": [4, 1], "x": 9, "y": 0.125 },
+                { "matrix": [4, 2], "x": 10, "y": 0 },
+                { "matrix": [4, 3], "x": 11, "y": 0.125 },
+                { "matrix": [4, 4], "x": 12, "y": 0.25 },
+                { "matrix": [4, 5], "x": 13, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.125 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [1, 4], "x": 4, "y": 1.125 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [5, 0], "x": 8, "y": 1.25 },
+                { "matrix": [5, 1], "x": 9, "y": 1.125 },
+                { "matrix": [5, 2], "x": 10, "y": 1 },
+                { "matrix": [5, 3], "x": 11, "y": 1.125 },
+                { "matrix": [5, 4], "x": 12, "y": 1.25 },
+                { "matrix": [5, 5], "x": 13, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.125 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [2, 4], "x": 4, "y": 2.125 },
+                { "matrix": [2, 5], "x": 5, "y": 2.25 },
+                { "matrix": [6, 0], "x": 8, "y": 2.25 },
+                { "matrix": [6, 1], "x": 9, "y": 2.125 },
+                { "matrix": [6, 2], "x": 10, "y": 2 },
+                { "matrix": [6, 3], "x": 11, "y": 2.125 },
+                { "matrix": [6, 4], "x": 12, "y": 2.25 },
+                { "matrix": [6, 5], "x": 13, "y": 2.25 },
+                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
+                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
+                { "matrix": [3, 2], "x": 5.5, "y": 3.75 },
+                { "matrix": [7, 0], "x": 7.5, "y": 3.75 },
+                { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
+                { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/custom-cantor/mcuconf.h b/keyboards/custom-cantor/mcuconf.h
new file mode 100644
index 0000000..9274e1b
--- /dev/null
+++ b/keyboards/custom-cantor/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE