4 files changed, 10 insertions, 29 deletions
diff --git a/keyboards/rotr/config.h b/keyboards/rotr/config.h
index 65a32fc355..5f36081323 100644
--- a/keyboards/rotr/config.h
+++ b/keyboards/rotr/config.h
@@ -1,13 +1,5 @@
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6 }
-#define MATRIX_COL_PINS { D1, D0, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/rotr/info.json b/keyboards/rotr/info.json
index b893720ddf..ce744d32f1 100644
--- a/keyboards/rotr/info.json
+++ b/keyboards/rotr/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "D4"],
+        "rows": ["E6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "C6", "pin_b": "D7", "resolution": 2}
@@ -17,7 +22,11 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0}
+            ]
         }
     }
 }
diff --git a/keyboards/rotr/rotr.c b/keyboards/rotr/rotr.c
deleted file mode 100644
index b7c551075d..0000000000
--- a/keyboards/rotr/rotr.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "rotr.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return true;
-}
diff --git a/keyboards/rotr/rotr.h b/keyboards/rotr/rotr.h
deleted file mode 100644
index bf2ff12929..0000000000
--- a/keyboards/rotr/rotr.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02  \
-) { \
-	{ K00,   K01,   K02 }  \
-}