9 files changed, 25 insertions, 43 deletions
diff --git a/keyboards/0_sixty/base/info.json b/keyboards/0_sixty/base/info.json
new file mode 100644
index 0000000000..f15b6505d1
--- /dev/null
+++ b/keyboards/0_sixty/base/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "0-Sixty",
+    "usb": {
+        "pid": "0x0060"
+    },
+    "indicators": {
+        "caps_lock": "B6"
+    }
+}
diff --git a/keyboards/0_sixty/base/rules.mk b/keyboards/0_sixty/base/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/0_sixty/base/rules.mk
diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h
index 9d9394c14f..2160ba623e 100644
--- a/keyboards/0_sixty/config.h
+++ b/keyboards/0_sixty/config.h
@@ -18,22 +18,12 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-
-#define VENDOR_ID       0x7654
-#define PRODUCT_ID      0x0060
-#define DEVICE_VER      0x0001
-
-#define MANUFACTURER    ven0mtr0n
-#define PRODUCT         0-Sixty
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 12
 #define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
 #define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
@@ -41,9 +31,6 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-/* indicator leds */
-#define LED_CAPS_LOCK_PIN B6
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json
index b04e9accb2..7fc718c602 100644
--- a/keyboards/0_sixty/info.json
+++ b/keyboards/0_sixty/info.json
@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "0-Sixty",
+    "manufacturer": "ven0mtr0n",
     "url": "",
     "maintainer": "vinamarora8",
+    "usb": {
+        "vid": "0x7654",
+        "device_version": "0.0.1"
+    },
     "layouts": {
 	"LAYOUT_1x2uC": {
             "layout": [
diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk
index 7a09d99fdf..18f45534c8 100644
--- a/keyboards/0_sixty/rules.mk
+++ b/keyboards/0_sixty/rules.mk
@@ -17,3 +17,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 LTO_ENABLE = yes            # Link-time opt
+
+DEFAULT_FOLDER = 0_sixty/base
diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
index 1cff58d944..7b36d4a834 100644
--- a/keyboards/0_sixty/underglow/config.h
+++ b/keyboards/0_sixty/underglow/config.h
@@ -18,15 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#undef PRODUCT_ID
-#define PRODUCT_ID      0x0061
-#undef PRODUCT
-#define PRODUCT         0-Sixty-underglow
-
-/* no caps lock with underglow */
-#undef LED_CAPS_LOCK_PIN
-
 /* underglow */
 #define RGB_DI_PIN B6
 #define RGBLED_NUM 24
diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json
new file mode 100644
index 0000000000..5cbbd86e61
--- /dev/null
+++ b/keyboards/0_sixty/underglow/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "0-Sixty-underglow",
+    "usb": {
+        "pid": "0x0061"
+    },
+    "features": {
+        "rgblight": true
+    }
+}
diff --git a/keyboards/0_sixty/underglow/rules.mk b/keyboards/0_sixty/underglow/rules.mk
index 84ef473c02..e69de29bb2 100644
--- a/keyboards/0_sixty/underglow/rules.mk
+++ b/keyboards/0_sixty/underglow/rules.mk
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
diff --git a/keyboards/0_sixty/underglow/underglow.h b/keyboards/0_sixty/underglow/underglow.h
deleted file mode 100644
index 807dfa84ce..0000000000
--- a/keyboards/0_sixty/underglow/underglow.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Vinam Arora <vinam@posteo.de>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "0_sixty.h"