diff --git a/keyboards/fingerpunch/sweeeeep/smathev/KEYMAP_LAYOUT.md b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/KEYMAP_LAYOUT.md
similarity index 100%
rename from keyboards/fingerpunch/sweeeeep/smathev/KEYMAP_LAYOUT.md
rename to keyboards/fingerpunch/sweeeeep/keymaps/smathev/KEYMAP_LAYOUT.md
diff --git a/keyboards/fingerpunch/sweeeeep/smathev/glcdfont.c b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/glcdfont.c
similarity index 100%
rename from keyboards/fingerpunch/sweeeeep/smathev/glcdfont.c
rename to keyboards/fingerpunch/sweeeeep/keymaps/smathev/glcdfont.c
diff --git a/keyboards/fingerpunch/sweeeeep/smathev/keymap.c b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.c
similarity index 100%
rename from keyboards/fingerpunch/sweeeeep/smathev/keymap.c
rename to keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.c
diff --git a/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json
new file mode 100644
index 00000000..08cf8df3
--- /dev/null
+++ b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json
@@ -0,0 +1,3 @@
+{
+    "converter": "liatris"
+}
diff --git a/qmk.json b/qmk.json
index 3afc389f..babdd3b0 100644
--- a/qmk.json
+++ b/qmk.json
@@ -1,4 +1,6 @@
 {
-    "userspace_version": "1.0",
-    "build_targets": []
+    "userspace_version": "1.1",
+    "build_targets": [
+        ["fingerpunch/sweeeeep", "smathev"]
+    ]
 }
\ No newline at end of file
diff --git a/users/smathev/combos.c b/users/smathev/combos.c
index 85b70b0d..f1850973 100644
--- a/users/smathev/combos.c
+++ b/users/smathev/combos.c
@@ -36,7 +36,7 @@ combo_t key_combos[COMBO_COUNT] = {
   COMBO(bcksp_combo, KC_BSPC),
   COMBO(del_combo, KC_DEL),
   COMBO(esc_combo, KC_ESC),
-  COMBO(reset_keyboard_combo, QK_BOOT),
+  COMBO(reset_keyboard_combo, QK_BOOT)
 };
 
 
diff --git a/users/smathev/combos.h b/users/smathev/combos.h
index 512c76b8..f66680ae 100644
--- a/users/smathev/combos.h
+++ b/users/smathev/combos.h
@@ -2,27 +2,5 @@
 
 #include QMK_KEYBOARD_H
 
-// Explicit extern declaration for introspection system with correct size
-extern combo_t key_combos[COMBO_COUNT];
-
-enum combo_events {
-  UNDO,
-  ENT,
-  TAB,
-  CUT,
-  COPY,
-  PASTE,
-  DEL,
-  BCKSP,
-  CTTB,
-  ESC,
-  SVFILE,
-  SRCH,
-  CTCL,
-  CANCEL,
-  CTROP,
-  FFIVE,
-  RESET_KEYBOARD
-};
-
+// Combo array declaration - COMBO_COUNT is automatically calculated by QMK
 extern combo_t key_combos[];