diff --git a/v3/keychron/q1/ansi_atmega32u4.json b/v3/keychron/q1/v1/ansi.json
similarity index 100%
rename from v3/keychron/q1/ansi_atmega32u4.json
rename to v3/keychron/q1/v1/ansi.json
diff --git a/v3/keychron/q1/ansi_atmega32u4_encoder.json b/v3/keychron/q1/v1/ansi_knob.json
similarity index 100%
rename from v3/keychron/q1/ansi_atmega32u4_encoder.json
rename to v3/keychron/q1/v1/ansi_knob.json
diff --git a/v3/keychron/q1/iso_atmega32u4.json b/v3/keychron/q1/v1/iso.json
similarity index 100%
rename from v3/keychron/q1/iso_atmega32u4.json
rename to v3/keychron/q1/v1/iso.json
diff --git a/v3/keychron/q1/iso_atmega32u4_encoder.json b/v3/keychron/q1/v1/iso_knob.json
similarity index 100%
rename from v3/keychron/q1/iso_atmega32u4_encoder.json
rename to v3/keychron/q1/v1/iso_knob.json
diff --git a/v3/keychron/q1/ansi_stm32l432.json b/v3/keychron/q1/v2/ansi.json
old mode 100755
new mode 100644
similarity index 100%
rename from v3/keychron/q1/ansi_stm32l432.json
rename to v3/keychron/q1/v2/ansi.json
diff --git a/v3/keychron/q1/ansi_stm32l432_encoder.json b/v3/keychron/q1/v2/ansi_knob.json
old mode 100755
new mode 100644
similarity index 100%
rename from v3/keychron/q1/ansi_stm32l432_encoder.json
rename to v3/keychron/q1/v2/ansi_knob.json
diff --git a/v3/keychron/q1/iso_stm32l432.json b/v3/keychron/q1/v2/iso.json
old mode 100755
new mode 100644
similarity index 100%
rename from v3/keychron/q1/iso_stm32l432.json
rename to v3/keychron/q1/v2/iso.json
diff --git a/v3/keychron/q1/iso_stm32l432_encoder.json b/v3/keychron/q1/v2/iso_knob.json
old mode 100755
new mode 100644
similarity index 100%
rename from v3/keychron/q1/iso_stm32l432_encoder.json
rename to v3/keychron/q1/v2/iso_knob.json
diff --git a/v3/keychron/q1/jis_stm32l432.json b/v3/keychron/q1/v2/jis.json
old mode 100755
new mode 100644
similarity index 100%
rename from v3/keychron/q1/jis_stm32l432.json
rename to v3/keychron/q1/v2/jis.json
diff --git a/v3/keychron/q1/jis_stm32l432_encoder.json b/v3/keychron/q1/v2/jis_knob.json
old mode 100755
new mode 100644
similarity index 100%
rename from v3/keychron/q1/jis_stm32l432_encoder.json
rename to v3/keychron/q1/v2/jis_knob.json