diff --git a/assemblies/A1001-1_frame.fcstd b/assemblies/A1001-1_frame.fcstd
new file mode 100644
index 0000000..1e51e73
Binary files /dev/null and b/assemblies/A1001-1_frame.fcstd differ
diff --git a/assemblies/A1002_frame.fcstd b/assemblies/A1001-3_frame.fcstd
similarity index 100%
rename from assemblies/A1002_frame.fcstd
rename to assemblies/A1001-3_frame.fcstd
diff --git a/assemblies/A1001_frame.fcstd b/assemblies/A1001_frame.fcstd
deleted file mode 100644
index b56d16f..0000000
Binary files a/assemblies/A1001_frame.fcstd and /dev/null differ
diff --git a/assemblies/A1010_worm_gear.fcstd b/assemblies/A1010-1_worm_gear.fcstd
similarity index 100%
rename from assemblies/A1010_worm_gear.fcstd
rename to assemblies/A1010-1_worm_gear.fcstd
diff --git a/assemblies/A1011_worm_mount.fcstd b/assemblies/A1011-1_worm_mount.fcstd
similarity index 100%
rename from assemblies/A1011_worm_mount.fcstd
rename to assemblies/A1011-1_worm_mount.fcstd
diff --git a/assemblies/A1020_endstop.fcstd b/assemblies/A1020-1_endstop.fcstd
similarity index 100%
rename from assemblies/A1020_endstop.fcstd
rename to assemblies/A1020-1_endstop.fcstd
diff --git a/assemblies/A1030_rotator_axis.fcstd b/assemblies/A1030-1_rotator_axis.fcstd
similarity index 100%
rename from assemblies/A1030_rotator_axis.fcstd
rename to assemblies/A1030-1_rotator_axis.fcstd
diff --git a/assemblies/A1031_rotator_axis.fcstd b/assemblies/A1030-3_rotator_axis.fcstd
similarity index 100%
rename from assemblies/A1031_rotator_axis.fcstd
rename to assemblies/A1030-3_rotator_axis.fcstd
diff --git a/assemblies/A1032_bearing_side.fcstd b/assemblies/A1032-1_bearing_side.fcstd
similarity index 100%
rename from assemblies/A1032_bearing_side.fcstd
rename to assemblies/A1032-1_bearing_side.fcstd
diff --git a/assemblies/A1033_encoder_gear.fcstd b/assemblies/A1033-1_encoder_gear.fcstd
similarity index 100%
rename from assemblies/A1033_encoder_gear.fcstd
rename to assemblies/A1033-1_encoder_gear.fcstd
diff --git a/assemblies/A1050_az_el_rotator.fcstd b/assemblies/A1050-1_az_el_rotator.fcstd
similarity index 100%
rename from assemblies/A1050_az_el_rotator.fcstd
rename to assemblies/A1050-1_az_el_rotator.fcstd
diff --git a/assemblies/A1060_dc_motor.fcstd b/assemblies/A1060-1_dc_motor.fcstd
similarity index 100%
rename from assemblies/A1060_dc_motor.fcstd
rename to assemblies/A1060-1_dc_motor.fcstd
diff --git a/assemblies/A1080_symmetric_axis.fcstd b/assemblies/A1080-1_symmetric_axis.fcstd
similarity index 100%
rename from assemblies/A1080_symmetric_axis.fcstd
rename to assemblies/A1080-1_symmetric_axis.fcstd
diff --git a/assemblies/A1081_assymetric_axis.fcstd b/assemblies/A1080-3_assymetric_axis.fcstd
similarity index 100%
rename from assemblies/A1081_assymetric_axis.fcstd
rename to assemblies/A1080-3_assymetric_axis.fcstd
diff --git a/part-number-list.ods b/part-number-list.ods
new file mode 100644
index 0000000..a66b1b8
Binary files /dev/null and b/part-number-list.ods differ
diff --git a/rotator-bom.ods b/rotator-bom.ods
new file mode 100644
index 0000000..3650a3e
Binary files /dev/null and b/rotator-bom.ods differ
diff --git a/rotator_parts/C1001_symmetric_tube.fcstd b/rotator_parts/C1001-1_symmetric_tube.fcstd
similarity index 100%
rename from rotator_parts/C1001_symmetric_tube.fcstd
rename to rotator_parts/C1001-1_symmetric_tube.fcstd
diff --git a/rotator_parts/C1002_asymmetric_tube.fcstd b/rotator_parts/C1001-3_asymmetric_tube.fcstd
similarity index 100%
rename from rotator_parts/C1002_asymmetric_tube.fcstd
rename to rotator_parts/C1001-3_asymmetric_tube.fcstd
diff --git a/rotator_parts/C1010_shaft_side.fcstd b/rotator_parts/C1010-1_shaft_side.fcstd
similarity index 100%
rename from rotator_parts/C1010_shaft_side.fcstd
rename to rotator_parts/C1010-1_shaft_side.fcstd
diff --git a/rotator_parts/C1011_shaft_bearing.fcstd b/rotator_parts/C1011-1_shaft_bearing.fcstd
similarity index 100%
rename from rotator_parts/C1011_shaft_bearing.fcstd
rename to rotator_parts/C1011-1_shaft_bearing.fcstd
diff --git a/rotator_parts/C1020_shaft_gear.fcstd b/rotator_parts/C1020-1_shaft_gear.fcstd
similarity index 100%
rename from rotator_parts/C1020_shaft_gear.fcstd
rename to rotator_parts/C1020-1_shaft_gear.fcstd
diff --git a/rotator_parts/C1021_shaft_collar.fcstd b/rotator_parts/C1021-1_shaft_collar.fcstd
similarity index 100%
rename from rotator_parts/C1021_shaft_collar.fcstd
rename to rotator_parts/C1021-1_shaft_collar.fcstd
diff --git a/rotator_parts/C1022_shaft_spacer.fcstd b/rotator_parts/C1022-1_shaft_spacer.fcstd
similarity index 100%
rename from rotator_parts/C1022_shaft_spacer.fcstd
rename to rotator_parts/C1022-1_shaft_spacer.fcstd
diff --git a/rotator_parts/C1040_encoder_gear.fcstd b/rotator_parts/C1040-1_encoder_gear.fcstd
similarity index 100%
rename from rotator_parts/C1040_encoder_gear.fcstd
rename to rotator_parts/C1040-1_encoder_gear.fcstd
diff --git a/rotator_parts/C1041_homing_pin.fcstd b/rotator_parts/C1041-1_homing_pin.fcstd
similarity index 100%
rename from rotator_parts/C1041_homing_pin.fcstd
rename to rotator_parts/C1041-1_homing_pin.fcstd
diff --git a/rotator_parts/C1042_endstop_mount.fcstd b/rotator_parts/C1042-1_endstop_mount.fcstd
similarity index 100%
rename from rotator_parts/C1042_endstop_mount.fcstd
rename to rotator_parts/C1042-1_endstop_mount.fcstd
diff --git a/rotator_parts/C1043-1_encoder_mount.fcstd b/rotator_parts/C1043-1_encoder_mount.fcstd
new file mode 100644
index 0000000..7a96222
Binary files /dev/null and b/rotator_parts/C1043-1_encoder_mount.fcstd differ
diff --git a/rotator_parts/C1050_tslot6_100.fcstd b/rotator_parts/C1050-1_tslot6_100.fcstd
similarity index 100%
rename from rotator_parts/C1050_tslot6_100.fcstd
rename to rotator_parts/C1050-1_tslot6_100.fcstd
diff --git a/rotator_parts/C1051_tslot6_160.fcstd b/rotator_parts/C1050-3_tslot6_160.fcstd
similarity index 100%
rename from rotator_parts/C1051_tslot6_160.fcstd
rename to rotator_parts/C1050-3_tslot6_160.fcstd
diff --git a/rotator_parts/C1060_worn_shaft.fcstd b/rotator_parts/C1060-1_worn_shaft.fcstd
similarity index 100%
rename from rotator_parts/C1060_worn_shaft.fcstd
rename to rotator_parts/C1060-1_worn_shaft.fcstd
diff --git a/rotator_parts/C1062_worm_gear.fcstd b/rotator_parts/C1062-1_worm_gear.fcstd
similarity index 100%
rename from rotator_parts/C1062_worm_gear.fcstd
rename to rotator_parts/C1062-1_worm_gear.fcstd
diff --git a/rotator_parts/C1070_dc_motor_adapter.fcstd b/rotator_parts/C1070-1_dc_motor_adapter.fcstd
similarity index 100%
rename from rotator_parts/C1070_dc_motor_adapter.fcstd
rename to rotator_parts/C1070-1_dc_motor_adapter.fcstd
diff --git a/rotator_parts/C1071_dc_motor_cover.fcstd b/rotator_parts/C1071-1_dc_motor_cover.fcstd
similarity index 100%
rename from rotator_parts/C1071_dc_motor_cover.fcstd
rename to rotator_parts/C1071-1_dc_motor_cover.fcstd
diff --git a/rotator_parts/C1072_dc_motor_cover.fcstd b/rotator_parts/C1072-1_dc_motor_cover.fcstd
similarity index 100%
rename from rotator_parts/C1072_dc_motor_cover.fcstd
rename to rotator_parts/C1072-1_dc_motor_cover.fcstd
diff --git a/cover/C1080_cover_bottom.fcstd b/rotator_parts/C1080-1_cover_bottom.fcstd
similarity index 100%
rename from cover/C1080_cover_bottom.fcstd
rename to rotator_parts/C1080-1_cover_bottom.fcstd
diff --git a/cover/C1081_cover_top.fcstd b/rotator_parts/C1081-1_cover_top.fcstd
similarity index 100%
rename from cover/C1081_cover_top.fcstd
rename to rotator_parts/C1081-1_cover_top.fcstd
diff --git a/cover/C1082-1_cover_side.fcstd b/rotator_parts/C1082-1_cover_side.fcstd
similarity index 100%
rename from cover/C1082-1_cover_side.fcstd
rename to rotator_parts/C1082-1_cover_side.fcstd
diff --git a/cover/C1082-3_cover_side.fcstd b/rotator_parts/C1082-3_cover_side.fcstd
similarity index 100%
rename from cover/C1082-3_cover_side.fcstd
rename to rotator_parts/C1082-3_cover_side.fcstd
diff --git a/cover/C1083_shaft_seal.fcstd b/rotator_parts/C1083-1_shaft_seal.fcstd
similarity index 100%
rename from cover/C1083_shaft_seal.fcstd
rename to rotator_parts/C1083-1_shaft_seal.fcstd
diff --git a/rotator_parts/C1095_encoder_mount.fcstd b/rotator_parts/C1095_encoder_mount.fcstd
deleted file mode 100644
index 29b6822..0000000
Binary files a/rotator_parts/C1095_encoder_mount.fcstd and /dev/null differ
diff --git a/satnogs-mechanical-bom.ods b/satnogs-mechanical-bom.ods
deleted file mode 100644
index 2444f76..0000000
Binary files a/satnogs-mechanical-bom.ods and /dev/null differ
diff --git a/shared/H1001_dc_motor.fcstd b/shared/H1001-1_dc_motor.fcstd
similarity index 100%
rename from shared/H1001_dc_motor.fcstd
rename to shared/H1001-1_dc_motor.fcstd
diff --git a/shared/H1002_motor_mount.fcstd b/shared/H1002-1_motor_mount.fcstd
similarity index 100%
rename from shared/H1002_motor_mount.fcstd
rename to shared/H1002-1_motor_mount.fcstd
diff --git a/shared/H1003_stepper_motor_nema17.fcstd b/shared/H1003-1_stepper_motor_nema17.fcstd
similarity index 100%
rename from shared/H1003_stepper_motor_nema17.fcstd
rename to shared/H1003-1_stepper_motor_nema17.fcstd
diff --git a/shared/H1011_625zz.fcstd b/shared/H1010-1_625zz.fcstd
similarity index 100%
rename from shared/H1011_625zz.fcstd
rename to shared/H1010-1_625zz.fcstd
diff --git a/shared/H1012_6008zz.fcstd b/shared/H1011-1_6008zz.fcstd
similarity index 100%
rename from shared/H1012_6008zz.fcstd
rename to shared/H1011-1_6008zz.fcstd
diff --git a/shared/H1020_Inner_bracket_btype_tslot6.fcstd b/shared/H1020-1_Inner_bracket_btype_tslot6.fcstd
similarity index 100%
rename from shared/H1020_Inner_bracket_btype_tslot6.fcstd
rename to shared/H1020-1_Inner_bracket_btype_tslot6.fcstd
diff --git a/shared/H1021-1_bType_nut 6_M4.fcstd b/shared/H1021-1_bType_nut 6_M4.fcstd
new file mode 100644
index 0000000..10443e7
Binary files /dev/null and b/shared/H1021-1_bType_nut 6_M4.fcstd differ
diff --git a/shared/H1030_nut_M5_din934.fcstd b/shared/H1030-1_nut_M5_din934.fcstd
similarity index 100%
rename from shared/H1030_nut_M5_din934.fcstd
rename to shared/H1030-1_nut_M5_din934.fcstd
diff --git a/shared/H1031_washer_M5_din125.fcstd b/shared/H1031-1_washer_M5_din125.fcstd
similarity index 100%
rename from shared/H1031_washer_M5_din125.fcstd
rename to shared/H1031-1_washer_M5_din125.fcstd
diff --git a/shared/H1040_pulley_gt2_36T.fcstd b/shared/H1040-1_pulley_gt2_36T.fcstd
similarity index 100%
rename from shared/H1040_pulley_gt2_36T.fcstd
rename to shared/H1040-1_pulley_gt2_36T.fcstd
diff --git a/shared/H1041-2_pulley_gt2_20T.fcstd b/shared/H1041-3_pulley_gt2_20T.fcstd
similarity index 100%
rename from shared/H1041-2_pulley_gt2_20T.fcstd
rename to shared/H1041-3_pulley_gt2_20T.fcstd
diff --git a/shared/H1050_switch_SS0505.fcstd b/shared/H1050-1_switch_SS0505.fcstd
similarity index 100%
rename from shared/H1050_switch_SS0505.fcstd
rename to shared/H1050-1_switch_SS0505.fcstd
diff --git a/shared/H1060_pg9_cable_gland.fcstd b/shared/H1060-1_pg9_cable_gland.fcstd
similarity index 100%
rename from shared/H1060_pg9_cable_gland.fcstd
rename to shared/H1060-1_pg9_cable_gland.fcstd
diff --git a/shared/H1070-1_nut_M3_din934.fcstd b/shared/H1070-1_nut_M3_din934.fcstd
new file mode 100644
index 0000000..c0636ba
Binary files /dev/null and b/shared/H1070-1_nut_M3_din934.fcstd differ
diff --git a/shared/H1080-1_nut_M4_din934.fcstd b/shared/H1080-1_nut_M4_din934.fcstd
new file mode 100644
index 0000000..68165e1
Binary files /dev/null and b/shared/H1080-1_nut_M4_din934.fcstd differ
diff --git a/shared/H1090-1_set_screw_M3L10_din916.fcstd b/shared/H1090-1_set_screw_M3L10_din916.fcstd
new file mode 100644
index 0000000..a6921ee
Binary files /dev/null and b/shared/H1090-1_set_screw_M3L10_din916.fcstd differ
diff --git a/shared/H1100-1_screw_M4L25_din912.fcstd b/shared/H1100-1_screw_M4L25_din912.fcstd
new file mode 100644
index 0000000..643d8ce
Binary files /dev/null and b/shared/H1100-1_screw_M4L25_din912.fcstd differ
diff --git a/shared/H1100-3_screw_M4L20_din912.fcstd b/shared/H1100-3_screw_M4L20_din912.fcstd
new file mode 100644
index 0000000..cbd2d7d
Binary files /dev/null and b/shared/H1100-3_screw_M4L20_din912.fcstd differ
diff --git a/shared/H1100-5_screw_M4L10_din912.fcstd b/shared/H1100-5_screw_M4L10_din912.fcstd
new file mode 100644
index 0000000..c654630
Binary files /dev/null and b/shared/H1100-5_screw_M4L10_din912.fcstd differ
diff --git a/shared/H1100-7_screw_M4L6_din912.fcstd b/shared/H1100-7_screw_M4L6_din912.fcstd
new file mode 100644
index 0000000..4c07660
Binary files /dev/null and b/shared/H1100-7_screw_M4L6_din912.fcstd differ
diff --git a/shared/H1110-1_washer_M4_din125.fcstd b/shared/H1110-1_washer_M4_din125.fcstd
new file mode 100644
index 0000000..d023b20
Binary files /dev/null and b/shared/H1110-1_washer_M4_din125.fcstd differ
diff --git a/shared/H1120-1_screw_M3L6_din912.fcstd b/shared/H1120-1_screw_M3L6_din912.fcstd
new file mode 100644
index 0000000..dc70385
Binary files /dev/null and b/shared/H1120-1_screw_M3L6_din912.fcstd differ
diff --git a/shared/H1120-3_screw_M3L12_din912.fcstd b/shared/H1120-3_screw_M3L12_din912.fcstd
new file mode 100644
index 0000000..f7ab6c2
Binary files /dev/null and b/shared/H1120-3_screw_M3L12_din912.fcstd differ
diff --git a/shared/H1130-1_washer_M3_din125.fcstd b/shared/H1130-1_washer_M3_din125.fcstd
new file mode 100644
index 0000000..2a78152
Binary files /dev/null and b/shared/H1130-1_washer_M3_din125.fcstd differ
diff --git a/shared/H1140-1_screw_M3L6_din965.fcstd b/shared/H1140-1_screw_M3L6_din965.fcstd
new file mode 100644
index 0000000..7c4d04e
Binary files /dev/null and b/shared/H1140-1_screw_M3L6_din965.fcstd differ