diff --git a/hw/shell/sc64_shell_button_b3fs-101x.stl b/hw/shell/button/sc64_shell_button_b3fs-101x.stl
similarity index 100%
rename from hw/shell/sc64_shell_button_b3fs-101x.stl
rename to hw/shell/button/sc64_shell_button_b3fs-101x.stl
diff --git a/hw/shell/injection mold/sc64_shell_button_v3.step b/hw/shell/button/sc64_shell_button_b3fs-105x.step
similarity index 100%
rename from hw/shell/injection mold/sc64_shell_button_v3.step
rename to hw/shell/button/sc64_shell_button_b3fs-105x.step
diff --git a/hw/shell/sc64_button_with_end_stop.step b/hw/shell/button/sc64_shell_button_b3fs-105x_with_end_stop.step
similarity index 100%
rename from hw/shell/sc64_button_with_end_stop.step
rename to hw/shell/button/sc64_shell_button_b3fs-105x_with_end_stop.step
diff --git a/hw/shell/injection mold/sc64_shell-final_review.stp b/hw/shell/injection mold/sc64_shell.stp
similarity index 100%
rename from hw/shell/injection mold/sc64_shell-final_review.stp
rename to hw/shell/injection mold/sc64_shell.stp