diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/BMC64 VKM.zip b/trunk/workspace/BMC/Pimmodore-64/SRC/BMC64 VKM.zip
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/BMC64 VKM.zip
rename to trunk/workspace/BMC/Pimmodore-64/SRC/BMC64 VKM.zip
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040.zip b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040.zip
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040.zip
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040.zip
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/Makefile b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/Makefile
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/Makefile
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/Makefile
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/config.h b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/config.h
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/config.h
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/config.h
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/info.json b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/info.json
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/info.json
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/info.json
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/key64_rp2040.c b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/key64_rp2040.c
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/key64_rp2040.c
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/key64_rp2040.c
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/key64_rp2040.h b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/key64_rp2040.h
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/key64_rp2040.h
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/key64_rp2040.h
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/keyboard.json b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/keyboard.json
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/keyboard.json
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/keyboard.json
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.c b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.c
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.c
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.c
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.new.c b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.new.c
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.new.c
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/keymaps/default/keymap.new.c
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/readme.md b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/readme.md
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/readme.md
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/readme.md
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/rules.mk b/trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/rules.mk
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/QMK_key64_rp2040/key64_rp2040/rules.mk
rename to trunk/workspace/BMC/Pimmodore-64/SRC/QMK_key64_rp2040/key64_rp2040/rules.mk
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/README.md b/trunk/workspace/BMC/Pimmodore-64/SRC/README.md
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/README.md
rename to trunk/workspace/BMC/Pimmodore-64/SRC/README.md
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/VICE VKM.zip b/trunk/workspace/BMC/Pimmodore-64/SRC/VICE VKM.zip
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/VICE VKM.zip
rename to trunk/workspace/BMC/Pimmodore-64/SRC/VICE VKM.zip
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/key64_rp2040_common_anode.uf2 b/trunk/workspace/BMC/Pimmodore-64/SRC/key64_rp2040_common_anode.uf2
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/key64_rp2040_common_anode.uf2
rename to trunk/workspace/BMC/Pimmodore-64/SRC/key64_rp2040_common_anode.uf2
diff --git a/trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/key64_rp2040_common_cathode.uf2 b/trunk/workspace/BMC/Pimmodore-64/SRC/key64_rp2040_common_cathode.uf2
similarity index 100%
rename from trunk/workspace/BMC/Pimmodore-64/SRC/Keymmodore-64-1.0.0/Keymmodore-64-1.0.0/key64_rp2040_common_cathode.uf2
rename to trunk/workspace/BMC/Pimmodore-64/SRC/key64_rp2040_common_cathode.uf2