diff --git a/trunk/workspace/BMC/C16 USB Keyboard.url b/trunk/workspace/BMC/Keyboard/C16 USB Keyboard.url
similarity index 100%
rename from trunk/workspace/BMC/C16 USB Keyboard.url
rename to trunk/workspace/BMC/Keyboard/C16 USB Keyboard.url
diff --git a/trunk/workspace/BMC/pao_pos_c64.vkm b/trunk/workspace/BMC/Keyboard/C64/pao_pos_c64.vkm
similarity index 100%
rename from trunk/workspace/BMC/pao_pos_c64.vkm
rename to trunk/workspace/BMC/Keyboard/C64/pao_pos_c64.vkm
diff --git a/trunk/workspace/BMC/pao_sym_c64.vkm b/trunk/workspace/BMC/Keyboard/C64/pao_sym_c64.vkm
similarity index 100%
rename from trunk/workspace/BMC/pao_sym_c64.vkm
rename to trunk/workspace/BMC/Keyboard/C64/pao_sym_c64.vkm
diff --git a/trunk/workspace/BMC/C64/rpi_maxi_pos.vkm b/trunk/workspace/BMC/Keyboard/C64/rpi_maxi_pos.vkm
similarity index 100%
rename from trunk/workspace/BMC/C64/rpi_maxi_pos.vkm
rename to trunk/workspace/BMC/Keyboard/C64/rpi_maxi_pos.vkm
diff --git a/trunk/workspace/BMC/C64/rpi_petsciiboard_sym.vkm b/trunk/workspace/BMC/Keyboard/C64/rpi_petsciiboard_sym.vkm
similarity index 100%
rename from trunk/workspace/BMC/C64/rpi_petsciiboard_sym.vkm
rename to trunk/workspace/BMC/Keyboard/C64/rpi_petsciiboard_sym.vkm
diff --git a/trunk/workspace/BMC/C64/rpi_pos.vkm b/trunk/workspace/BMC/Keyboard/C64/rpi_pos.vkm
similarity index 100%
rename from trunk/workspace/BMC/C64/rpi_pos.vkm
rename to trunk/workspace/BMC/Keyboard/C64/rpi_pos.vkm
diff --git a/trunk/workspace/BMC/rpi_pos_64.vkm b/trunk/workspace/BMC/Keyboard/C64/rpi_pos_64.vkm
similarity index 100%
rename from trunk/workspace/BMC/rpi_pos_64.vkm
rename to trunk/workspace/BMC/Keyboard/C64/rpi_pos_64.vkm
diff --git a/trunk/workspace/BMC/C64/rpi_sym.vkm b/trunk/workspace/BMC/Keyboard/C64/rpi_sym.vkm
similarity index 100%
rename from trunk/workspace/BMC/C64/rpi_sym.vkm
rename to trunk/workspace/BMC/Keyboard/C64/rpi_sym.vkm
diff --git a/trunk/workspace/BMC/rpi_sym_64.vkm b/trunk/workspace/BMC/Keyboard/C64/rpi_sym_64.vkm
similarity index 100%
rename from trunk/workspace/BMC/rpi_sym_64.vkm
rename to trunk/workspace/BMC/Keyboard/C64/rpi_sym_64.vkm
diff --git a/trunk/workspace/BMC/C64_Keyboard.gif b/trunk/workspace/BMC/Keyboard/C64_Keyboard.gif
similarity index 100%
rename from trunk/workspace/BMC/C64_Keyboard.gif
rename to trunk/workspace/BMC/Keyboard/C64_Keyboard.gif
diff --git a/trunk/workspace/BMC/GitHub - rumbledethumps-cbm2usb- Commodore 64 and VIC-20 keyboard matrix decoder for USB · GitHub.url b/trunk/workspace/BMC/Keyboard/GitHub - rumbledethumps-cbm2usb- Commodore 64 and VIC-20 keyboard matrix decoder for USB · GitHub.url
similarity index 100%
rename from trunk/workspace/BMC/GitHub - rumbledethumps-cbm2usb- Commodore 64 and VIC-20 keyboard matrix decoder for USB · GitHub.url
rename to trunk/workspace/BMC/Keyboard/GitHub - rumbledethumps-cbm2usb- Commodore 64 and VIC-20 keyboard matrix decoder for USB · GitHub.url
diff --git a/trunk/workspace/BMC/Keymapping.ods b/trunk/workspace/BMC/Keyboard/Keymapping.ods
similarity index 100%
rename from trunk/workspace/BMC/Keymapping.ods
rename to trunk/workspace/BMC/Keyboard/Keymapping.ods
diff --git a/trunk/workspace/BMC/Keymapping_diff.ods b/trunk/workspace/BMC/Keyboard/Keymapping_diff.ods
similarity index 100%
rename from trunk/workspace/BMC/Keymapping_diff.ods
rename to trunk/workspace/BMC/Keyboard/Keymapping_diff.ods
diff --git a/trunk/workspace/BMC/Overview - Commodore Keyboard to USB HID with CircuitPython - Adafruit Learning System.url b/trunk/workspace/BMC/Keyboard/Overview - Commodore Keyboard to USB HID with CircuitPython - Adafruit Learning System.url
similarity index 100%
rename from trunk/workspace/BMC/Overview - Commodore Keyboard to USB HID with CircuitPython - Adafruit Learning System.url
rename to trunk/workspace/BMC/Keyboard/Overview - Commodore Keyboard to USB HID with CircuitPython - Adafruit Learning System.url
diff --git a/trunk/workspace/BMC/P4_Keyboard.gif b/trunk/workspace/BMC/Keyboard/P4_Keyboard.gif
similarity index 100%
rename from trunk/workspace/BMC/P4_Keyboard.gif
rename to trunk/workspace/BMC/Keyboard/P4_Keyboard.gif
diff --git a/trunk/workspace/BMC/pao_pos_p4.vkm b/trunk/workspace/BMC/Keyboard/Plus4/pao_pos_p4.vkm
similarity index 100%
rename from trunk/workspace/BMC/pao_pos_p4.vkm
rename to trunk/workspace/BMC/Keyboard/Plus4/pao_pos_p4.vkm
diff --git a/trunk/workspace/BMC/pao_sym_p4.vkm b/trunk/workspace/BMC/Keyboard/Plus4/pao_sym_p4.vkm
similarity index 100%
rename from trunk/workspace/BMC/pao_sym_p4.vkm
rename to trunk/workspace/BMC/Keyboard/Plus4/pao_sym_p4.vkm
diff --git a/trunk/workspace/BMC/Plus4/rpi_maxi_pos.vkm b/trunk/workspace/BMC/Keyboard/Plus4/rpi_maxi_pos.vkm
similarity index 100%
rename from trunk/workspace/BMC/Plus4/rpi_maxi_pos.vkm
rename to trunk/workspace/BMC/Keyboard/Plus4/rpi_maxi_pos.vkm
diff --git a/trunk/workspace/BMC/Plus4/rpi_pos.vkm b/trunk/workspace/BMC/Keyboard/Plus4/rpi_pos.vkm
similarity index 100%
rename from trunk/workspace/BMC/Plus4/rpi_pos.vkm
rename to trunk/workspace/BMC/Keyboard/Plus4/rpi_pos.vkm
diff --git a/trunk/workspace/BMC/rpi_pos_P4.vkm b/trunk/workspace/BMC/Keyboard/Plus4/rpi_pos_P4.vkm
similarity index 100%
rename from trunk/workspace/BMC/rpi_pos_P4.vkm
rename to trunk/workspace/BMC/Keyboard/Plus4/rpi_pos_P4.vkm
diff --git a/trunk/workspace/BMC/Plus4/rpi_sym.vkm b/trunk/workspace/BMC/Keyboard/Plus4/rpi_sym.vkm
similarity index 100%
rename from trunk/workspace/BMC/Plus4/rpi_sym.vkm
rename to trunk/workspace/BMC/Keyboard/Plus4/rpi_sym.vkm
diff --git a/trunk/workspace/BMC/key64_rp2040_default-v2.zip b/trunk/workspace/BMC/Keyboard/key64_rp2040_default-v2.zip
similarity index 100%
rename from trunk/workspace/BMC/key64_rp2040_default-v2.zip
rename to trunk/workspace/BMC/Keyboard/key64_rp2040_default-v2.zip
diff --git a/trunk/workspace/BMC/key64_rp2040_source.zip b/trunk/workspace/BMC/Keyboard/key64_rp2040_source.zip
similarity index 100%
rename from trunk/workspace/BMC/key64_rp2040_source.zip
rename to trunk/workspace/BMC/Keyboard/key64_rp2040_source.zip