diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
new file mode 100644
index 000000000..52891c4aa
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -0,0 +1,73 @@
+/*
+Copyright 2021 DTIsaac
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4454 // DT
+#define PRODUCT_ID 0x4973 // Is
+#define DEVICE_VER 0x0004
+#define MANUFACTURER DTIsaac
+#define PRODUCT >_Dosa40
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+/* AdafruitBle Pin */
+#define AdafruitBleResetPin D4
+#define AdafruitBleCSPin B4
+#define AdafruitBleIRQPin E6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B7, D7, F1, F0 }
+#define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_DI_PIN D0
+#define DRIVER_LED_TOTAL 42
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+// #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
new file mode 100644
index 000000000..c46bfc291
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 DTIsaac
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include "dosa40rgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+ //Key Matrix to LED Index
+ {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+ {22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12 },
+ {23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33},
+ {41, 40, 39, NO_LED, 38, NO_LED, 37, 36, 35, 34, 11}
+}, {
+ //LED Index to Physical Positon
+ { 0, 0}, { 20, 0}, { 40, 0 }, { 61, 0 }, { 81, 0}, { 101, 0}, { 122, 0}, { 142, 0}, { 162, 0}, { 183, 0}, { 203, 0}, { 224, 0},
+ {203, 21}, {183, 21}, {162,21 }, {142, 21}, {122,21}, { 101,21}, { 81 ,21}, { 61 ,21}, { 40 ,21}, { 20 ,21}, { 0 ,21},
+ { 0, 42}, { 20, 42}, { 40,42 }, { 61, 42}, { 81,42}, { 101,42}, { 122,42}, { 142,42}, { 162,42}, { 183,42}, { 203,42},
+ {203, 64}, {183, 64}, {162,64 }, {122, 64}, { 81,64}, { 40, 64}, { 20, 64}, { 0, 64},
+}, {
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1,
+} };
+
+#endif
\ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h b/keyboards/dtisaac/dosa40rgb/dosa40rgb.h
new file mode 100644
index 000000000..261fb7c46
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/dosa40rgb.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 DTIsaac
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
+ k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, \
+ k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, \
+ k33, k34, k35, k36, k37, k38, k39, k40 \
+) \
+{ \
+ {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10}, \
+ {k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21}, \
+ {k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32}, \
+ {k33, k34, k35, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \
+}
\ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
new file mode 100644
index 000000000..2feed40d4
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -0,0 +1,53 @@
+{
+ "keyboard_name": ">_Dosa40rgb",
+ "url": "",
+ "maintainer": "DTIsaac",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"Q", "x":1, "y":0},
+ {"label":"W", "x":2, "y":0},
+ {"label":"E", "x":3, "y":0},
+ {"label":"R", "x":4, "y":0},
+ {"label":"T", "x":5, "y":0},
+ {"label":"Y", "x":6, "y":0},
+ {"label":"U", "x":7, "y":0},
+ {"label":"I", "x":8, "y":0},
+ {"label":"O", "x":9, "y":0},
+ {"label":"P", "x":10, "y":0},
+ {"label":"BSPC", "x":11, "y":0},
+ {"label":"Caps Lock", "x":0, "y":1, "w":1.5},
+ {"label":"A", "x":1.5, "y":1},
+ {"label":"S", "x":2.5, "y":1},
+ {"label":"D", "x":3.5, "y":1},
+ {"label":"F", "x":4.5, "y":1},
+ {"label":"G", "x":5.5, "y":1},
+ {"label":"H", "x":6.5, "y":1},
+ {"label":"J", "x":7.5, "y":1},
+ {"label":"K", "x":8.5, "y":1},
+ {"label":"L", "x":9.5, "y":1},
+ {"label":"Enter", "x":10.5, "y":1, "w":1.5},
+ {"label":"Shift", "x":0, "y":2, "w":1.75},
+ {"label":"Z", "x":1.75, "y":2},
+ {"label":"X", "x":2.75, "y":2},
+ {"label":"C", "x":3.75, "y":2},
+ {"label":"V", "x":4.75, "y":2},
+ {"label":"B", "x":5.75, "y":2},
+ {"label":"N", "x":6.75, "y":2},
+ {"label":"M", "x":7.75, "y":2},
+ {"label":",", "x":8.75, "y":2},
+ {"label":".", "x":9.75, "y":2},
+ {"label":"Shift", "x":10.75, "y":2, "w":1.25},
+ {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+ {"label":"Win", "x":1.25, "y":3, "w":1},
+ {"label":"Alt", "x":2.25, "y":3, "w":1.25},
+ {"label":"Space", "x":3.5, "y":3, "w":2.25},
+ {"label":"Space", "x":5.75, "y":3, "w":2.75},
+ {"label":"App", "x":8.5, "y":3, "w":1.25},
+ {"label":"Fn", "x":9.75, "y":3, "w":1},
+ {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
new file mode 100644
index 000000000..c9bde4bb8
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/keymaps/default/keymap.c
@@ -0,0 +1,122 @@
+/* Copyright 2021 DTIsaac
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+#include "spi_master.h"
+#include "wait.h"
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE,
+ _L1,
+ _L2
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+ BASE,
+ L1,
+ BLE_DIS, // Disconnect BLE
+ LED_EN, // Toggle LED
+};
+
+#define L1 MO(_L1)
+const uint8_t cm1[] = "AT+GAPSTOPADV";
+const uint8_t cm2[] = "AT+GAPDISCONNECT";
+const uint8_t cm3[] = "ATZ";
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ LT(_L2,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_RALT, L1, KC_RCTL
+ ),
+ [_L1] = LAYOUT(
+ RESET, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT,
+ KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [_L2] = LAYOUT(
+ LED_EN, RGB_RMOD, KC_UP, RGB_MOD, RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, KC_TRNS, OUT_USB, OUT_BT, BLE_DIS,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_BSLS,
+ 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_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+};
+
+void rgb_matrix_indicators_user(void)
+{
+ if (host_keyboard_led_state().caps_lock)
+ {
+ rgb_matrix_set_color(22, 200, 200, 200);
+ }
+ if (IS_LAYER_ON(_L1))
+ {
+ rgb_matrix_set_color(35, 0, 200, 200);
+ }
+ if (IS_LAYER_ON(_L2))
+ {
+ rgb_matrix_set_color(22, 200, 0, 200);
+ }
+}
+
+void sdep_send(const uint8_t *cmd, uint8_t len) {
+
+ spi_start(AdafruitBleCSPin, false, 0, 2);
+ uint8_t cnt = 200;
+ bool ready = false;
+
+ do {
+ ready = spi_write(0x10) != 0xFE;
+ if (ready) {
+ break;
+ }
+ spi_stop();
+ wait_us(25);
+ spi_start(AdafruitBleCSPin, false, 0, 2);
+ } while (cnt--);
+
+ if (ready) {
+ spi_write(0x00);
+ spi_write(0x0A);
+ spi_write(len);
+ spi_transmit(cmd, len);
+ }
+
+ spi_stop();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+ switch (keycode) {
+ case LED_EN:
+ if (record->event.pressed) {
+ DDRB = DDRB ^ 0x20;
+ PORTB &= ~(1 << 5);
+ }
+ return false;
+ case BLE_DIS:
+ if (record->event.pressed) {
+ sdep_send(cm1,sizeof(cm1));
+ sdep_send(cm2,sizeof(cm2));
+ sdep_send(cm3,sizeof(cm3));
+ }
+ return false;
+ }
+ return true;
+}
\ No newline at end of file
diff --git a/keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md b/keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md
new file mode 100644
index 000000000..35494635d
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for dosa40rgb
diff --git a/keyboards/dtisaac/dosa40rgb/readme.md b/keyboards/dtisaac/dosa40rgb/readme.md
new file mode 100644
index 000000000..189dc7b9b
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/readme.md
@@ -0,0 +1,25 @@
+# dosa40rgb
+
+
+
+A 40 percent keyboard dosa40rgb Bluetooth Low Energy
+
+* Keyboard Maintainer: [DTIsaac](https://github.com/daotakisaac)
+* Hardware Supported: ATmega32U4 + AdafruitBLE SPI
+
+Make example for this keyboard (after setting up your build environment):
+
+ make dtisaac/dosa40rgb:default
+
+Flashing example for this keyboard:
+
+ make dtisaac/dosa40rgb: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 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
new file mode 100644
index 000000000..0440ff20b
--- /dev/null
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = lufa-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no # Mouse keys
+EXTRAKEY_ENABLE = no # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+BLUETOOTH = AdafruitBLE # Enable Bluetooth
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file
diff --git a/keyboards/handwired/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
similarity index 100%
rename from keyboards/handwired/dtisaac01/config.h
rename to keyboards/dtisaac/dtisaac01/config.h
diff --git a/keyboards/handwired/dtisaac01/dtisaac01.c b/keyboards/dtisaac/dtisaac01/dtisaac01.c
similarity index 100%
rename from keyboards/handwired/dtisaac01/dtisaac01.c
rename to keyboards/dtisaac/dtisaac01/dtisaac01.c
diff --git a/keyboards/handwired/dtisaac01/dtisaac01.h b/keyboards/dtisaac/dtisaac01/dtisaac01.h
similarity index 100%
rename from keyboards/handwired/dtisaac01/dtisaac01.h
rename to keyboards/dtisaac/dtisaac01/dtisaac01.h
diff --git a/keyboards/handwired/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
similarity index 100%
rename from keyboards/handwired/dtisaac01/info.json
rename to keyboards/dtisaac/dtisaac01/info.json
diff --git a/keyboards/handwired/dtisaac01/keymaps/default/keymap.c b/keyboards/dtisaac/dtisaac01/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/dtisaac01/keymaps/default/keymap.c
rename to keyboards/dtisaac/dtisaac01/keymaps/default/keymap.c
diff --git a/keyboards/handwired/dtisaac01/keymaps/default/readme.md b/keyboards/dtisaac/dtisaac01/keymaps/default/readme.md
similarity index 100%
rename from keyboards/handwired/dtisaac01/keymaps/default/readme.md
rename to keyboards/dtisaac/dtisaac01/keymaps/default/readme.md
diff --git a/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c b/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
new file mode 100644
index 000000000..2f61c803f
--- /dev/null
+++ b/keyboards/dtisaac/dtisaac01/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 DTIsaac
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layers {
+ _LAYER0,
+ _LAYER1,
+ _LAYER2,
+ _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_LAYER0] = LAYOUT(
+ KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS,
+ KC_GRV, 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_INS, KC_HOME, KC_PGUP,
+ 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, KC_DEL, KC_END, KC_PGDN,
+ KC_CAPS, 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, LT(1, KC_NO), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_LAYER1] = LAYOUT(
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, KC_WAKE, KC_PWR,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_ON, BL_INC,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_OFF, BL_DEC,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+ ),
+ [_LAYER2] = LAYOUT(
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_LAYER3] = LAYOUT(
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+};
\ No newline at end of file
diff --git a/keyboards/dtisaac/dtisaac01/keymaps/via/readme.md b/keyboards/dtisaac/dtisaac01/keymaps/via/readme.md
new file mode 100644
index 000000000..0407ae233
--- /dev/null
+++ b/keyboards/dtisaac/dtisaac01/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for dtisaac01
diff --git a/keyboards/dtisaac/dtisaac01/keymaps/via/rules.mk b/keyboards/dtisaac/dtisaac01/keymaps/via/rules.mk
new file mode 100644
index 000000000..036bd6d1c
--- /dev/null
+++ b/keyboards/dtisaac/dtisaac01/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/dtisaac01/readme.md b/keyboards/dtisaac/dtisaac01/readme.md
similarity index 100%
rename from keyboards/handwired/dtisaac01/readme.md
rename to keyboards/dtisaac/dtisaac01/readme.md
diff --git a/keyboards/handwired/dtisaac01/rules.mk b/keyboards/dtisaac/dtisaac01/rules.mk
similarity index 100%
rename from keyboards/handwired/dtisaac01/rules.mk
rename to keyboards/dtisaac/dtisaac01/rules.mk