diff --git a/assemblies/A1001_frame.fcstd b/assemblies/A1001_frame.fcstd
new file mode 100644
index 0000000..b56d16f
Binary files /dev/null and b/assemblies/A1001_frame.fcstd differ
diff --git a/assemblies/A1002_frame.fcstd b/assemblies/A1002_frame.fcstd
new file mode 100644
index 0000000..7511137
Binary files /dev/null and b/assemblies/A1002_frame.fcstd differ
diff --git a/assemblies/A1010_worm_gear.fcstd b/assemblies/A1010_worm_gear.fcstd
new file mode 100644
index 0000000..2c3cce2
Binary files /dev/null and b/assemblies/A1010_worm_gear.fcstd differ
diff --git a/assemblies/A1011_worm_mount.fcstd b/assemblies/A1011_worm_mount.fcstd
new file mode 100644
index 0000000..f11ad66
Binary files /dev/null and b/assemblies/A1011_worm_mount.fcstd differ
diff --git a/assemblies/A1020_endstop.fcstd b/assemblies/A1020_endstop.fcstd
new file mode 100644
index 0000000..e159ad2
Binary files /dev/null and b/assemblies/A1020_endstop.fcstd differ
diff --git a/assemblies/A1030_rotator_axis.fcstd b/assemblies/A1030_rotator_axis.fcstd
new file mode 100644
index 0000000..bb8a1f1
Binary files /dev/null and b/assemblies/A1030_rotator_axis.fcstd differ
diff --git a/assemblies/A1031_rotator_axis.fcstd b/assemblies/A1031_rotator_axis.fcstd
new file mode 100644
index 0000000..08aa141
Binary files /dev/null and b/assemblies/A1031_rotator_axis.fcstd differ
diff --git a/assemblies/A1032_bearing_side.fcstd b/assemblies/A1032_bearing_side.fcstd
new file mode 100644
index 0000000..c10534f
Binary files /dev/null and b/assemblies/A1032_bearing_side.fcstd differ
diff --git a/assemblies/A1033_encoder_gear.fcstd b/assemblies/A1033_encoder_gear.fcstd
new file mode 100644
index 0000000..d0e7a6f
Binary files /dev/null and b/assemblies/A1033_encoder_gear.fcstd differ
diff --git a/assemblies/as5601_mount_assembly.fcstd b/assemblies/A1041_encoder_mount.fcstd
similarity index 100%
rename from assemblies/as5601_mount_assembly.fcstd
rename to assemblies/A1041_encoder_mount.fcstd
diff --git a/assemblies/az_el_rotator.fcstd b/assemblies/A1050_az_el_rotator.fcstd
similarity index 61%
rename from assemblies/az_el_rotator.fcstd
rename to assemblies/A1050_az_el_rotator.fcstd
index 9f18721..4fd1da3 100644
Binary files a/assemblies/az_el_rotator.fcstd and b/assemblies/A1050_az_el_rotator.fcstd differ
diff --git a/assemblies/A1060_dc_motor.fcstd b/assemblies/A1060_dc_motor.fcstd
new file mode 100644
index 0000000..f9b835f
Binary files /dev/null and b/assemblies/A1060_dc_motor.fcstd differ
diff --git a/assemblies/rotator_assembly.fcstd b/assemblies/A1080_symmetric_axis.fcstd
similarity index 52%
rename from assemblies/rotator_assembly.fcstd
rename to assemblies/A1080_symmetric_axis.fcstd
index 2b32c69..40c2aeb 100644
Binary files a/assemblies/rotator_assembly.fcstd and b/assemblies/A1080_symmetric_axis.fcstd differ
diff --git a/assemblies/A1081_assymetric_axis.fcstd b/assemblies/A1081_assymetric_axis.fcstd
new file mode 100644
index 0000000..6ad5873
Binary files /dev/null and b/assemblies/A1081_assymetric_axis.fcstd differ
diff --git a/assemblies/axis_flange_assembly.fcstd b/assemblies/axis_flange_assembly.fcstd
deleted file mode 100644
index a01310b..0000000
Binary files a/assemblies/axis_flange_assembly.fcstd and /dev/null differ
diff --git a/assemblies/axis_gear_assembly.fcstd b/assemblies/axis_gear_assembly.fcstd
deleted file mode 100644
index 895cecf..0000000
Binary files a/assemblies/axis_gear_assembly.fcstd and /dev/null differ
diff --git a/assemblies/axis_side_assembly.fcstd b/assemblies/axis_side_assembly.fcstd
deleted file mode 100644
index 2161b68..0000000
Binary files a/assemblies/axis_side_assembly.fcstd and /dev/null differ
diff --git a/assemblies/dc_motor_assembly.fcstd b/assemblies/dc_motor_assembly.fcstd
deleted file mode 100644
index b426a8d..0000000
Binary files a/assemblies/dc_motor_assembly.fcstd and /dev/null differ
diff --git a/assemblies/frame.fcstd b/assemblies/frame.fcstd
deleted file mode 100644
index 67c4475..0000000
Binary files a/assemblies/frame.fcstd and /dev/null differ
diff --git a/assemblies/switch_endstop_assembly.fcstd b/assemblies/switch_endstop_assembly.fcstd
deleted file mode 100644
index c73373c..0000000
Binary files a/assemblies/switch_endstop_assembly.fcstd and /dev/null differ
diff --git a/assemblies/worm_gear_assembly.fcstd b/assemblies/worm_gear_assembly.fcstd
deleted file mode 100644
index b7a6aa6..0000000
Binary files a/assemblies/worm_gear_assembly.fcstd and /dev/null differ
diff --git a/cover/cover_bottom.fcstd b/cover/C1080_cover_bottom.fcstd
similarity index 100%
rename from cover/cover_bottom.fcstd
rename to cover/C1080_cover_bottom.fcstd
diff --git a/cover/cover_top.fcstd b/cover/C1081_cover_top.fcstd
similarity index 100%
rename from cover/cover_top.fcstd
rename to cover/C1081_cover_top.fcstd
diff --git a/cover/cover_side.fcstd b/cover/C1082-1_cover_side.fcstd
similarity index 100%
rename from cover/cover_side.fcstd
rename to cover/C1082-1_cover_side.fcstd
diff --git a/cover/C1082-3_cover_side.fcstd b/cover/C1082-3_cover_side.fcstd
new file mode 100644
index 0000000..e814cc9
Binary files /dev/null and b/cover/C1082-3_cover_side.fcstd differ
diff --git a/cover/rain_cover_tube.fcstd b/cover/C1083_shaft_seal.fcstd
similarity index 100%
rename from cover/rain_cover_tube.fcstd
rename to cover/C1083_shaft_seal.fcstd
diff --git a/cover/cover_side_mirror.fcstd b/cover/cover_side_mirror.fcstd
deleted file mode 100644
index 5254adf..0000000
Binary files a/cover/cover_side_mirror.fcstd and /dev/null differ
diff --git a/electronics/as5601_assembly.fcstd b/electronics/A1040_as5601_encoder.fcstd
similarity index 100%
rename from electronics/as5601_assembly.fcstd
rename to electronics/A1040_as5601_encoder.fcstd
diff --git a/electronics/A1070_aluminium_enclosure.fcstd b/electronics/A1070_aluminium_enclosure.fcstd
new file mode 100644
index 0000000..077b1a3
Binary files /dev/null and b/electronics/A1070_aluminium_enclosure.fcstd differ
diff --git a/electronics/as5601_case_1.fcstd b/electronics/C1090_encoder_case.fcstd
similarity index 100%
rename from electronics/as5601_case_1.fcstd
rename to electronics/C1090_encoder_case.fcstd
diff --git a/electronics/as5601_case_2.fcstd b/electronics/C1091_encoder_case.fcstd
similarity index 100%
rename from electronics/as5601_case_2.fcstd
rename to electronics/C1091_encoder_case.fcstd
diff --git a/electronics/as5601_case_3.fcstd b/electronics/C1092_encoder_case.fcstd
similarity index 100%
rename from electronics/as5601_case_3.fcstd
rename to electronics/C1092_encoder_case.fcstd
diff --git a/electronics/as5601_magnet_base.fcstd b/electronics/C1093_magnet_mount.fcstd
similarity index 100%
rename from electronics/as5601_magnet_base.fcstd
rename to electronics/C1093_magnet_mount.fcstd
diff --git a/electronics/as5601_pcb.fcstd b/electronics/C1094_pcb_as5601.fcstd
similarity index 100%
rename from electronics/as5601_pcb.fcstd
rename to electronics/C1094_pcb_as5601.fcstd
diff --git a/electronics/holder_as5601.fcstd b/electronics/C1095_encoder_mount.fcstd
similarity index 100%
rename from electronics/holder_as5601.fcstd
rename to electronics/C1095_encoder_mount.fcstd
diff --git a/electronics/off_axis_gear_as5601.fcstd b/electronics/C1096_encoder_gear.fcstd
similarity index 100%
rename from electronics/off_axis_gear_as5601.fcstd
rename to electronics/C1096_encoder_gear.fcstd
diff --git a/electronics/C1100_enclosure_pcb_mount.fcstd b/electronics/C1100_enclosure_pcb_mount.fcstd
new file mode 100644
index 0000000..01845f9
Binary files /dev/null and b/electronics/C1100_enclosure_pcb_mount.fcstd differ
diff --git a/electronics/as5601_axis_assembly.fcstd b/electronics/as5601_axis_assembly.fcstd
deleted file mode 100644
index 8d95279..0000000
Binary files a/electronics/as5601_axis_assembly.fcstd and /dev/null differ
diff --git a/electronics/electronics_case.fcstd b/electronics/electronics_case.fcstd
deleted file mode 100644
index a5d0dc0..0000000
Binary files a/electronics/electronics_case.fcstd and /dev/null differ
diff --git a/electronics/electronics_case_bottom.fcstd b/electronics/electronics_case_bottom.fcstd
deleted file mode 100644
index d521069..0000000
Binary files a/electronics/electronics_case_bottom.fcstd and /dev/null differ
diff --git a/electronics/electronics_case_pcb_mount.fcstd b/electronics/electronics_case_pcb_mount.fcstd
deleted file mode 100644
index 2190ea1..0000000
Binary files a/electronics/electronics_case_pcb_mount.fcstd and /dev/null differ
diff --git a/rotator_parts/C1001_symmetric_tube.fcstd b/rotator_parts/C1001_symmetric_tube.fcstd
new file mode 100644
index 0000000..54b86e0
Binary files /dev/null and b/rotator_parts/C1001_symmetric_tube.fcstd differ
diff --git a/rotator_parts/C1002_asymmetric_tube.fcstd b/rotator_parts/C1002_asymmetric_tube.fcstd
new file mode 100644
index 0000000..2af3142
Binary files /dev/null and b/rotator_parts/C1002_asymmetric_tube.fcstd differ
diff --git a/rotator_parts/axis_side.fcstd b/rotator_parts/C1010_shaft_side.fcstd
similarity index 100%
rename from rotator_parts/axis_side.fcstd
rename to rotator_parts/C1010_shaft_side.fcstd
diff --git a/rotator_parts/ball_bearing_housing.fcstd b/rotator_parts/C1011_shaft_bearing.fcstd
similarity index 100%
rename from rotator_parts/ball_bearing_housing.fcstd
rename to rotator_parts/C1011_shaft_bearing.fcstd
diff --git a/rotator_parts/axis_gear.fcstd b/rotator_parts/C1020_shaft_gear.fcstd
similarity index 100%
rename from rotator_parts/axis_gear.fcstd
rename to rotator_parts/C1020_shaft_gear.fcstd
diff --git a/rotator_parts/axis_gear_flange.fcstd b/rotator_parts/C1021_shaft_collar.fcstd
similarity index 100%
rename from rotator_parts/axis_gear_flange.fcstd
rename to rotator_parts/C1021_shaft_collar.fcstd
diff --git a/rotator_parts/axis_spacer.fcstd b/rotator_parts/C1022_shaft_spacer.fcstd
similarity index 100%
rename from rotator_parts/axis_spacer.fcstd
rename to rotator_parts/C1022_shaft_spacer.fcstd
diff --git a/rotator_parts/axis_gear_as5601.fcstd b/rotator_parts/C1040_encoder_gear.fcstd
similarity index 100%
rename from rotator_parts/axis_gear_as5601.fcstd
rename to rotator_parts/C1040_encoder_gear.fcstd
diff --git a/rotator_parts/homing_ring.fcstd b/rotator_parts/C1041_homing_pin.fcstd
similarity index 100%
rename from rotator_parts/homing_ring.fcstd
rename to rotator_parts/C1041_homing_pin.fcstd
diff --git a/rotator_parts/C1042_endstop_mount.fcstd b/rotator_parts/C1042_endstop_mount.fcstd
new file mode 100644
index 0000000..22dfe23
Binary files /dev/null and b/rotator_parts/C1042_endstop_mount.fcstd differ
diff --git a/rotator_parts/t_slot20_100.fcstd b/rotator_parts/C1050_tslot6_100.fcstd
similarity index 100%
rename from rotator_parts/t_slot20_100.fcstd
rename to rotator_parts/C1050_tslot6_100.fcstd
diff --git a/rotator_parts/t_slot20_160.fcstd b/rotator_parts/C1051_tslot6_160.fcstd
similarity index 100%
rename from rotator_parts/t_slot20_160.fcstd
rename to rotator_parts/C1051_tslot6_160.fcstd
diff --git a/rotator_parts/C1060_worn_shaft.fcstd b/rotator_parts/C1060_worn_shaft.fcstd
new file mode 100644
index 0000000..69dc5f5
Binary files /dev/null and b/rotator_parts/C1060_worn_shaft.fcstd differ
diff --git a/rotator_parts/worm_mount.fcstd b/rotator_parts/C1061-1_worm_mount.fcstd
similarity index 100%
rename from rotator_parts/worm_mount.fcstd
rename to rotator_parts/C1061-1_worm_mount.fcstd
diff --git a/rotator_parts/worm_mount_mirror.fcstd b/rotator_parts/C1061-3_worm_mount.fcstd
similarity index 100%
rename from rotator_parts/worm_mount_mirror.fcstd
rename to rotator_parts/C1061-3_worm_mount.fcstd
diff --git a/rotator_parts/worm_gear.fcstd b/rotator_parts/C1062_worm_gear.fcstd
similarity index 100%
rename from rotator_parts/worm_gear.fcstd
rename to rotator_parts/C1062_worm_gear.fcstd
diff --git a/rotator_parts/C1070_dc_motor_adapter.fcstd b/rotator_parts/C1070_dc_motor_adapter.fcstd
new file mode 100644
index 0000000..873c541
Binary files /dev/null and b/rotator_parts/C1070_dc_motor_adapter.fcstd differ
diff --git a/rotator_parts/dc_motor_cup.fcstd b/rotator_parts/C1071_dc_motor_cover.fcstd
similarity index 100%
rename from rotator_parts/dc_motor_cup.fcstd
rename to rotator_parts/C1071_dc_motor_cover.fcstd
diff --git a/rotator_parts/dc_motor_heatshrink.fcstd b/rotator_parts/C1072_dc_motor_cover.fcstd
similarity index 100%
rename from rotator_parts/dc_motor_heatshrink.fcstd
rename to rotator_parts/C1072_dc_motor_cover.fcstd
diff --git a/rotator_parts/axis_pipe_40mm.fcstd b/rotator_parts/axis_pipe_40mm.fcstd
deleted file mode 100644
index d654205..0000000
Binary files a/rotator_parts/axis_pipe_40mm.fcstd and /dev/null differ
diff --git a/rotator_parts/motor_mount_flange.fcstd b/rotator_parts/motor_mount_flange.fcstd
deleted file mode 100644
index 7663168..0000000
Binary files a/rotator_parts/motor_mount_flange.fcstd and /dev/null differ
diff --git a/rotator_parts/motor_mount_plastic.fcstd b/rotator_parts/motor_mount_plastic.fcstd
deleted file mode 100644
index b39da62..0000000
Binary files a/rotator_parts/motor_mount_plastic.fcstd and /dev/null differ
diff --git a/rotator_parts/switch_endstop_holder.fcstd b/rotator_parts/switch_endstop_holder.fcstd
deleted file mode 100644
index 92815dd..0000000
Binary files a/rotator_parts/switch_endstop_holder.fcstd and /dev/null differ
diff --git a/rotator_parts/t_slot20_connector.fcstd b/rotator_parts/t_slot20_connector.fcstd
deleted file mode 100644
index 238d486..0000000
Binary files a/rotator_parts/t_slot20_connector.fcstd and /dev/null differ
diff --git a/rotator_parts/worm_axis.fcstd b/rotator_parts/worm_axis.fcstd
deleted file mode 100644
index 96d879e..0000000
Binary files a/rotator_parts/worm_axis.fcstd and /dev/null differ
diff --git a/satnogs-mechanical-bom.ods b/satnogs-mechanical-bom.ods
index cdb628b..217a597 100644
Binary files a/satnogs-mechanical-bom.ods and b/satnogs-mechanical-bom.ods differ
diff --git a/shared/dc_motor_50:1.fcstd b/shared/H1001_dc_motor.fcstd
similarity index 100%
rename from shared/dc_motor_50:1.fcstd
rename to shared/H1001_dc_motor.fcstd
diff --git a/shared/motor_mount.fcstd b/shared/H1002_motor_mount.fcstd
similarity index 100%
rename from shared/motor_mount.fcstd
rename to shared/H1002_motor_mount.fcstd
diff --git a/shared/stepper_motor_nema17.fcstd b/shared/H1003_stepper_motor_nema17.fcstd
similarity index 100%
rename from shared/stepper_motor_nema17.fcstd
rename to shared/H1003_stepper_motor_nema17.fcstd
diff --git a/shared/ball_bearing_623ZZ.fcstd b/shared/H1010_623zz.fcstd
similarity index 100%
rename from shared/ball_bearing_623ZZ.fcstd
rename to shared/H1010_623zz.fcstd
diff --git a/shared/ball_bearing_625ZZ.fcstd b/shared/H1011_625zz.fcstd
similarity index 100%
rename from shared/ball_bearing_625ZZ.fcstd
rename to shared/H1011_625zz.fcstd
diff --git a/shared/ball_bearing_6008ZZ.fcstd b/shared/H1012_6008zz.fcstd
similarity index 100%
rename from shared/ball_bearing_6008ZZ.fcstd
rename to shared/H1012_6008zz.fcstd
diff --git a/shared/Inner_bracket_20_steel_B-Type_slot6.fcstd b/shared/H1020_Inner_bracket_btype_tslot6.fcstd
similarity index 100%
rename from shared/Inner_bracket_20_steel_B-Type_slot6.fcstd
rename to shared/H1020_Inner_bracket_btype_tslot6.fcstd
diff --git a/shared/nut_M5_DIN934.fcstd b/shared/H1030_nut_M5_din934.fcstd
similarity index 100%
rename from shared/nut_M5_DIN934.fcstd
rename to shared/H1030_nut_M5_din934.fcstd
diff --git a/shared/washer_M5_DIN125.fcstd b/shared/H1031_washer_M5_din125.fcstd
similarity index 100%
rename from shared/washer_M5_DIN125.fcstd
rename to shared/H1031_washer_M5_din125.fcstd
diff --git a/shared/timing_pulley_gt2_36T.fcstd b/shared/H1040_pulley_gt2_36T.fcstd
similarity index 100%
rename from shared/timing_pulley_gt2_36T.fcstd
rename to shared/H1040_pulley_gt2_36T.fcstd
diff --git a/shared/H1041-1_pulley_gt2_20T.fcstd b/shared/H1041-1_pulley_gt2_20T.fcstd
new file mode 100644
index 0000000..b4f62bd
Binary files /dev/null and b/shared/H1041-1_pulley_gt2_20T.fcstd differ
diff --git a/shared/H1041-2_pulley_gt2_20T.fcstd b/shared/H1041-2_pulley_gt2_20T.fcstd
new file mode 100644
index 0000000..2b863d3
Binary files /dev/null and b/shared/H1041-2_pulley_gt2_20T.fcstd differ
diff --git a/shared/switch_SS0505.fcstd b/shared/H1050_switch_SS0505.fcstd
similarity index 100%
rename from shared/switch_SS0505.fcstd
rename to shared/H1050_switch_SS0505.fcstd
diff --git a/shared/H1060_pg7_cable_gland.fcstd b/shared/H1060_pg7_cable_gland.fcstd
new file mode 100644
index 0000000..e2aef93
Binary files /dev/null and b/shared/H1060_pg7_cable_gland.fcstd differ
diff --git a/electronics/encoder_magnet.fcstd b/shared/H1070_diametric_magnet.fcstd
similarity index 100%
rename from electronics/encoder_magnet.fcstd
rename to shared/H1070_diametric_magnet.fcstd
diff --git a/shared/H1080-1_aluminium_enclosure.fcstd b/shared/H1080-1_aluminium_enclosure.fcstd
new file mode 100644
index 0000000..ac6edc9
Binary files /dev/null and b/shared/H1080-1_aluminium_enclosure.fcstd differ
diff --git a/electronics/electronics_case_top.fcstd b/shared/H1080-2_aluminium_enclosure.fcstd
similarity index 100%
rename from electronics/electronics_case_top.fcstd
rename to shared/H1080-2_aluminium_enclosure.fcstd
diff --git a/shared/washer_M3_DIN125.fcstd b/shared/H1090_washer_M3_din125.fcstd
similarity index 100%
rename from shared/washer_M3_DIN125.fcstd
rename to shared/H1090_washer_M3_din125.fcstd
diff --git a/shared/flat_head_screw_M3L10_DIN7991.fcstd b/shared/H1091_screw_M3L10_din7991.fcstd
similarity index 100%
rename from shared/flat_head_screw_M3L10_DIN7991.fcstd
rename to shared/H1091_screw_M3L10_din7991.fcstd
diff --git a/shared/standoff_hex_nylon_M3_L10_ff.fcstd b/shared/H1100_standoff_hex_nylon_M3_L10_ff.fcstd
similarity index 100%
rename from shared/standoff_hex_nylon_M3_L10_ff.fcstd
rename to shared/H1100_standoff_hex_nylon_M3_L10_ff.fcstd
diff --git a/shared/timing_pulley_gt2_20T.fcstd b/shared/timing_pulley_gt2_20T.fcstd
deleted file mode 100644
index 19f9234..0000000
Binary files a/shared/timing_pulley_gt2_20T.fcstd and /dev/null differ