6 files changed, 7 insertions, 20 deletions
diff --git a/keyboards/kapl/kapl.c b/keyboards/kapl/kapl.c
deleted file mode 100644
index 165900e142..0000000000
--- a/keyboards/kapl/kapl.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "kapl.h"
diff --git a/keyboards/kapl/kapl.h b/keyboards/kapl/kapl.h
deleted file mode 100644
index 019e3267d4..0000000000
--- a/keyboards/kapl/kapl.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 Alexander Lozyuk (@keyzog)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-#include "quantum.h"
-
-#ifdef KEYBOARD_kapl_rev1
-#   include "rev1.h"
-#endif
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index b99ab977a8..155c94909f 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -2,13 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Select hand configuration */
 #define MASTER_LEFT
 
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 483bc655c0..7bd8f7f36c 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x0001",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["C6", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
     "soft_serial_pin": "D2"
   },
diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c
index b51021307e..e0e32cf5e8 100644
--- a/keyboards/kapl/rev1/rev1.c
+++ b/keyboards/kapl/rev1/rev1.c
@@ -1,6 +1,6 @@
 // Copyright 2022 Alexander Lozyuk (@keyzog)
 // SPDX-License-Identifier: GPL-2.0-or-later
-#include "kapl.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kapl/rev1/rev1.h b/keyboards/kapl/rev1/rev1.h
index 68649a7991..686ff89e92 100644
--- a/keyboards/kapl/rev1/rev1.h
+++ b/keyboards/kapl/rev1/rev1.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "kapl.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *