diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/Push_E-Switch_KS01Q01.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/Push_E-Switch_KS01Q01.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/Push_E-Switch_KS01Q01.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/Push_E-Switch_KS01Q01.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/Push_E-Switch_KS01Q01.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/Push_E-Switch_KS01Q01.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/Push_E-Switch_KS01Q01.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/Push_E-Switch_KS01Q01.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x10_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x10_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x12_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x12_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x1_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x1_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x1_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x1_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x1_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x1_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x1_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x1_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x2_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x2_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x3_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x3_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x4_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x4_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x5_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x5_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x6_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x6_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x7_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x7_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x8_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x8_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Piano.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Piano.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Piano.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Piano.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Piano.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Piano.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Piano.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Piano.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Slide.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Slide.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Slide.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Slide.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Slide.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Slide.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_DIP_x9_Slide.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_DIP_x9_Slide.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST_Angled.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST_Angled.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST_Angled.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST_Angled.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST_Angled.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST_Angled.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_Micro_SPST_Angled.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_Micro_SPST_Angled.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_NKK_G1xJP.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_NKK_G1xJP.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_NKK_G1xJP.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_NKK_G1xJP.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_NKK_G1xJP.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_NKK_G1xJP.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_NKK_G1xJP.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_NKK_G1xJP.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH-12mm.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH-12mm.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH-12mm.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH-12mm.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH-12mm.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH-12mm.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH-12mm.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH-12mm.wrl diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH.wings b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wings similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH.wings rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wings diff --git a/modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH.wrl b/modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wrl similarity index 100% rename from modules/packages3d/Buttons_Switches_ThroughHole/SW_PUSH.wrl rename to modules/packages3d/Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wrl diff --git a/modules/packages3d/Buzzers_Beepers/Buzzer_12x9.5RM7.6.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/Buzzer_12x9.5RM7.6.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/Buzzer_12x9.5RM7.6.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/Buzzer_12x9.5RM7.6.wings diff --git a/modules/packages3d/Buzzers_Beepers/Buzzer_12x9.5RM7.6.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/Buzzer_12x9.5RM7.6.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/Buzzer_12x9.5RM7.6.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/Buzzer_12x9.5RM7.6.wrl diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_Kingstate_KCG0601.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_Kingstate_KCG0601.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_Kingstate_KCG0601.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_Kingstate_KCG0601.wings diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_Kingstate_KCG0601.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_Kingstate_KCG0601.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_Kingstate_KCG0601.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_Kingstate_KCG0601.wrl diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-009-RC.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-009-RC.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-009-RC.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-009-RC.wings diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-009-RC.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-009-RC.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-009-RC.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-009-RC.wrl diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-010-RC.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-010-RC.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-010-RC.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-010-RC.wings diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-010-RC.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-010-RC.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABI-010-RC.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABI-010-RC.wrl diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABT-410-RC.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABT-410-RC.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABT-410-RC.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABT-410-RC.wings diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABT-410-RC.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABT-410-RC.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProSignal_ABT-410-RC.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProSignal_ABT-410-RC.wrl diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wings diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_ProjectsUnlimited_AI-4228-TWT-R.wrl diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wings b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wings similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wings rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wings diff --git a/modules/packages3d/Buzzers_Beepers/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wrl b/modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wrl similarity index 100% rename from modules/packages3d/Buzzers_Beepers/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wrl rename to modules/packages3d/Buzzers_Beepers.3dshapes/MagneticBuzzer_StarMicronics_HMB-06_HMB-12.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_0201.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_0201.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0201.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0201.wings diff --git a/modules/packages3d/Capacitors_SMD/C_0201.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_0201.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0201.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0201.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_0402.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0402.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wings diff --git a/modules/packages3d/Capacitors_SMD/C_0402.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0402.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_0603.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_0603.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0603.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0603.wings diff --git a/modules/packages3d/Capacitors_SMD/C_0603.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_0603.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0603.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0603.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_0603_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_0603_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0603_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0603_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_0603_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0603_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_0805.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_0805.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0805.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0805.wings diff --git a/modules/packages3d/Capacitors_SMD/C_0805.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_0805.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0805.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0805.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_0805_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_0805_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0805_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0805_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_0805_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_0805_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1206.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1206.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1206.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1206.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1206.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1206.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1206.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1206.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1206_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1206_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1206_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1206_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1206_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1206_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1206_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1206_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1210.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1210.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1210.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1210.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1210.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1210.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1210.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1210.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1210_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1210_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1210_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1210_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1210_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1210_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1210_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1210_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1812.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1812.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1812.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1812.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1812.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1812.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1812.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1812.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1812_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1812_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1812_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1812_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1812_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1812_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1812_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1812_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1825.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1825.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1825.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1825.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1825.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1825.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1825.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1825.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_1825_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_1825_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1825_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1825_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_1825_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_1825_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_1825_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_1825_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_2220.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_2220.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2220.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2220.wings diff --git a/modules/packages3d/Capacitors_SMD/C_2220.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_2220.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2220.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2220.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_2220_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_2220_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2220_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2220_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_2220_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_2220_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2220_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2220_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_2225.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_2225.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2225.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2225.wings diff --git a/modules/packages3d/Capacitors_SMD/C_2225.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_2225.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2225.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2225.wrl diff --git a/modules/packages3d/Capacitors_SMD/C_2225_HandSoldering.wings b/modules/packages3d/Capacitors_SMD.3dshapes/C_2225_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2225_HandSoldering.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2225_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_SMD/C_2225_HandSoldering.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/C_2225_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/C_2225_HandSoldering.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/C_2225_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_10x10.5.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.5.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_10x10.5.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.5.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_10x10.5.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_10x10.5.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.5.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_10x10.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_10x10.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_10x10.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_10x10.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x10.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_10x7.7.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x7.7.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_10x7.7.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x7.7.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_10x7.7.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x7.7.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_10x7.7.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_10x7.7.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_3x5.3.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_3x5.3.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_3x5.3.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_3x5.3.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_3x5.3.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_3x5.3.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_3x5.3.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_3x5.3.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x4.5.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x4.5.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x4.5.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x4.5.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x4.5.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x4.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x4.5.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x4.5.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x5.3.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.3.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x5.3.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.3.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x5.3.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.3.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x5.3.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.3.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x5.7.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.7.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x5.7.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.7.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x5.7.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.7.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x5.7.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.7.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x5.8.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.8.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x5.8.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.8.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_4x5.8.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.8.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_4x5.8.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_4x5.8.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x4.5.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x4.5.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x4.5.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x4.5.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x4.5.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x4.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x4.5.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x4.5.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x5.3.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.3.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x5.3.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.3.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x5.3.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.3.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x5.3.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.3.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x5.7.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.7.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x5.7.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.7.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x5.7.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.7.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x5.7.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.7.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x5.8.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.8.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x5.8.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.8.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_5x5.8.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.8.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_5x5.8.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_5x5.8.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x4.5.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x4.5.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x4.5.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x4.5.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x4.5.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x4.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x4.5.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x4.5.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x5.3.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.3.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x5.3.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.3.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x5.3.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.3.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x5.3.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.3.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x5.7.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.7.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x5.7.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.7.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x5.7.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.7.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x5.7.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.7.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x5.8.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.8.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x5.8.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.8.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x5.8.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.8.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x5.8.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x5.8.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x7.7.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x7.7.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x7.7.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x7.7.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_6.3x7.7.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x7.7.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_6.3x7.7.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_6.3x7.7.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x10.5.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.5.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x10.5.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.5.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x10.5.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x10.5.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.5.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x10.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x10.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x10.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x10.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x10.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x6.5.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.5.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x6.5.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.5.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x6.5.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x6.5.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.5.wrl diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x6.7.wings b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.7.wings similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x6.7.wings rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.7.wings diff --git a/modules/packages3d/Capacitors_SMD/c_elec_8x6.7.wrl b/modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.7.wrl similarity index 100% rename from modules/packages3d/Capacitors_SMD/c_elec_8x6.7.wrl rename to modules/packages3d/Capacitors_SMD.3dshapes/c_elec_8x6.7.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_HandSoldering.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_HandSoldering.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_HandSoldering.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_HandSoldering.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Reflow.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Reflow.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Reflow.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Reflow.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Reflow.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Reflow.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Reflow.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Reflow.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Wave.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Wave.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Wave.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Wave.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Wave.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Wave.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeA_EIA-3216_Wave.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeA_EIA-3216_Wave.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_HandSoldering.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_HandSoldering.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_HandSoldering.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_HandSoldering.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Reflow.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Reflow.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Reflow.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Reflow.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Reflow.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Reflow.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Reflow.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Reflow.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Wave.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Wave.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Wave.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Wave.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Wave.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Wave.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeB_EIA-3528_Wave.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeB_EIA-3528_Wave.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_HandSoldering.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_HandSoldering.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_HandSoldering.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_HandSoldering.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Reflow.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Reflow.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Reflow.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Reflow.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Reflow.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Reflow.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Reflow.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Reflow.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Wave.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Wave.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Wave.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Wave.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Wave.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Wave.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeC_EIA-6032_Wave.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeC_EIA-6032_Wave.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_HandSoldering.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_HandSoldering.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_HandSoldering.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_HandSoldering.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Reflow.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Reflow.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Reflow.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Reflow.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Reflow.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Reflow.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Reflow.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Reflow.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Wave.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Wave.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Wave.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Wave.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Wave.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Wave.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeD_EIA-7343_Wave.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeD_EIA-7343_Wave.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_HandSoldering.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_HandSoldering.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_HandSoldering.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_HandSoldering.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_HandSoldering.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_HandSoldering.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_HandSoldering.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Reflow.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Reflow.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Reflow.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Reflow.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Reflow.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Reflow.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Reflow.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Reflow.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Wave.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Wave.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Wave.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Wave.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Wave.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Wave.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeE_EIA-7360_Wave.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeE_EIA-7360_Wave.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeR_EIA-2012.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeR_EIA-2012.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeR_EIA-2012.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeR_EIA-2012.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeR_EIA-2012.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeR_EIA-2012.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeR_EIA-2012.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeR_EIA-2012.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeS_EIA-3216.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeS_EIA-3216.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeS_EIA-3216.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeS_EIA-3216.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeS_EIA-3216.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeS_EIA-3216.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeS_EIA-3216.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeS_EIA-3216.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeT_EIA-3528.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeT_EIA-3528.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeT_EIA-3528.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeT_EIA-3528.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeT_EIA-3528.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeT_EIA-3528.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeT_EIA-3528.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeT_EIA-3528.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeU_EIA-6032.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeU_EIA-6032.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeU_EIA-6032.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeU_EIA-6032.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeU_EIA-6032.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeU_EIA-6032.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeU_EIA-6032.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeU_EIA-6032.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeV_EIA-7343.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeV_EIA-7343.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeV_EIA-7343.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeV_EIA-7343.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeV_EIA-7343.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeV_EIA-7343.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeV_EIA-7343.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeV_EIA-7343.wrl diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeX_EIA-7343.wings b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeX_EIA-7343.wings similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeX_EIA-7343.wings rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeX_EIA-7343.wings diff --git a/modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeX_EIA-7343.wrl b/modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeX_EIA-7343.wrl similarity index 100% rename from modules/packages3d/Capacitors_Tantalum_SMD/TantalC_SizeX_EIA-7343.wrl rename to modules/packages3d/Capacitors_Tantalum_SMD.3dshapes/TantalC_SizeX_EIA-7343.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D13_L31_P38.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D13_L31_P38.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D13_L31_P38.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D13_L31_P38.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D13_L31_P38.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D13_L31_P38.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D13_L31_P38.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D13_L31_P38.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L31_P38.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L31_P38.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L31_P38.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L31_P38.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L31_P38.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L31_P38.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L31_P38.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L31_P38.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L40_P48.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L40_P48.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L40_P48.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L40_P48.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L40_P48.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L40_P48.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D16_L40_P48.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D16_L40_P48.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D5_L11_P18.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D5_L11_P18.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D5_L11_P18.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D5_L11_P18.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D5_L11_P18.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D5_L11_P18.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D5_L11_P18.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D5_L11_P18.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D6_L11_P18.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D6_L11_P18.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D6_L11_P18.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D6_L11_P18.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D6_L11_P18.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D6_L11_P18.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D6_L11_P18.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D6_L11_P18.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D8_L21_P28.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D8_L21_P28.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D8_L21_P28.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D8_L21_P28.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Axial_D8_L21_P28.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D8_L21_P28.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Axial_D8_L21_P28.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Axial_D8_L21_P28.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D12_P7.75.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D12_P7.75.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D12_P7.75.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D12_P7.75.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D12_P7.75.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D12_P7.75.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D12_P7.75.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D12_P7.75.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D3_P2.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D3_P2.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D3_P2.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D3_P2.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D3_P2.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D3_P2.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D3_P2.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D3_P2.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D6_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D6_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D6_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D6_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D6_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D6_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D6_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D6_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D7.5_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D7.5_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D7.5_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D7.5_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Disc_D7.5_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D7.5_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Disc_D7.5_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Disc_D7.5_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L13_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L13_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L13_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L13_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L13_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L13_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L13_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L13_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L16_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L16_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L16_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L16_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L16_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L16_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L16_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L16_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P2.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P2.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P2.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P2.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P2.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P2.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P2.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P2.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P7.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P7.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P7.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P7.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P7.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P7.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L20_P7.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L20_P7.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L21_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L21_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L21_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L21_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L21_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L21_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L21_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L21_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L25_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L25_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L25_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L25_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L25_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L25_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D10_L25_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D10_L25_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D12.5_L25_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D12.5_L25_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D12.5_L25_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D12.5_L25_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D12.5_L25_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D12.5_L25_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D12.5_L25_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D12.5_L25_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L21_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L21_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L21_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L21_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L21_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L21_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L21_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L21_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L25_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L25_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L25_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L25_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L25_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L25_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D13_L25_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D13_L25_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D14_L31.5_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D14_L31.5_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D14_L31.5_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D14_L31.5_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D14_L31.5_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D14_L31.5_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D14_L31.5_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D14_L31.5_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L25_P7.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L25_P7.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L25_P7.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L25_P7.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L25_P7.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L25_P7.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L25_P7.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L25_P7.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L30_P7.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L30_P7.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L30_P7.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L30_P7.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L30_P7.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L30_P7.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L30_P7.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L30_P7.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L31.5_P7.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L31.5_P7.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L31.5_P7.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L31.5_P7.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L31.5_P7.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L31.5_P7.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D16_L31.5_P7.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D16_L31.5_P7.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D22_L41_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D22_L41_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D22_L41_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D22_L41_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D22_L41_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D22_L41_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D22_L41_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D22_L41_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L31_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L31_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L31_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L31_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L31_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L31_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L31_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L31_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L45_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L45_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L45_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L45_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L45_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L45_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D26_L45_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D26_L45_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D30_L51_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D30_L51_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D30_L51_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D30_L51_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D30_L51_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D30_L51_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D30_L51_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D30_L51_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D35_L51_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D35_L51_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D35_L51_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D35_L51_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D35_L51_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D35_L51_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D35_L51_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D35_L51_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L11_P2.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L11_P2.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L6_P2.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L6_P2.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L6_P2.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L6_P2.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L6_P2.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L6_P2.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D5_L6_P2.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D5_L6_P2.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D6.3_L11.2_P2.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D6.3_L11.2_P2.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D6.3_L11.2_P2.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D6.3_L11.2_P2.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D6.3_L11.2_P2.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D6.3_L11.2_P2.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D6.3_L11.2_P2.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D6.3_L11.2_P2.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D7.5_L11.2_P2.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D7.5_L11.2_P2.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D7.5_L11.2_P2.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D7.5_L11.2_P2.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D7.5_L11.2_P2.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D7.5_L11.2_P2.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D7.5_L11.2_P2.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D7.5_L11.2_P2.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L11.5_P3.5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L11.5_P3.5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L11.5_P3.5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L11.5_P3.5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L11.5_P3.5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L11.5_P3.5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L11.5_P3.5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L11.5_P3.5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L13_P3.8.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L13_P3.8.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L13_P3.8.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L13_P3.8.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L13_P3.8.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L13_P3.8.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L13_P3.8.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L13_P3.8.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L21_P3.8.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L21_P3.8.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L21_P3.8.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L21_P3.8.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L21_P3.8.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L21_P3.8.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Radial_D8_L21_P3.8.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Radial_D8_L21_P3.8.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W4_H9_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W4_H9_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W4_H9_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W4_H9_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W4_H9_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W4_H9_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W4_H9_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W4_H9_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W6_H12_P10.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W6_H12_P10.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W6_H12_P10.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W6_H12_P10.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W6_H12_P10.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W6_H12_P10.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L13_W6_H12_P10.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L13_W6_H12_P10.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W11_H19_P15.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W11_H19_P15.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W11_H19_P15.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W11_H19_P15.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W11_H19_P15.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W11_H19_P15.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W11_H19_P15.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W11_H19_P15.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_H12_P15.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_H12_P15.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_H12_P15.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_H12_P15.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_H12_P15.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_H12_P15.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_H12_P15.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_H12_P15.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_P15.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_P15.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_P15.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_P15.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_P15.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_P15.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W6_P15.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W6_P15.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W8_H15_P15.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W8_H15_P15.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W8_H15_P15.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W8_H15_P15.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W8_H15_P15.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W8_H15_P15.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W8_H15_P15.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W8_H15_P15.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W9_H15_P15.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W9_H15_P15.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W9_H15_P15.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W9_H15_P15.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W9_H15_P15.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W9_H15_P15.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L18_W9_H15_P15.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L18_W9_H15_P15.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L27_W9_H17_P23.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L27_W9_H17_P23.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L27_W9_H17_P23.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L27_W9_H17_P23.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L27_W9_H17_P23.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L27_W9_H17_P23.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L27_W9_H17_P23.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L27_W9_H17_P23.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W2_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W2_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W2_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W2_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W2_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W2_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W2_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W2_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W4.5_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W4.5_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W4.5_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W4.5_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W4.5_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W4.5_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W4.5_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W4.5_P5.wrl diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W6_P5.wings b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W6_P5.wings similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W6_P5.wings rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W6_P5.wings diff --git a/modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W6_P5.wrl b/modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W6_P5.wrl similarity index 100% rename from modules/packages3d/Capacitors_ThroughHole/C_Rect_L7_W6_P5.wrl rename to modules/packages3d/Capacitors_ThroughHole.3dshapes/C_Rect_L7_W6_P5.wrl diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h4.5mm.wings b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h4.5mm.wings similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h4.5mm.wings rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h4.5mm.wings diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h4.5mm.wrl b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h4.5mm.wrl similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h4.5mm.wrl rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h4.5mm.wrl diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h6mm.wings b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h6mm.wings similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h6mm.wings rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h6mm.wings diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h6mm.wrl b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h6mm.wrl similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h6mm.wrl rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h6mm.wrl diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h8mm.wings b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h8mm.wings similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h8mm.wings rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h8mm.wings diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h8mm.wrl b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h8mm.wrl similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_12x12mm_h8mm.wrl rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_12x12mm_h8mm.wrl diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wings b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wings similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wings rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wings diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wrl b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wrl similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wrl rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX-Handsoldering.wrl diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX.wings b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX.wings similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX.wings rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX.wings diff --git a/modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX.wrl b/modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX.wrl similarity index 100% rename from modules/packages3d/Choke_SMD/Choke_SMD_Taiyo_NRS50XX.wrl rename to modules/packages3d/Choke_SMD.3dshapes/Choke_SMD_Taiyo_NRS50XX.wrl diff --git a/modules/packages3d/Choke_Toroid_ThroughHole/Choke_Toroid_15x40mm.wings b/modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_15x40mm.wings similarity index 100% rename from modules/packages3d/Choke_Toroid_ThroughHole/Choke_Toroid_15x40mm.wings rename to modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_15x40mm.wings diff --git a/modules/packages3d/Choke_Toroid_ThroughHole/Choke_Toroid_15x40mm.wrl b/modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_15x40mm.wrl similarity index 100% rename from modules/packages3d/Choke_Toroid_ThroughHole/Choke_Toroid_15x40mm.wrl rename to modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_15x40mm.wrl diff --git a/modules/packages3d/Connect/C96ABCFD.wings b/modules/packages3d/Connect.3dshapes/C96ABCFD.wings similarity index 100% rename from modules/packages3d/Connect/C96ABCFD.wings rename to modules/packages3d/Connect.3dshapes/C96ABCFD.wings diff --git a/modules/packages3d/Connect/C96ABCFD.wrl b/modules/packages3d/Connect.3dshapes/C96ABCFD.wrl similarity index 100% rename from modules/packages3d/Connect/C96ABCFD.wrl rename to modules/packages3d/Connect.3dshapes/C96ABCFD.wrl diff --git a/modules/packages3d/Connect/C96ABCMD.wings b/modules/packages3d/Connect.3dshapes/C96ABCMD.wings similarity index 100% rename from modules/packages3d/Connect/C96ABCMD.wings rename to modules/packages3d/Connect.3dshapes/C96ABCMD.wings diff --git a/modules/packages3d/Connect/C96ABCMD.wrl b/modules/packages3d/Connect.3dshapes/C96ABCMD.wrl similarity index 100% rename from modules/packages3d/Connect/C96ABCMD.wrl rename to modules/packages3d/Connect.3dshapes/C96ABCMD.wrl diff --git a/modules/packages3d/Connect/DB15FC.wings b/modules/packages3d/Connect.3dshapes/DB15FC.wings similarity index 100% rename from modules/packages3d/Connect/DB15FC.wings rename to modules/packages3d/Connect.3dshapes/DB15FC.wings diff --git a/modules/packages3d/Connect/DB15FC.wrl b/modules/packages3d/Connect.3dshapes/DB15FC.wrl similarity index 100% rename from modules/packages3d/Connect/DB15FC.wrl rename to modules/packages3d/Connect.3dshapes/DB15FC.wrl diff --git a/modules/packages3d/Connect/DB15FD.wings b/modules/packages3d/Connect.3dshapes/DB15FD.wings similarity index 100% rename from modules/packages3d/Connect/DB15FD.wings rename to modules/packages3d/Connect.3dshapes/DB15FD.wings diff --git a/modules/packages3d/Connect/DB15FD.wrl b/modules/packages3d/Connect.3dshapes/DB15FD.wrl similarity index 100% rename from modules/packages3d/Connect/DB15FD.wrl rename to modules/packages3d/Connect.3dshapes/DB15FD.wrl diff --git a/modules/packages3d/Connect/DB15F_CI.wings b/modules/packages3d/Connect.3dshapes/DB15F_CI.wings similarity index 100% rename from modules/packages3d/Connect/DB15F_CI.wings rename to modules/packages3d/Connect.3dshapes/DB15F_CI.wings diff --git a/modules/packages3d/Connect/DB15F_CI.wrl b/modules/packages3d/Connect.3dshapes/DB15F_CI.wrl similarity index 100% rename from modules/packages3d/Connect/DB15F_CI.wrl rename to modules/packages3d/Connect.3dshapes/DB15F_CI.wrl diff --git a/modules/packages3d/Connect/DB15MC.wings b/modules/packages3d/Connect.3dshapes/DB15MC.wings similarity index 100% rename from modules/packages3d/Connect/DB15MC.wings rename to modules/packages3d/Connect.3dshapes/DB15MC.wings diff --git a/modules/packages3d/Connect/DB15MC.wrl b/modules/packages3d/Connect.3dshapes/DB15MC.wrl similarity index 100% rename from modules/packages3d/Connect/DB15MC.wrl rename to modules/packages3d/Connect.3dshapes/DB15MC.wrl diff --git a/modules/packages3d/Connect/DB15MD.wings b/modules/packages3d/Connect.3dshapes/DB15MD.wings similarity index 100% rename from modules/packages3d/Connect/DB15MD.wings rename to modules/packages3d/Connect.3dshapes/DB15MD.wings diff --git a/modules/packages3d/Connect/DB15MD.wrl b/modules/packages3d/Connect.3dshapes/DB15MD.wrl similarity index 100% rename from modules/packages3d/Connect/DB15MD.wrl rename to modules/packages3d/Connect.3dshapes/DB15MD.wrl diff --git a/modules/packages3d/Connect/DB15M_CI.wings b/modules/packages3d/Connect.3dshapes/DB15M_CI.wings similarity index 100% rename from modules/packages3d/Connect/DB15M_CI.wings rename to modules/packages3d/Connect.3dshapes/DB15M_CI.wings diff --git a/modules/packages3d/Connect/DB15M_CI.wrl b/modules/packages3d/Connect.3dshapes/DB15M_CI.wrl similarity index 100% rename from modules/packages3d/Connect/DB15M_CI.wrl rename to modules/packages3d/Connect.3dshapes/DB15M_CI.wrl diff --git a/modules/packages3d/Connect/DB25FC.wings b/modules/packages3d/Connect.3dshapes/DB25FC.wings similarity index 100% rename from modules/packages3d/Connect/DB25FC.wings rename to modules/packages3d/Connect.3dshapes/DB25FC.wings diff --git a/modules/packages3d/Connect/DB25FC.wrl b/modules/packages3d/Connect.3dshapes/DB25FC.wrl similarity index 100% rename from modules/packages3d/Connect/DB25FC.wrl rename to modules/packages3d/Connect.3dshapes/DB25FC.wrl diff --git a/modules/packages3d/Connect/DB25FD.wings b/modules/packages3d/Connect.3dshapes/DB25FD.wings similarity index 100% rename from modules/packages3d/Connect/DB25FD.wings rename to modules/packages3d/Connect.3dshapes/DB25FD.wings diff --git a/modules/packages3d/Connect/DB25FD.wrl b/modules/packages3d/Connect.3dshapes/DB25FD.wrl similarity index 100% rename from modules/packages3d/Connect/DB25FD.wrl rename to modules/packages3d/Connect.3dshapes/DB25FD.wrl diff --git a/modules/packages3d/Connect/DB25F_CI.wings b/modules/packages3d/Connect.3dshapes/DB25F_CI.wings similarity index 100% rename from modules/packages3d/Connect/DB25F_CI.wings rename to modules/packages3d/Connect.3dshapes/DB25F_CI.wings diff --git a/modules/packages3d/Connect/DB25F_CI.wrl b/modules/packages3d/Connect.3dshapes/DB25F_CI.wrl similarity index 100% rename from modules/packages3d/Connect/DB25F_CI.wrl rename to modules/packages3d/Connect.3dshapes/DB25F_CI.wrl diff --git a/modules/packages3d/Connect/DB25MC.wings b/modules/packages3d/Connect.3dshapes/DB25MC.wings similarity index 100% rename from modules/packages3d/Connect/DB25MC.wings rename to modules/packages3d/Connect.3dshapes/DB25MC.wings diff --git a/modules/packages3d/Connect/DB25MC.wrl b/modules/packages3d/Connect.3dshapes/DB25MC.wrl similarity index 100% rename from modules/packages3d/Connect/DB25MC.wrl rename to modules/packages3d/Connect.3dshapes/DB25MC.wrl diff --git a/modules/packages3d/Connect/DB25MD.wings b/modules/packages3d/Connect.3dshapes/DB25MD.wings similarity index 100% rename from modules/packages3d/Connect/DB25MD.wings rename to modules/packages3d/Connect.3dshapes/DB25MD.wings diff --git a/modules/packages3d/Connect/DB25MD.wrl b/modules/packages3d/Connect.3dshapes/DB25MD.wrl similarity index 100% rename from modules/packages3d/Connect/DB25MD.wrl rename to modules/packages3d/Connect.3dshapes/DB25MD.wrl diff --git a/modules/packages3d/Connect/DB25M_CI.wings b/modules/packages3d/Connect.3dshapes/DB25M_CI.wings similarity index 100% rename from modules/packages3d/Connect/DB25M_CI.wings rename to modules/packages3d/Connect.3dshapes/DB25M_CI.wings diff --git a/modules/packages3d/Connect/DB25M_CI.wrl b/modules/packages3d/Connect.3dshapes/DB25M_CI.wrl similarity index 100% rename from modules/packages3d/Connect/DB25M_CI.wrl rename to modules/packages3d/Connect.3dshapes/DB25M_CI.wrl diff --git a/modules/packages3d/Connect/DB37FC.wings b/modules/packages3d/Connect.3dshapes/DB37FC.wings similarity index 100% rename from modules/packages3d/Connect/DB37FC.wings rename to modules/packages3d/Connect.3dshapes/DB37FC.wings diff --git a/modules/packages3d/Connect/DB37FC.wrl b/modules/packages3d/Connect.3dshapes/DB37FC.wrl similarity index 100% rename from modules/packages3d/Connect/DB37FC.wrl rename to modules/packages3d/Connect.3dshapes/DB37FC.wrl diff --git a/modules/packages3d/Connect/DB9FC.wings b/modules/packages3d/Connect.3dshapes/DB9FC.wings similarity index 100% rename from modules/packages3d/Connect/DB9FC.wings rename to modules/packages3d/Connect.3dshapes/DB9FC.wings diff --git a/modules/packages3d/Connect/DB9FC.wrl b/modules/packages3d/Connect.3dshapes/DB9FC.wrl similarity index 100% rename from modules/packages3d/Connect/DB9FC.wrl rename to modules/packages3d/Connect.3dshapes/DB9FC.wrl diff --git a/modules/packages3d/Connect/DB9FD.wings b/modules/packages3d/Connect.3dshapes/DB9FD.wings similarity index 100% rename from modules/packages3d/Connect/DB9FD.wings rename to modules/packages3d/Connect.3dshapes/DB9FD.wings diff --git a/modules/packages3d/Connect/DB9FD.wrl b/modules/packages3d/Connect.3dshapes/DB9FD.wrl similarity index 100% rename from modules/packages3d/Connect/DB9FD.wrl rename to modules/packages3d/Connect.3dshapes/DB9FD.wrl diff --git a/modules/packages3d/Connect/DB9F_CI.wings b/modules/packages3d/Connect.3dshapes/DB9F_CI.wings similarity index 100% rename from modules/packages3d/Connect/DB9F_CI.wings rename to modules/packages3d/Connect.3dshapes/DB9F_CI.wings diff --git a/modules/packages3d/Connect/DB9F_CI.wrl b/modules/packages3d/Connect.3dshapes/DB9F_CI.wrl similarity index 100% rename from modules/packages3d/Connect/DB9F_CI.wrl rename to modules/packages3d/Connect.3dshapes/DB9F_CI.wrl diff --git a/modules/packages3d/Connect/DB9F_CI_INVERT.wings b/modules/packages3d/Connect.3dshapes/DB9F_CI_INVERT.wings similarity index 100% rename from modules/packages3d/Connect/DB9F_CI_INVERT.wings rename to modules/packages3d/Connect.3dshapes/DB9F_CI_INVERT.wings diff --git a/modules/packages3d/Connect/DB9F_CI_INVERT.wrl b/modules/packages3d/Connect.3dshapes/DB9F_CI_INVERT.wrl similarity index 100% rename from modules/packages3d/Connect/DB9F_CI_INVERT.wrl rename to modules/packages3d/Connect.3dshapes/DB9F_CI_INVERT.wrl diff --git a/modules/packages3d/Connect/DB9MC.wings b/modules/packages3d/Connect.3dshapes/DB9MC.wings similarity index 100% rename from modules/packages3d/Connect/DB9MC.wings rename to modules/packages3d/Connect.3dshapes/DB9MC.wings diff --git a/modules/packages3d/Connect/DB9MC.wrl b/modules/packages3d/Connect.3dshapes/DB9MC.wrl similarity index 100% rename from modules/packages3d/Connect/DB9MC.wrl rename to modules/packages3d/Connect.3dshapes/DB9MC.wrl diff --git a/modules/packages3d/Connect/DB9MD.wings b/modules/packages3d/Connect.3dshapes/DB9MD.wings similarity index 100% rename from modules/packages3d/Connect/DB9MD.wings rename to modules/packages3d/Connect.3dshapes/DB9MD.wings diff --git a/modules/packages3d/Connect/DB9MD.wrl b/modules/packages3d/Connect.3dshapes/DB9MD.wrl similarity index 100% rename from modules/packages3d/Connect/DB9MD.wrl rename to modules/packages3d/Connect.3dshapes/DB9MD.wrl diff --git a/modules/packages3d/Connect/DB9M_CI.wings b/modules/packages3d/Connect.3dshapes/DB9M_CI.wings similarity index 100% rename from modules/packages3d/Connect/DB9M_CI.wings rename to modules/packages3d/Connect.3dshapes/DB9M_CI.wings diff --git a/modules/packages3d/Connect/DB9M_CI.wrl b/modules/packages3d/Connect.3dshapes/DB9M_CI.wrl similarity index 100% rename from modules/packages3d/Connect/DB9M_CI.wrl rename to modules/packages3d/Connect.3dshapes/DB9M_CI.wrl diff --git a/modules/packages3d/Connect/DB9M_CI_INVERT.wings b/modules/packages3d/Connect.3dshapes/DB9M_CI_INVERT.wings similarity index 100% rename from modules/packages3d/Connect/DB9M_CI_INVERT.wings rename to modules/packages3d/Connect.3dshapes/DB9M_CI_INVERT.wings diff --git a/modules/packages3d/Connect/DB9M_CI_INVERT.wrl b/modules/packages3d/Connect.3dshapes/DB9M_CI_INVERT.wrl similarity index 100% rename from modules/packages3d/Connect/DB9M_CI_INVERT.wrl rename to modules/packages3d/Connect.3dshapes/DB9M_CI_INVERT.wrl diff --git a/modules/packages3d/Connect/HE10_20D.wings b/modules/packages3d/Connect.3dshapes/HE10_20D.wings similarity index 100% rename from modules/packages3d/Connect/HE10_20D.wings rename to modules/packages3d/Connect.3dshapes/HE10_20D.wings diff --git a/modules/packages3d/Connect/HE10_20D.wrl b/modules/packages3d/Connect.3dshapes/HE10_20D.wrl similarity index 100% rename from modules/packages3d/Connect/HE10_20D.wrl rename to modules/packages3d/Connect.3dshapes/HE10_20D.wrl diff --git a/modules/packages3d/Connect/JACK_ALIM.wings b/modules/packages3d/Connect.3dshapes/JACK_ALIM.wings similarity index 100% rename from modules/packages3d/Connect/JACK_ALIM.wings rename to modules/packages3d/Connect.3dshapes/JACK_ALIM.wings diff --git a/modules/packages3d/Connect/JACK_ALIM.wrl b/modules/packages3d/Connect.3dshapes/JACK_ALIM.wrl similarity index 100% rename from modules/packages3d/Connect/JACK_ALIM.wrl rename to modules/packages3d/Connect.3dshapes/JACK_ALIM.wrl diff --git a/modules/packages3d/Connect/PINTST.wings b/modules/packages3d/Connect.3dshapes/PINTST.wings similarity index 100% rename from modules/packages3d/Connect/PINTST.wings rename to modules/packages3d/Connect.3dshapes/PINTST.wings diff --git a/modules/packages3d/Connect/PINTST.wrl b/modules/packages3d/Connect.3dshapes/PINTST.wrl similarity index 100% rename from modules/packages3d/Connect/PINTST.wrl rename to modules/packages3d/Connect.3dshapes/PINTST.wrl diff --git a/modules/packages3d/Connect/QMS-1X52-FEMALE-SMD.wings b/modules/packages3d/Connect.3dshapes/QMS-1X52-FEMALE-SMD.wings similarity index 100% rename from modules/packages3d/Connect/QMS-1X52-FEMALE-SMD.wings rename to modules/packages3d/Connect.3dshapes/QMS-1X52-FEMALE-SMD.wings diff --git a/modules/packages3d/Connect/QMS-1X52-FEMALE-SMD.wrl b/modules/packages3d/Connect.3dshapes/QMS-1X52-FEMALE-SMD.wrl similarity index 100% rename from modules/packages3d/Connect/QMS-1X52-FEMALE-SMD.wrl rename to modules/packages3d/Connect.3dshapes/QMS-1X52-FEMALE-SMD.wrl diff --git a/modules/packages3d/Connect/RJ45_8.wings b/modules/packages3d/Connect.3dshapes/RJ45_8.wings similarity index 100% rename from modules/packages3d/Connect/RJ45_8.wings rename to modules/packages3d/Connect.3dshapes/RJ45_8.wings diff --git a/modules/packages3d/Connect/RJ45_8.wrl b/modules/packages3d/Connect.3dshapes/RJ45_8.wrl similarity index 100% rename from modules/packages3d/Connect/RJ45_8.wrl rename to modules/packages3d/Connect.3dshapes/RJ45_8.wrl diff --git a/modules/packages3d/Connect/TESTPOINT.wings b/modules/packages3d/Connect.3dshapes/TESTPOINT.wings similarity index 100% rename from modules/packages3d/Connect/TESTPOINT.wings rename to modules/packages3d/Connect.3dshapes/TESTPOINT.wings diff --git a/modules/packages3d/Connect/TESTPOINT.wrl b/modules/packages3d/Connect.3dshapes/TESTPOINT.wrl similarity index 100% rename from modules/packages3d/Connect/TESTPOINT.wrl rename to modules/packages3d/Connect.3dshapes/TESTPOINT.wrl diff --git a/modules/packages3d/Connect/USB_A.wings b/modules/packages3d/Connect.3dshapes/USB_A.wings similarity index 100% rename from modules/packages3d/Connect/USB_A.wings rename to modules/packages3d/Connect.3dshapes/USB_A.wings diff --git a/modules/packages3d/Connect/USB_A.wrl b/modules/packages3d/Connect.3dshapes/USB_A.wrl similarity index 100% rename from modules/packages3d/Connect/USB_A.wrl rename to modules/packages3d/Connect.3dshapes/USB_A.wrl diff --git a/modules/packages3d/Connect/USB_B.wings b/modules/packages3d/Connect.3dshapes/USB_B.wings similarity index 100% rename from modules/packages3d/Connect/USB_B.wings rename to modules/packages3d/Connect.3dshapes/USB_B.wings diff --git a/modules/packages3d/Connect/USB_B.wrl b/modules/packages3d/Connect.3dshapes/USB_B.wrl similarity index 100% rename from modules/packages3d/Connect/USB_B.wrl rename to modules/packages3d/Connect.3dshapes/USB_B.wrl diff --git a/modules/packages3d/Connect/XLR3MC.wings b/modules/packages3d/Connect.3dshapes/XLR3MC.wings similarity index 100% rename from modules/packages3d/Connect/XLR3MC.wings rename to modules/packages3d/Connect.3dshapes/XLR3MC.wings diff --git a/modules/packages3d/Connect/XLR3MC.wrl b/modules/packages3d/Connect.3dshapes/XLR3MC.wrl similarity index 100% rename from modules/packages3d/Connect/XLR3MC.wrl rename to modules/packages3d/Connect.3dshapes/XLR3MC.wrl diff --git a/modules/packages3d/Connect/XLR5MC.wings b/modules/packages3d/Connect.3dshapes/XLR5MC.wings similarity index 100% rename from modules/packages3d/Connect/XLR5MC.wings rename to modules/packages3d/Connect.3dshapes/XLR5MC.wings diff --git a/modules/packages3d/Connect/XLR5MC.wrl b/modules/packages3d/Connect.3dshapes/XLR5MC.wrl similarity index 100% rename from modules/packages3d/Connect/XLR5MC.wrl rename to modules/packages3d/Connect.3dshapes/XLR5MC.wrl diff --git a/modules/packages3d/Connect/bnc-ci.wings b/modules/packages3d/Connect.3dshapes/bnc-ci.wings similarity index 100% rename from modules/packages3d/Connect/bnc-ci.wings rename to modules/packages3d/Connect.3dshapes/bnc-ci.wings diff --git a/modules/packages3d/Connect/bnc-ci.wrl b/modules/packages3d/Connect.3dshapes/bnc-ci.wrl similarity index 100% rename from modules/packages3d/Connect/bnc-ci.wrl rename to modules/packages3d/Connect.3dshapes/bnc-ci.wrl diff --git a/modules/packages3d/Connect/bnc.wings b/modules/packages3d/Connect.3dshapes/bnc.wings similarity index 100% rename from modules/packages3d/Connect/bnc.wings rename to modules/packages3d/Connect.3dshapes/bnc.wings diff --git a/modules/packages3d/Connect/bnc.wrl b/modules/packages3d/Connect.3dshapes/bnc.wrl similarity index 100% rename from modules/packages3d/Connect/bnc.wrl rename to modules/packages3d/Connect.3dshapes/bnc.wrl diff --git a/modules/packages3d/Connect/bornier2.wings b/modules/packages3d/Connect.3dshapes/bornier2.wings similarity index 100% rename from modules/packages3d/Connect/bornier2.wings rename to modules/packages3d/Connect.3dshapes/bornier2.wings diff --git a/modules/packages3d/Connect/bornier2.wrl b/modules/packages3d/Connect.3dshapes/bornier2.wrl similarity index 100% rename from modules/packages3d/Connect/bornier2.wrl rename to modules/packages3d/Connect.3dshapes/bornier2.wrl diff --git a/modules/packages3d/Connect/bornier3.wings b/modules/packages3d/Connect.3dshapes/bornier3.wings similarity index 100% rename from modules/packages3d/Connect/bornier3.wings rename to modules/packages3d/Connect.3dshapes/bornier3.wings diff --git a/modules/packages3d/Connect/bornier3.wrl b/modules/packages3d/Connect.3dshapes/bornier3.wrl similarity index 100% rename from modules/packages3d/Connect/bornier3.wrl rename to modules/packages3d/Connect.3dshapes/bornier3.wrl diff --git a/modules/packages3d/Connect/bornier4.wings b/modules/packages3d/Connect.3dshapes/bornier4.wings similarity index 100% rename from modules/packages3d/Connect/bornier4.wings rename to modules/packages3d/Connect.3dshapes/bornier4.wings diff --git a/modules/packages3d/Connect/bornier4.wrl b/modules/packages3d/Connect.3dshapes/bornier4.wrl similarity index 100% rename from modules/packages3d/Connect/bornier4.wrl rename to modules/packages3d/Connect.3dshapes/bornier4.wrl diff --git a/modules/packages3d/Connect/bornier5.wings b/modules/packages3d/Connect.3dshapes/bornier5.wings similarity index 100% rename from modules/packages3d/Connect/bornier5.wings rename to modules/packages3d/Connect.3dshapes/bornier5.wings diff --git a/modules/packages3d/Connect/bornier5.wrl b/modules/packages3d/Connect.3dshapes/bornier5.wrl similarity index 100% rename from modules/packages3d/Connect/bornier5.wrl rename to modules/packages3d/Connect.3dshapes/bornier5.wrl diff --git a/modules/packages3d/Connect/bornier6.wings b/modules/packages3d/Connect.3dshapes/bornier6.wings similarity index 100% rename from modules/packages3d/Connect/bornier6.wings rename to modules/packages3d/Connect.3dshapes/bornier6.wings diff --git a/modules/packages3d/Connect/bornier6.wrl b/modules/packages3d/Connect.3dshapes/bornier6.wrl similarity index 100% rename from modules/packages3d/Connect/bornier6.wrl rename to modules/packages3d/Connect.3dshapes/bornier6.wrl diff --git a/modules/packages3d/Connect/c64abfd.wings b/modules/packages3d/Connect.3dshapes/c64abfd.wings similarity index 100% rename from modules/packages3d/Connect/c64abfd.wings rename to modules/packages3d/Connect.3dshapes/c64abfd.wings diff --git a/modules/packages3d/Connect/c64abfd.wrl b/modules/packages3d/Connect.3dshapes/c64abfd.wrl similarity index 100% rename from modules/packages3d/Connect/c64abfd.wrl rename to modules/packages3d/Connect.3dshapes/c64abfd.wrl diff --git a/modules/packages3d/Connect/c64abmd.wings b/modules/packages3d/Connect.3dshapes/c64abmd.wings similarity index 100% rename from modules/packages3d/Connect/c64abmd.wings rename to modules/packages3d/Connect.3dshapes/c64abmd.wings diff --git a/modules/packages3d/Connect/c64abmd.wrl b/modules/packages3d/Connect.3dshapes/c64abmd.wrl similarity index 100% rename from modules/packages3d/Connect/c64abmd.wrl rename to modules/packages3d/Connect.3dshapes/c64abmd.wrl diff --git a/modules/packages3d/Connect/c64acfd.wings b/modules/packages3d/Connect.3dshapes/c64acfd.wings similarity index 100% rename from modules/packages3d/Connect/c64acfd.wings rename to modules/packages3d/Connect.3dshapes/c64acfd.wings diff --git a/modules/packages3d/Connect/c64acfd.wrl b/modules/packages3d/Connect.3dshapes/c64acfd.wrl similarity index 100% rename from modules/packages3d/Connect/c64acfd.wrl rename to modules/packages3d/Connect.3dshapes/c64acfd.wrl diff --git a/modules/packages3d/Connect/he10-10d.wings b/modules/packages3d/Connect.3dshapes/he10-10d.wings similarity index 100% rename from modules/packages3d/Connect/he10-10d.wings rename to modules/packages3d/Connect.3dshapes/he10-10d.wings diff --git a/modules/packages3d/Connect/he10-10d.wrl b/modules/packages3d/Connect.3dshapes/he10-10d.wrl similarity index 100% rename from modules/packages3d/Connect/he10-10d.wrl rename to modules/packages3d/Connect.3dshapes/he10-10d.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0210.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0210.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0210.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0210.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0210.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0210.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0210.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0210.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0310.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0310.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0310.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0310.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0310.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0310.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0310.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0310.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0410.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0410.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0410.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0410.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0410.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0410.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0410.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0410.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0510.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0510.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0510.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0510.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0510.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0510.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0510.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0510.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0610.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0610.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0610.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0610.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0610.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0610.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0610.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0610.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0710.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0710.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0710.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0710.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0710.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0710.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0710.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0710.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0810.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0810.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0810.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0810.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0810.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0810.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0810.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0810.wrl diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0910.wings b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0910.wings similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0910.wings rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0910.wings diff --git a/modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0910.wrl b/modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0910.wrl similarity index 100% rename from modules/packages3d/Connectors_Molex/Connector_Molex_PicoBlade_53047-0910.wrl rename to modules/packages3d/Connectors_Molex.3dshapes/Connector_Molex_PicoBlade_53047-0910.wrl diff --git a/modules/packages3d/Crystals_Oscillators_SMD/Q_49U3HMS.wings b/modules/packages3d/Crystals_Oscillators_SMD.3dshapes/Q_49U3HMS.wings similarity index 100% rename from modules/packages3d/Crystals_Oscillators_SMD/Q_49U3HMS.wings rename to modules/packages3d/Crystals_Oscillators_SMD.3dshapes/Q_49U3HMS.wings diff --git a/modules/packages3d/Crystals_Oscillators_SMD/Q_49U3HMS.wrl b/modules/packages3d/Crystals_Oscillators_SMD.3dshapes/Q_49U3HMS.wrl similarity index 100% rename from modules/packages3d/Crystals_Oscillators_SMD/Q_49U3HMS.wrl rename to modules/packages3d/Crystals_Oscillators_SMD.3dshapes/Q_49U3HMS.wrl diff --git a/modules/packages3d/Crystals_Oscillators_SMD/crystal_FA238-TSX3225.wings b/modules/packages3d/Crystals_Oscillators_SMD.3dshapes/crystal_FA238-TSX3225.wings similarity index 100% rename from modules/packages3d/Crystals_Oscillators_SMD/crystal_FA238-TSX3225.wings rename to modules/packages3d/Crystals_Oscillators_SMD.3dshapes/crystal_FA238-TSX3225.wings diff --git a/modules/packages3d/Crystals_Oscillators_SMD/crystal_FA238-TSX3225.wrl b/modules/packages3d/Crystals_Oscillators_SMD.3dshapes/crystal_FA238-TSX3225.wrl similarity index 100% rename from modules/packages3d/Crystals_Oscillators_SMD/crystal_FA238-TSX3225.wrl rename to modules/packages3d/Crystals_Oscillators_SMD.3dshapes/crystal_FA238-TSX3225.wrl diff --git a/modules/packages3d/Diodes_SMD/D-Pak_TO252AA.wings b/modules/packages3d/Diodes_SMD.3dshapes/D-Pak_TO252AA.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/D-Pak_TO252AA.wings rename to modules/packages3d/Diodes_SMD.3dshapes/D-Pak_TO252AA.wings diff --git a/modules/packages3d/Diodes_SMD/D-Pak_TO252AA.wrl b/modules/packages3d/Diodes_SMD.3dshapes/D-Pak_TO252AA.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/D-Pak_TO252AA.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/D-Pak_TO252AA.wrl diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode.wings b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode.wings rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode.wings diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode.wrl b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode.wrl diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode_ThermalVias.wings b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode_ThermalVias.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode_ThermalVias.wings rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode_ThermalVias.wings diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode_ThermalVias.wrl b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode_ThermalVias.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_DualDiode_ThermalVias.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_DualDiode_ThermalVias.wrl diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode.wings b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode.wings rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode.wings diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode.wrl b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode.wrl diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode_ThermalVias.wings b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode_ThermalVias.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode_ThermalVias.wings rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode_ThermalVias.wings diff --git a/modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode_ThermalVias.wrl b/modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode_ThermalVias.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/DD-PAK_TO263_SingleDiode_ThermalVias.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/DD-PAK_TO263_SingleDiode_ThermalVias.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-MELF_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MELF_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-MELF_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MELF_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-MELF_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MELF_Standard.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-MELF_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MELF_Standard.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MELF_Standard.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-MiniMELF_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MiniMELF_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-MiniMELF_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MiniMELF_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-MiniMELF_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MiniMELF_Standard.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-MiniMELF_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-MiniMELF_Standard.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-MiniMELF_Standard.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-SMA_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMA_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-SMA_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMA_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-SMA_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMA_Standard.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-SMA_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMA_Standard.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMA_Standard.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-SMB_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMB_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-SMB_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMB_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-SMB_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMB_Standard.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-SMB_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMB_Standard.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMB_Standard.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-SMC_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMC_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-SMC_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMC_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-SMC_Standard.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMC_Standard.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-SMC_Standard.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-SMC_Standard.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-SMC_Standard.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-TUMD2.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-TUMD2.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-TUMD2.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-TUMD2.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-TUMD2.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-MELF-RM10_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-MELF-RM10_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-MELF-RM10_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-MELF-RM10_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-MELF-RM10_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-SMA-SMB_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-SMA-SMB_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-SMA-SMB_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-SMA-SMB_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMA-SMB_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-SMB-SMC_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-SMB-SMC_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-SMB-SMC_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-SMB-SMC_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMB-SMC_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-SMC-RM10_Handsoldering.wings b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wings similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-SMC-RM10_Handsoldering.wings rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wings diff --git a/modules/packages3d/Diodes_SMD/Diode-Universal-SMC-RM10_Handsoldering.wrl b/modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Diodes_SMD/Diode-Universal-SMC-RM10_Handsoldering.wrl rename to modules/packages3d/Diodes_SMD.3dshapes/Diode-Universal-SMC-RM10_Handsoldering.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_DO-35_SOD27_Horizontal_RM10.wings b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_DO-35_SOD27_Horizontal_RM10.wings similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_DO-35_SOD27_Horizontal_RM10.wings rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_DO-35_SOD27_Horizontal_RM10.wings diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_DO-35_SOD27_Horizontal_RM10.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_DO-35_SOD27_Horizontal_RM10.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_DO-35_SOD27_Horizontal_RM10.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_DO-35_SOD27_Horizontal_RM10.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_LED_3mm_round_vertical.wings b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_3mm_round_vertical.wings similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_LED_3mm_round_vertical.wings rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_3mm_round_vertical.wings diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_LED_3mm_round_vertical.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_3mm_round_vertical.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_LED_3mm_round_vertical.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_3mm_round_vertical.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_LED_5mm_round_vertical.wings b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_5mm_round_vertical.wings similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_LED_5mm_round_vertical.wings rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_5mm_round_vertical.wings diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_LED_5mm_round_vertical.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_5mm_round_vertical.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_LED_5mm_round_vertical.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_LED_5mm_round_vertical.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Dual_CommonCathode_Horizontal.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Dual_CommonCathode_Horizontal.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Dual_CommonCathode_Horizontal.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Dual_CommonCathode_Horizontal.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Dual_CommonCathode_Horizontal_LargePads.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Dual_CommonCathode_Horizontal_LargePads.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Dual_CommonCathode_Horizontal_LargePads.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Dual_CommonCathode_Horizontal_LargePads.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Dual_CommonCathode_Vertical.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Dual_CommonCathode_Vertical.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Dual_CommonCathode_Vertical.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Dual_CommonCathode_Vertical.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Horizontal.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Horizontal.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Horizontal.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Horizontal.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Horizontal_LargePads.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Horizontal_LargePads.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Horizontal_LargePads.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Horizontal_LargePads.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Vertical.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Vertical.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-220_Vertical.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-220_Vertical.wrl diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-247_Vertical.wings b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-247_Vertical.wings similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-247_Vertical.wings rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-247_Vertical.wings diff --git a/modules/packages3d/Diodes_ThroughHole/Diode_TO-247_Vertical.wrl b/modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-247_Vertical.wrl similarity index 100% rename from modules/packages3d/Diodes_ThroughHole/Diode_TO-247_Vertical.wrl rename to modules/packages3d/Diodes_ThroughHole.3dshapes/Diode_TO-247_Vertical.wrl diff --git a/modules/packages3d/Discret/C1-1.wings b/modules/packages3d/Discret.3dshapes/C1-1.wings similarity index 100% rename from modules/packages3d/Discret/C1-1.wings rename to modules/packages3d/Discret.3dshapes/C1-1.wings diff --git a/modules/packages3d/Discret/C1-1.wrl b/modules/packages3d/Discret.3dshapes/C1-1.wrl similarity index 100% rename from modules/packages3d/Discret/C1-1.wrl rename to modules/packages3d/Discret.3dshapes/C1-1.wrl diff --git a/modules/packages3d/Discret/C1.5V8H.wings b/modules/packages3d/Discret.3dshapes/C1.5V8H.wings similarity index 100% rename from modules/packages3d/Discret/C1.5V8H.wings rename to modules/packages3d/Discret.3dshapes/C1.5V8H.wings diff --git a/modules/packages3d/Discret/C1.5V8H.wrl b/modules/packages3d/Discret.3dshapes/C1.5V8H.wrl similarity index 100% rename from modules/packages3d/Discret/C1.5V8H.wrl rename to modules/packages3d/Discret.3dshapes/C1.5V8H.wrl diff --git a/modules/packages3d/Discret/C1.5V8V.wrl b/modules/packages3d/Discret.3dshapes/C1.5V8V.wrl similarity index 100% rename from modules/packages3d/Discret/C1.5V8V.wrl rename to modules/packages3d/Discret.3dshapes/C1.5V8V.wrl diff --git a/modules/packages3d/Discret/C1.wings b/modules/packages3d/Discret.3dshapes/C1.wings similarity index 100% rename from modules/packages3d/Discret/C1.wings rename to modules/packages3d/Discret.3dshapes/C1.wings diff --git a/modules/packages3d/Discret/C1.wrl b/modules/packages3d/Discret.3dshapes/C1.wrl similarity index 100% rename from modules/packages3d/Discret/C1.wrl rename to modules/packages3d/Discret.3dshapes/C1.wrl diff --git a/modules/packages3d/Discret/C1V5.wings b/modules/packages3d/Discret.3dshapes/C1V5.wings similarity index 100% rename from modules/packages3d/Discret/C1V5.wings rename to modules/packages3d/Discret.3dshapes/C1V5.wings diff --git a/modules/packages3d/Discret/C1V5.wrl b/modules/packages3d/Discret.3dshapes/C1V5.wrl similarity index 100% rename from modules/packages3d/Discret/C1V5.wrl rename to modules/packages3d/Discret.3dshapes/C1V5.wrl diff --git a/modules/packages3d/Discret/C1V5H.wings b/modules/packages3d/Discret.3dshapes/C1V5H.wings similarity index 100% rename from modules/packages3d/Discret/C1V5H.wings rename to modules/packages3d/Discret.3dshapes/C1V5H.wings diff --git a/modules/packages3d/Discret/C1V5H.wrl b/modules/packages3d/Discret.3dshapes/C1V5H.wrl similarity index 100% rename from modules/packages3d/Discret/C1V5H.wrl rename to modules/packages3d/Discret.3dshapes/C1V5H.wrl diff --git a/modules/packages3d/Discret/C1V7.wings b/modules/packages3d/Discret.3dshapes/C1V7.wings similarity index 100% rename from modules/packages3d/Discret/C1V7.wings rename to modules/packages3d/Discret.3dshapes/C1V7.wings diff --git a/modules/packages3d/Discret/C1V7.wrl b/modules/packages3d/Discret.3dshapes/C1V7.wrl similarity index 100% rename from modules/packages3d/Discret/C1V7.wrl rename to modules/packages3d/Discret.3dshapes/C1V7.wrl diff --git a/modules/packages3d/Discret/C1V7H.wings b/modules/packages3d/Discret.3dshapes/C1V7H.wings similarity index 100% rename from modules/packages3d/Discret/C1V7H.wings rename to modules/packages3d/Discret.3dshapes/C1V7H.wings diff --git a/modules/packages3d/Discret/C1V7H.wrl b/modules/packages3d/Discret.3dshapes/C1V7H.wrl similarity index 100% rename from modules/packages3d/Discret/C1V7H.wrl rename to modules/packages3d/Discret.3dshapes/C1V7H.wrl diff --git a/modules/packages3d/Discret/C1V8.wrl b/modules/packages3d/Discret.3dshapes/C1V8.wrl similarity index 100% rename from modules/packages3d/Discret/C1V8.wrl rename to modules/packages3d/Discret.3dshapes/C1V8.wrl diff --git a/modules/packages3d/Discret/C2.wings b/modules/packages3d/Discret.3dshapes/C2.wings similarity index 100% rename from modules/packages3d/Discret/C2.wings rename to modules/packages3d/Discret.3dshapes/C2.wings diff --git a/modules/packages3d/Discret/C2.wrl b/modules/packages3d/Discret.3dshapes/C2.wrl similarity index 100% rename from modules/packages3d/Discret/C2.wrl rename to modules/packages3d/Discret.3dshapes/C2.wrl diff --git a/modules/packages3d/Discret/C2V10.wings b/modules/packages3d/Discret.3dshapes/C2V10.wings similarity index 100% rename from modules/packages3d/Discret/C2V10.wings rename to modules/packages3d/Discret.3dshapes/C2V10.wings diff --git a/modules/packages3d/Discret/C2V10.wrl b/modules/packages3d/Discret.3dshapes/C2V10.wrl similarity index 100% rename from modules/packages3d/Discret/C2V10.wrl rename to modules/packages3d/Discret.3dshapes/C2V10.wrl diff --git a/modules/packages3d/Discret/C2V8.wings b/modules/packages3d/Discret.3dshapes/C2V8.wings similarity index 100% rename from modules/packages3d/Discret/C2V8.wings rename to modules/packages3d/Discret.3dshapes/C2V8.wings diff --git a/modules/packages3d/Discret/C2V8.wrl b/modules/packages3d/Discret.3dshapes/C2V8.wrl similarity index 100% rename from modules/packages3d/Discret/C2V8.wrl rename to modules/packages3d/Discret.3dshapes/C2V8.wrl diff --git a/modules/packages3d/Discret/CP10.wings b/modules/packages3d/Discret.3dshapes/CP10.wings similarity index 100% rename from modules/packages3d/Discret/CP10.wings rename to modules/packages3d/Discret.3dshapes/CP10.wings diff --git a/modules/packages3d/Discret/CP10.wrl b/modules/packages3d/Discret.3dshapes/CP10.wrl similarity index 100% rename from modules/packages3d/Discret/CP10.wrl rename to modules/packages3d/Discret.3dshapes/CP10.wrl diff --git a/modules/packages3d/Discret/CP12.wings b/modules/packages3d/Discret.3dshapes/CP12.wings similarity index 100% rename from modules/packages3d/Discret/CP12.wings rename to modules/packages3d/Discret.3dshapes/CP12.wings diff --git a/modules/packages3d/Discret/CP12.wrl b/modules/packages3d/Discret.3dshapes/CP12.wrl similarity index 100% rename from modules/packages3d/Discret/CP12.wrl rename to modules/packages3d/Discret.3dshapes/CP12.wrl diff --git a/modules/packages3d/Discret/CP14.wings b/modules/packages3d/Discret.3dshapes/CP14.wings similarity index 100% rename from modules/packages3d/Discret/CP14.wings rename to modules/packages3d/Discret.3dshapes/CP14.wings diff --git a/modules/packages3d/Discret/CP14.wrl b/modules/packages3d/Discret.3dshapes/CP14.wrl similarity index 100% rename from modules/packages3d/Discret/CP14.wrl rename to modules/packages3d/Discret.3dshapes/CP14.wrl diff --git a/modules/packages3d/Discret/CP16.wings b/modules/packages3d/Discret.3dshapes/CP16.wings similarity index 100% rename from modules/packages3d/Discret/CP16.wings rename to modules/packages3d/Discret.3dshapes/CP16.wings diff --git a/modules/packages3d/Discret/CP16.wrl b/modules/packages3d/Discret.3dshapes/CP16.wrl similarity index 100% rename from modules/packages3d/Discret/CP16.wrl rename to modules/packages3d/Discret.3dshapes/CP16.wrl diff --git a/modules/packages3d/Discret/CP18.wings b/modules/packages3d/Discret.3dshapes/CP18.wings similarity index 100% rename from modules/packages3d/Discret/CP18.wings rename to modules/packages3d/Discret.3dshapes/CP18.wings diff --git a/modules/packages3d/Discret/CP18.wrl b/modules/packages3d/Discret.3dshapes/CP18.wrl similarity index 100% rename from modules/packages3d/Discret/CP18.wrl rename to modules/packages3d/Discret.3dshapes/CP18.wrl diff --git a/modules/packages3d/Discret/CP20.wings b/modules/packages3d/Discret.3dshapes/CP20.wings similarity index 100% rename from modules/packages3d/Discret/CP20.wings rename to modules/packages3d/Discret.3dshapes/CP20.wings diff --git a/modules/packages3d/Discret/CP20.wrl b/modules/packages3d/Discret.3dshapes/CP20.wrl similarity index 100% rename from modules/packages3d/Discret/CP20.wrl rename to modules/packages3d/Discret.3dshapes/CP20.wrl diff --git a/modules/packages3d/Discret/CP36V.wings b/modules/packages3d/Discret.3dshapes/CP36V.wings similarity index 100% rename from modules/packages3d/Discret/CP36V.wings rename to modules/packages3d/Discret.3dshapes/CP36V.wings diff --git a/modules/packages3d/Discret/CP36V.wrl b/modules/packages3d/Discret.3dshapes/CP36V.wrl similarity index 100% rename from modules/packages3d/Discret/CP36V.wrl rename to modules/packages3d/Discret.3dshapes/CP36V.wrl diff --git a/modules/packages3d/Discret/CP4.wings b/modules/packages3d/Discret.3dshapes/CP4.wings similarity index 100% rename from modules/packages3d/Discret/CP4.wings rename to modules/packages3d/Discret.3dshapes/CP4.wings diff --git a/modules/packages3d/Discret/CP4.wrl b/modules/packages3d/Discret.3dshapes/CP4.wrl similarity index 100% rename from modules/packages3d/Discret/CP4.wrl rename to modules/packages3d/Discret.3dshapes/CP4.wrl diff --git a/modules/packages3d/Discret/CP5.wings b/modules/packages3d/Discret.3dshapes/CP5.wings similarity index 100% rename from modules/packages3d/Discret/CP5.wings rename to modules/packages3d/Discret.3dshapes/CP5.wings diff --git a/modules/packages3d/Discret/CP5.wrl b/modules/packages3d/Discret.3dshapes/CP5.wrl similarity index 100% rename from modules/packages3d/Discret/CP5.wrl rename to modules/packages3d/Discret.3dshapes/CP5.wrl diff --git a/modules/packages3d/Discret/CP6.wings b/modules/packages3d/Discret.3dshapes/CP6.wings similarity index 100% rename from modules/packages3d/Discret/CP6.wings rename to modules/packages3d/Discret.3dshapes/CP6.wings diff --git a/modules/packages3d/Discret/CP6.wrl b/modules/packages3d/Discret.3dshapes/CP6.wrl similarity index 100% rename from modules/packages3d/Discret/CP6.wrl rename to modules/packages3d/Discret.3dshapes/CP6.wrl diff --git a/modules/packages3d/Discret/CP8.wings b/modules/packages3d/Discret.3dshapes/CP8.wings similarity index 100% rename from modules/packages3d/Discret/CP8.wings rename to modules/packages3d/Discret.3dshapes/CP8.wings diff --git a/modules/packages3d/Discret/CP8.wrl b/modules/packages3d/Discret.3dshapes/CP8.wrl similarity index 100% rename from modules/packages3d/Discret/CP8.wrl rename to modules/packages3d/Discret.3dshapes/CP8.wrl diff --git a/modules/packages3d/Discret/CPR10X16.wings b/modules/packages3d/Discret.3dshapes/CPR10X16.wings similarity index 100% rename from modules/packages3d/Discret/CPR10X16.wings rename to modules/packages3d/Discret.3dshapes/CPR10X16.wings diff --git a/modules/packages3d/Discret/CPR10X16.wrl b/modules/packages3d/Discret.3dshapes/CPR10X16.wrl similarity index 100% rename from modules/packages3d/Discret/CPR10X16.wrl rename to modules/packages3d/Discret.3dshapes/CPR10X16.wrl diff --git a/modules/packages3d/Discret/D3.wings b/modules/packages3d/Discret.3dshapes/D3.wings similarity index 100% rename from modules/packages3d/Discret/D3.wings rename to modules/packages3d/Discret.3dshapes/D3.wings diff --git a/modules/packages3d/Discret/D3.wrl b/modules/packages3d/Discret.3dshapes/D3.wrl similarity index 100% rename from modules/packages3d/Discret/D3.wrl rename to modules/packages3d/Discret.3dshapes/D3.wrl diff --git a/modules/packages3d/Discret/D4.wings b/modules/packages3d/Discret.3dshapes/D4.wings similarity index 100% rename from modules/packages3d/Discret/D4.wings rename to modules/packages3d/Discret.3dshapes/D4.wings diff --git a/modules/packages3d/Discret/D4.wrl b/modules/packages3d/Discret.3dshapes/D4.wrl similarity index 100% rename from modules/packages3d/Discret/D4.wrl rename to modules/packages3d/Discret.3dshapes/D4.wrl diff --git a/modules/packages3d/Discret/D5.wings b/modules/packages3d/Discret.3dshapes/D5.wings similarity index 100% rename from modules/packages3d/Discret/D5.wings rename to modules/packages3d/Discret.3dshapes/D5.wings diff --git a/modules/packages3d/Discret/D5.wrl b/modules/packages3d/Discret.3dshapes/D5.wrl similarity index 100% rename from modules/packages3d/Discret/D5.wrl rename to modules/packages3d/Discret.3dshapes/D5.wrl diff --git a/modules/packages3d/Discret/D6.5.wings b/modules/packages3d/Discret.3dshapes/D6.5.wings similarity index 100% rename from modules/packages3d/Discret/D6.5.wings rename to modules/packages3d/Discret.3dshapes/D6.5.wings diff --git a/modules/packages3d/Discret/D6.5.wrl b/modules/packages3d/Discret.3dshapes/D6.5.wrl similarity index 100% rename from modules/packages3d/Discret/D6.5.wrl rename to modules/packages3d/Discret.3dshapes/D6.5.wrl diff --git a/modules/packages3d/Discret/D6.wings b/modules/packages3d/Discret.3dshapes/D6.wings similarity index 100% rename from modules/packages3d/Discret/D6.wings rename to modules/packages3d/Discret.3dshapes/D6.wings diff --git a/modules/packages3d/Discret/D6.wrl b/modules/packages3d/Discret.3dshapes/D6.wrl similarity index 100% rename from modules/packages3d/Discret/D6.wrl rename to modules/packages3d/Discret.3dshapes/D6.wrl diff --git a/modules/packages3d/Discret/DO-35.wings b/modules/packages3d/Discret.3dshapes/DO-35.wings similarity index 100% rename from modules/packages3d/Discret/DO-35.wings rename to modules/packages3d/Discret.3dshapes/DO-35.wings diff --git a/modules/packages3d/Discret/DO-35.wrl b/modules/packages3d/Discret.3dshapes/DO-35.wrl similarity index 100% rename from modules/packages3d/Discret/DO-35.wrl rename to modules/packages3d/Discret.3dshapes/DO-35.wrl diff --git a/modules/packages3d/Discret/EMI_FILTER.wings b/modules/packages3d/Discret.3dshapes/EMI_FILTER.wings similarity index 100% rename from modules/packages3d/Discret/EMI_FILTER.wings rename to modules/packages3d/Discret.3dshapes/EMI_FILTER.wings diff --git a/modules/packages3d/Discret/EMI_FILTER.wrl b/modules/packages3d/Discret.3dshapes/EMI_FILTER.wrl similarity index 100% rename from modules/packages3d/Discret/EMI_FILTER.wrl rename to modules/packages3d/Discret.3dshapes/EMI_FILTER.wrl diff --git a/modules/packages3d/Discret/HC-18UH.wings b/modules/packages3d/Discret.3dshapes/HC-18UH.wings similarity index 100% rename from modules/packages3d/Discret/HC-18UH.wings rename to modules/packages3d/Discret.3dshapes/HC-18UH.wings diff --git a/modules/packages3d/Discret/HC-18UH.wrl b/modules/packages3d/Discret.3dshapes/HC-18UH.wrl similarity index 100% rename from modules/packages3d/Discret/HC-18UH.wrl rename to modules/packages3d/Discret.3dshapes/HC-18UH.wrl diff --git a/modules/packages3d/Discret/HC-18UV.wings b/modules/packages3d/Discret.3dshapes/HC-18UV.wings similarity index 100% rename from modules/packages3d/Discret/HC-18UV.wings rename to modules/packages3d/Discret.3dshapes/HC-18UV.wings diff --git a/modules/packages3d/Discret/HC-18UV.wrl b/modules/packages3d/Discret.3dshapes/HC-18UV.wrl similarity index 100% rename from modules/packages3d/Discret/HC-18UV.wrl rename to modules/packages3d/Discret.3dshapes/HC-18UV.wrl diff --git a/modules/packages3d/Discret/HC-33UH.wings b/modules/packages3d/Discret.3dshapes/HC-33UH.wings similarity index 100% rename from modules/packages3d/Discret/HC-33UH.wings rename to modules/packages3d/Discret.3dshapes/HC-33UH.wings diff --git a/modules/packages3d/Discret/HC-33UH.wrl b/modules/packages3d/Discret.3dshapes/HC-33UH.wrl similarity index 100% rename from modules/packages3d/Discret/HC-33UH.wrl rename to modules/packages3d/Discret.3dshapes/HC-33UH.wrl diff --git a/modules/packages3d/Discret/HC-33UV.wings b/modules/packages3d/Discret.3dshapes/HC-33UV.wings similarity index 100% rename from modules/packages3d/Discret/HC-33UV.wings rename to modules/packages3d/Discret.3dshapes/HC-33UV.wings diff --git a/modules/packages3d/Discret/HC-33UV.wrl b/modules/packages3d/Discret.3dshapes/HC-33UV.wrl similarity index 100% rename from modules/packages3d/Discret/HC-33UV.wrl rename to modules/packages3d/Discret.3dshapes/HC-33UV.wrl diff --git a/modules/packages3d/Discret/HC-49V.wings b/modules/packages3d/Discret.3dshapes/HC-49V.wings similarity index 100% rename from modules/packages3d/Discret/HC-49V.wings rename to modules/packages3d/Discret.3dshapes/HC-49V.wings diff --git a/modules/packages3d/Discret/HC-49V.wrl b/modules/packages3d/Discret.3dshapes/HC-49V.wrl similarity index 100% rename from modules/packages3d/Discret/HC-49V.wrl rename to modules/packages3d/Discret.3dshapes/HC-49V.wrl diff --git a/modules/packages3d/Discret/LEDV.wings b/modules/packages3d/Discret.3dshapes/LEDV.wings similarity index 100% rename from modules/packages3d/Discret/LEDV.wings rename to modules/packages3d/Discret.3dshapes/LEDV.wings diff --git a/modules/packages3d/Discret/LEDV.wrl b/modules/packages3d/Discret.3dshapes/LEDV.wrl similarity index 100% rename from modules/packages3d/Discret/LEDV.wrl rename to modules/packages3d/Discret.3dshapes/LEDV.wrl diff --git a/modules/packages3d/Discret/LM2931.wings b/modules/packages3d/Discret.3dshapes/LM2931.wings similarity index 100% rename from modules/packages3d/Discret/LM2931.wings rename to modules/packages3d/Discret.3dshapes/LM2931.wings diff --git a/modules/packages3d/Discret/LM2931.wrl b/modules/packages3d/Discret.3dshapes/LM2931.wrl similarity index 100% rename from modules/packages3d/Discret/LM2931.wrl rename to modules/packages3d/Discret.3dshapes/LM2931.wrl diff --git a/modules/packages3d/Discret/LM78LXX.wings b/modules/packages3d/Discret.3dshapes/LM78LXX.wings similarity index 100% rename from modules/packages3d/Discret/LM78LXX.wings rename to modules/packages3d/Discret.3dshapes/LM78LXX.wings diff --git a/modules/packages3d/Discret/LM78LXX.wrl b/modules/packages3d/Discret.3dshapes/LM78LXX.wrl similarity index 100% rename from modules/packages3d/Discret/LM78LXX.wrl rename to modules/packages3d/Discret.3dshapes/LM78LXX.wrl diff --git a/modules/packages3d/Discret/LM78XX-TO92.wings b/modules/packages3d/Discret.3dshapes/LM78XX-TO92.wings similarity index 100% rename from modules/packages3d/Discret/LM78XX-TO92.wings rename to modules/packages3d/Discret.3dshapes/LM78XX-TO92.wings diff --git a/modules/packages3d/Discret/LM78XX-TO92.wrl b/modules/packages3d/Discret.3dshapes/LM78XX-TO92.wrl similarity index 100% rename from modules/packages3d/Discret/LM78XX-TO92.wrl rename to modules/packages3d/Discret.3dshapes/LM78XX-TO92.wrl diff --git a/modules/packages3d/Discret/LM78XX.wings b/modules/packages3d/Discret.3dshapes/LM78XX.wings similarity index 100% rename from modules/packages3d/Discret/LM78XX.wings rename to modules/packages3d/Discret.3dshapes/LM78XX.wings diff --git a/modules/packages3d/Discret/LM78XX.wrl b/modules/packages3d/Discret.3dshapes/LM78XX.wrl similarity index 100% rename from modules/packages3d/Discret/LM78XX.wrl rename to modules/packages3d/Discret.3dshapes/LM78XX.wrl diff --git a/modules/packages3d/Discret/LM79LXX.wings b/modules/packages3d/Discret.3dshapes/LM79LXX.wings similarity index 100% rename from modules/packages3d/Discret/LM79LXX.wings rename to modules/packages3d/Discret.3dshapes/LM79LXX.wings diff --git a/modules/packages3d/Discret/LM79LXX.wrl b/modules/packages3d/Discret.3dshapes/LM79LXX.wrl similarity index 100% rename from modules/packages3d/Discret/LM79LXX.wrl rename to modules/packages3d/Discret.3dshapes/LM79LXX.wrl diff --git a/modules/packages3d/Discret/LM79XX.wings b/modules/packages3d/Discret.3dshapes/LM79XX.wings similarity index 100% rename from modules/packages3d/Discret/LM79XX.wings rename to modules/packages3d/Discret.3dshapes/LM79XX.wings diff --git a/modules/packages3d/Discret/LM79XX.wrl b/modules/packages3d/Discret.3dshapes/LM79XX.wrl similarity index 100% rename from modules/packages3d/Discret/LM79XX.wrl rename to modules/packages3d/Discret.3dshapes/LM79XX.wrl diff --git a/modules/packages3d/Discret/QMONTRE.wings b/modules/packages3d/Discret.3dshapes/QMONTRE.wings similarity index 100% rename from modules/packages3d/Discret/QMONTRE.wings rename to modules/packages3d/Discret.3dshapes/QMONTRE.wings diff --git a/modules/packages3d/Discret/QMONTRE.wrl b/modules/packages3d/Discret.3dshapes/QMONTRE.wrl similarity index 100% rename from modules/packages3d/Discret/QMONTRE.wrl rename to modules/packages3d/Discret.3dshapes/QMONTRE.wrl diff --git a/modules/packages3d/Discret/R1.wings b/modules/packages3d/Discret.3dshapes/R1.wings similarity index 100% rename from modules/packages3d/Discret/R1.wings rename to modules/packages3d/Discret.3dshapes/R1.wings diff --git a/modules/packages3d/Discret/R1.wrl b/modules/packages3d/Discret.3dshapes/R1.wrl similarity index 100% rename from modules/packages3d/Discret/R1.wrl rename to modules/packages3d/Discret.3dshapes/R1.wrl diff --git a/modules/packages3d/Discret/R3-5.wings b/modules/packages3d/Discret.3dshapes/R3-5.wings similarity index 100% rename from modules/packages3d/Discret/R3-5.wings rename to modules/packages3d/Discret.3dshapes/R3-5.wings diff --git a/modules/packages3d/Discret/R3-5.wrl b/modules/packages3d/Discret.3dshapes/R3-5.wrl similarity index 100% rename from modules/packages3d/Discret/R3-5.wrl rename to modules/packages3d/Discret.3dshapes/R3-5.wrl diff --git a/modules/packages3d/Discret/R3-LARGE_PADS.wings b/modules/packages3d/Discret.3dshapes/R3-LARGE_PADS.wings similarity index 100% rename from modules/packages3d/Discret/R3-LARGE_PADS.wings rename to modules/packages3d/Discret.3dshapes/R3-LARGE_PADS.wings diff --git a/modules/packages3d/Discret/R3-LARGE_PADS.wrl b/modules/packages3d/Discret.3dshapes/R3-LARGE_PADS.wrl similarity index 100% rename from modules/packages3d/Discret/R3-LARGE_PADS.wrl rename to modules/packages3d/Discret.3dshapes/R3-LARGE_PADS.wrl diff --git a/modules/packages3d/Discret/R3.wings b/modules/packages3d/Discret.3dshapes/R3.wings similarity index 100% rename from modules/packages3d/Discret/R3.wings rename to modules/packages3d/Discret.3dshapes/R3.wings diff --git a/modules/packages3d/Discret/R3.wrl b/modules/packages3d/Discret.3dshapes/R3.wrl similarity index 100% rename from modules/packages3d/Discret/R3.wrl rename to modules/packages3d/Discret.3dshapes/R3.wrl diff --git a/modules/packages3d/Discret/R4-5.wings b/modules/packages3d/Discret.3dshapes/R4-5.wings similarity index 100% rename from modules/packages3d/Discret/R4-5.wings rename to modules/packages3d/Discret.3dshapes/R4-5.wings diff --git a/modules/packages3d/Discret/R4-5.wrl b/modules/packages3d/Discret.3dshapes/R4-5.wrl similarity index 100% rename from modules/packages3d/Discret/R4-5.wrl rename to modules/packages3d/Discret.3dshapes/R4-5.wrl diff --git a/modules/packages3d/Discret/R4-LARGE_PADS.wings b/modules/packages3d/Discret.3dshapes/R4-LARGE_PADS.wings similarity index 100% rename from modules/packages3d/Discret/R4-LARGE_PADS.wings rename to modules/packages3d/Discret.3dshapes/R4-LARGE_PADS.wings diff --git a/modules/packages3d/Discret/R4-LARGE_PADS.wrl b/modules/packages3d/Discret.3dshapes/R4-LARGE_PADS.wrl similarity index 100% rename from modules/packages3d/Discret/R4-LARGE_PADS.wrl rename to modules/packages3d/Discret.3dshapes/R4-LARGE_PADS.wrl diff --git a/modules/packages3d/Discret/R4.wings b/modules/packages3d/Discret.3dshapes/R4.wings similarity index 100% rename from modules/packages3d/Discret/R4.wings rename to modules/packages3d/Discret.3dshapes/R4.wings diff --git a/modules/packages3d/Discret/R4.wrl b/modules/packages3d/Discret.3dshapes/R4.wrl similarity index 100% rename from modules/packages3d/Discret/R4.wrl rename to modules/packages3d/Discret.3dshapes/R4.wrl diff --git a/modules/packages3d/Discret/R5.wings b/modules/packages3d/Discret.3dshapes/R5.wings similarity index 100% rename from modules/packages3d/Discret/R5.wings rename to modules/packages3d/Discret.3dshapes/R5.wings diff --git a/modules/packages3d/Discret/R5.wrl b/modules/packages3d/Discret.3dshapes/R5.wrl similarity index 100% rename from modules/packages3d/Discret/R5.wrl rename to modules/packages3d/Discret.3dshapes/R5.wrl diff --git a/modules/packages3d/Discret/R6.wings b/modules/packages3d/Discret.3dshapes/R6.wings similarity index 100% rename from modules/packages3d/Discret/R6.wings rename to modules/packages3d/Discret.3dshapes/R6.wings diff --git a/modules/packages3d/Discret/R6.wrl b/modules/packages3d/Discret.3dshapes/R6.wrl similarity index 100% rename from modules/packages3d/Discret/R6.wrl rename to modules/packages3d/Discret.3dshapes/R6.wrl diff --git a/modules/packages3d/Discret/R7.wings b/modules/packages3d/Discret.3dshapes/R7.wings similarity index 100% rename from modules/packages3d/Discret/R7.wings rename to modules/packages3d/Discret.3dshapes/R7.wings diff --git a/modules/packages3d/Discret/R7.wrl b/modules/packages3d/Discret.3dshapes/R7.wrl similarity index 100% rename from modules/packages3d/Discret/R7.wrl rename to modules/packages3d/Discret.3dshapes/R7.wrl diff --git a/modules/packages3d/Discret/RV2.wings b/modules/packages3d/Discret.3dshapes/RV2.wings similarity index 100% rename from modules/packages3d/Discret/RV2.wings rename to modules/packages3d/Discret.3dshapes/RV2.wings diff --git a/modules/packages3d/Discret/RV2.wrl b/modules/packages3d/Discret.3dshapes/RV2.wrl similarity index 100% rename from modules/packages3d/Discret/RV2.wrl rename to modules/packages3d/Discret.3dshapes/RV2.wrl diff --git a/modules/packages3d/Discret/RV2X4.wings b/modules/packages3d/Discret.3dshapes/RV2X4.wings similarity index 100% rename from modules/packages3d/Discret/RV2X4.wings rename to modules/packages3d/Discret.3dshapes/RV2X4.wings diff --git a/modules/packages3d/Discret/RV2X4.wrl b/modules/packages3d/Discret.3dshapes/RV2X4.wrl similarity index 100% rename from modules/packages3d/Discret/RV2X4.wrl rename to modules/packages3d/Discret.3dshapes/RV2X4.wrl diff --git a/modules/packages3d/Discret/SUBCLICK.wings b/modules/packages3d/Discret.3dshapes/SUBCLICK.wings similarity index 100% rename from modules/packages3d/Discret/SUBCLICK.wings rename to modules/packages3d/Discret.3dshapes/SUBCLICK.wings diff --git a/modules/packages3d/Discret/SUBCLICK.wrl b/modules/packages3d/Discret.3dshapes/SUBCLICK.wrl similarity index 100% rename from modules/packages3d/Discret/SUBCLICK.wrl rename to modules/packages3d/Discret.3dshapes/SUBCLICK.wrl diff --git a/modules/packages3d/Discret/TEST_POINT_2PADS.wrl b/modules/packages3d/Discret.3dshapes/TEST_POINT_2PADS.wrl similarity index 100% rename from modules/packages3d/Discret/TEST_POINT_2PADS.wrl rename to modules/packages3d/Discret.3dshapes/TEST_POINT_2PADS.wrl diff --git a/modules/packages3d/Discret/TO18CBE.wings b/modules/packages3d/Discret.3dshapes/TO18CBE.wings similarity index 100% rename from modules/packages3d/Discret/TO18CBE.wings rename to modules/packages3d/Discret.3dshapes/TO18CBE.wings diff --git a/modules/packages3d/Discret/TO18CBE.wrl b/modules/packages3d/Discret.3dshapes/TO18CBE.wrl similarity index 100% rename from modules/packages3d/Discret/TO18CBE.wrl rename to modules/packages3d/Discret.3dshapes/TO18CBE.wrl diff --git a/modules/packages3d/Discret/TO18EBC.wings b/modules/packages3d/Discret.3dshapes/TO18EBC.wings similarity index 100% rename from modules/packages3d/Discret/TO18EBC.wings rename to modules/packages3d/Discret.3dshapes/TO18EBC.wings diff --git a/modules/packages3d/Discret/TO18EBC.wrl b/modules/packages3d/Discret.3dshapes/TO18EBC.wrl similarity index 100% rename from modules/packages3d/Discret/TO18EBC.wrl rename to modules/packages3d/Discret.3dshapes/TO18EBC.wrl diff --git a/modules/packages3d/Discret/TO18GSD.wings b/modules/packages3d/Discret.3dshapes/TO18GSD.wings similarity index 100% rename from modules/packages3d/Discret/TO18GSD.wings rename to modules/packages3d/Discret.3dshapes/TO18GSD.wings diff --git a/modules/packages3d/Discret/TO18GSD.wrl b/modules/packages3d/Discret.3dshapes/TO18GSD.wrl similarity index 100% rename from modules/packages3d/Discret/TO18GSD.wrl rename to modules/packages3d/Discret.3dshapes/TO18GSD.wrl diff --git a/modules/packages3d/Discret/TO220.wings b/modules/packages3d/Discret.3dshapes/TO220.wings similarity index 100% rename from modules/packages3d/Discret/TO220.wings rename to modules/packages3d/Discret.3dshapes/TO220.wings diff --git a/modules/packages3d/Discret/TO220.wrl b/modules/packages3d/Discret.3dshapes/TO220.wrl similarity index 100% rename from modules/packages3d/Discret/TO220.wrl rename to modules/packages3d/Discret.3dshapes/TO220.wrl diff --git a/modules/packages3d/Discret/TO220GDS.wings b/modules/packages3d/Discret.3dshapes/TO220GDS.wings similarity index 100% rename from modules/packages3d/Discret/TO220GDS.wings rename to modules/packages3d/Discret.3dshapes/TO220GDS.wings diff --git a/modules/packages3d/Discret/TO220GDS.wrl b/modules/packages3d/Discret.3dshapes/TO220GDS.wrl similarity index 100% rename from modules/packages3d/Discret/TO220GDS.wrl rename to modules/packages3d/Discret.3dshapes/TO220GDS.wrl diff --git a/modules/packages3d/Discret/TO3.wings b/modules/packages3d/Discret.3dshapes/TO3.wings similarity index 100% rename from modules/packages3d/Discret/TO3.wings rename to modules/packages3d/Discret.3dshapes/TO3.wings diff --git a/modules/packages3d/Discret/TO3.wrl b/modules/packages3d/Discret.3dshapes/TO3.wrl similarity index 100% rename from modules/packages3d/Discret/TO3.wrl rename to modules/packages3d/Discret.3dshapes/TO3.wrl diff --git a/modules/packages3d/Discret/TO39EBC.wings b/modules/packages3d/Discret.3dshapes/TO39EBC.wings similarity index 100% rename from modules/packages3d/Discret/TO39EBC.wings rename to modules/packages3d/Discret.3dshapes/TO39EBC.wings diff --git a/modules/packages3d/Discret/TO39EBC.wrl b/modules/packages3d/Discret.3dshapes/TO39EBC.wrl similarity index 100% rename from modules/packages3d/Discret/TO39EBC.wrl rename to modules/packages3d/Discret.3dshapes/TO39EBC.wrl diff --git a/modules/packages3d/Discret/TO92-123.wings b/modules/packages3d/Discret.3dshapes/TO92-123.wings similarity index 100% rename from modules/packages3d/Discret/TO92-123.wings rename to modules/packages3d/Discret.3dshapes/TO92-123.wings diff --git a/modules/packages3d/Discret/TO92-123.wrl b/modules/packages3d/Discret.3dshapes/TO92-123.wrl similarity index 100% rename from modules/packages3d/Discret/TO92-123.wrl rename to modules/packages3d/Discret.3dshapes/TO92-123.wrl diff --git a/modules/packages3d/Discret/TO92-CBE.wings b/modules/packages3d/Discret.3dshapes/TO92-CBE.wings similarity index 100% rename from modules/packages3d/Discret/TO92-CBE.wings rename to modules/packages3d/Discret.3dshapes/TO92-CBE.wings diff --git a/modules/packages3d/Discret/TO92-CBE.wrl b/modules/packages3d/Discret.3dshapes/TO92-CBE.wrl similarity index 100% rename from modules/packages3d/Discret/TO92-CBE.wrl rename to modules/packages3d/Discret.3dshapes/TO92-CBE.wrl diff --git a/modules/packages3d/Discret/TO92-EBC.wings b/modules/packages3d/Discret.3dshapes/TO92-EBC.wings similarity index 100% rename from modules/packages3d/Discret/TO92-EBC.wings rename to modules/packages3d/Discret.3dshapes/TO92-EBC.wings diff --git a/modules/packages3d/Discret/TO92-EBC.wrl b/modules/packages3d/Discret.3dshapes/TO92-EBC.wrl similarity index 100% rename from modules/packages3d/Discret/TO92-EBC.wrl rename to modules/packages3d/Discret.3dshapes/TO92-EBC.wrl diff --git a/modules/packages3d/Discret/TO92-INVERT.wings b/modules/packages3d/Discret.3dshapes/TO92-INVERT.wings similarity index 100% rename from modules/packages3d/Discret/TO92-INVERT.wings rename to modules/packages3d/Discret.3dshapes/TO92-INVERT.wings diff --git a/modules/packages3d/Discret/TO92-INVERT.wrl b/modules/packages3d/Discret.3dshapes/TO92-INVERT.wrl similarity index 100% rename from modules/packages3d/Discret/TO92-INVERT.wrl rename to modules/packages3d/Discret.3dshapes/TO92-INVERT.wrl diff --git a/modules/packages3d/Discret/TO92.wings b/modules/packages3d/Discret.3dshapes/TO92.wings similarity index 100% rename from modules/packages3d/Discret/TO92.wings rename to modules/packages3d/Discret.3dshapes/TO92.wings diff --git a/modules/packages3d/Discret/TO92.wrl b/modules/packages3d/Discret.3dshapes/TO92.wrl similarity index 100% rename from modules/packages3d/Discret/TO92.wrl rename to modules/packages3d/Discret.3dshapes/TO92.wrl diff --git a/modules/packages3d/Discret/TO92DGS.wings b/modules/packages3d/Discret.3dshapes/TO92DGS.wings similarity index 100% rename from modules/packages3d/Discret/TO92DGS.wings rename to modules/packages3d/Discret.3dshapes/TO92DGS.wings diff --git a/modules/packages3d/Discret/TO92DGS.wrl b/modules/packages3d/Discret.3dshapes/TO92DGS.wrl similarity index 100% rename from modules/packages3d/Discret/TO92DGS.wrl rename to modules/packages3d/Discret.3dshapes/TO92DGS.wrl diff --git a/modules/packages3d/Discret/TO92GSD.wings b/modules/packages3d/Discret.3dshapes/TO92GSD.wings similarity index 100% rename from modules/packages3d/Discret/TO92GSD.wings rename to modules/packages3d/Discret.3dshapes/TO92GSD.wings diff --git a/modules/packages3d/Discret/TO92GSD.wrl b/modules/packages3d/Discret.3dshapes/TO92GSD.wrl similarity index 100% rename from modules/packages3d/Discret/TO92GSD.wrl rename to modules/packages3d/Discret.3dshapes/TO92GSD.wrl diff --git a/modules/packages3d/Discret/VP0808.wings b/modules/packages3d/Discret.3dshapes/VP0808.wings similarity index 100% rename from modules/packages3d/Discret/VP0808.wings rename to modules/packages3d/Discret.3dshapes/VP0808.wings diff --git a/modules/packages3d/Discret/VP0808.wrl b/modules/packages3d/Discret.3dshapes/VP0808.wrl similarity index 100% rename from modules/packages3d/Discret/VP0808.wrl rename to modules/packages3d/Discret.3dshapes/VP0808.wrl diff --git a/modules/packages3d/Discret/r_pack8.wings b/modules/packages3d/Discret.3dshapes/r_pack8.wings similarity index 100% rename from modules/packages3d/Discret/r_pack8.wings rename to modules/packages3d/Discret.3dshapes/r_pack8.wings diff --git a/modules/packages3d/Discret/r_pack8.wrl b/modules/packages3d/Discret.3dshapes/r_pack8.wrl similarity index 100% rename from modules/packages3d/Discret/r_pack8.wrl rename to modules/packages3d/Discret.3dshapes/r_pack8.wrl diff --git a/modules/packages3d/Discret/r_pack9.wings b/modules/packages3d/Discret.3dshapes/r_pack9.wings similarity index 100% rename from modules/packages3d/Discret/r_pack9.wings rename to modules/packages3d/Discret.3dshapes/r_pack9.wings diff --git a/modules/packages3d/Discret/r_pack9.wrl b/modules/packages3d/Discret.3dshapes/r_pack9.wrl similarity index 100% rename from modules/packages3d/Discret/r_pack9.wrl rename to modules/packages3d/Discret.3dshapes/r_pack9.wrl diff --git a/modules/packages3d/Display/LCD-016N002L.wings b/modules/packages3d/Display.3dshapes/LCD-016N002L.wings similarity index 100% rename from modules/packages3d/Display/LCD-016N002L.wings rename to modules/packages3d/Display.3dshapes/LCD-016N002L.wings diff --git a/modules/packages3d/Display/LCD-016N002L.wrl b/modules/packages3d/Display.3dshapes/LCD-016N002L.wrl similarity index 100% rename from modules/packages3d/Display/LCD-016N002L.wrl rename to modules/packages3d/Display.3dshapes/LCD-016N002L.wrl diff --git a/modules/packages3d/Displays_7-Segment/7SEGMENT-LED__HDSM531_HDSM533_SMD.wings b/modules/packages3d/Displays_7-Segment.3dshapes/7SEGMENT-LED__HDSM531_HDSM533_SMD.wings similarity index 100% rename from modules/packages3d/Displays_7-Segment/7SEGMENT-LED__HDSM531_HDSM533_SMD.wings rename to modules/packages3d/Displays_7-Segment.3dshapes/7SEGMENT-LED__HDSM531_HDSM533_SMD.wings diff --git a/modules/packages3d/Displays_7-Segment/7SEGMENT-LED__HDSM531_HDSM533_SMD.wrl b/modules/packages3d/Displays_7-Segment.3dshapes/7SEGMENT-LED__HDSM531_HDSM533_SMD.wrl similarity index 100% rename from modules/packages3d/Displays_7-Segment/7SEGMENT-LED__HDSM531_HDSM533_SMD.wrl rename to modules/packages3d/Displays_7-Segment.3dshapes/7SEGMENT-LED__HDSM531_HDSM533_SMD.wrl diff --git a/modules/packages3d/Displays_7-Segment/7SegmentLED_LTS6760_LTS6780.wings b/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_LTS6760_LTS6780.wings similarity index 100% rename from modules/packages3d/Displays_7-Segment/7SegmentLED_LTS6760_LTS6780.wings rename to modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_LTS6760_LTS6780.wings diff --git a/modules/packages3d/Displays_7-Segment/7SegmentLED_LTS6760_LTS6780.wrl b/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_LTS6760_LTS6780.wrl similarity index 100% rename from modules/packages3d/Displays_7-Segment/7SegmentLED_LTS6760_LTS6780.wrl rename to modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_LTS6760_LTS6780.wrl diff --git a/modules/packages3d/Displays_7-Segment/7SegmentLED_SBC18-11EGWA.wings b/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_SBC18-11EGWA.wings similarity index 100% rename from modules/packages3d/Displays_7-Segment/7SegmentLED_SBC18-11EGWA.wings rename to modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_SBC18-11EGWA.wings diff --git a/modules/packages3d/Displays_7-Segment/7SegmentLED_SBC18-11EGWA.wrl b/modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_SBC18-11EGWA.wrl similarity index 100% rename from modules/packages3d/Displays_7-Segment/7SegmentLED_SBC18-11EGWA.wrl rename to modules/packages3d/Displays_7-Segment.3dshapes/7SegmentLED_SBC18-11EGWA.wrl diff --git a/modules/packages3d/Displays_7-Segment/MAN3640A.wings b/modules/packages3d/Displays_7-Segment.3dshapes/MAN3640A.wings similarity index 100% rename from modules/packages3d/Displays_7-Segment/MAN3640A.wings rename to modules/packages3d/Displays_7-Segment.3dshapes/MAN3640A.wings diff --git a/modules/packages3d/Displays_7-Segment/MAN3640A.wrl b/modules/packages3d/Displays_7-Segment.3dshapes/MAN3640A.wrl similarity index 100% rename from modules/packages3d/Displays_7-Segment/MAN3640A.wrl rename to modules/packages3d/Displays_7-Segment.3dshapes/MAN3640A.wrl diff --git a/modules/packages3d/Divers/2PIN_6mm.wings b/modules/packages3d/Divers.3dshapes/2PIN_6mm.wings similarity index 100% rename from modules/packages3d/Divers/2PIN_6mm.wings rename to modules/packages3d/Divers.3dshapes/2PIN_6mm.wings diff --git a/modules/packages3d/Divers/2PIN_6mm.wrl b/modules/packages3d/Divers.3dshapes/2PIN_6mm.wrl similarity index 100% rename from modules/packages3d/Divers/2PIN_6mm.wrl rename to modules/packages3d/Divers.3dshapes/2PIN_6mm.wrl diff --git a/modules/packages3d/Divers/3PIN_6mm.wings b/modules/packages3d/Divers.3dshapes/3PIN_6mm.wings similarity index 100% rename from modules/packages3d/Divers/3PIN_6mm.wings rename to modules/packages3d/Divers.3dshapes/3PIN_6mm.wings diff --git a/modules/packages3d/Divers/3PIN_6mm.wrl b/modules/packages3d/Divers.3dshapes/3PIN_6mm.wrl similarity index 100% rename from modules/packages3d/Divers/3PIN_6mm.wrl rename to modules/packages3d/Divers.3dshapes/3PIN_6mm.wrl diff --git a/modules/packages3d/Divers/LL1538.wings b/modules/packages3d/Divers.3dshapes/LL1538.wings similarity index 100% rename from modules/packages3d/Divers/LL1538.wings rename to modules/packages3d/Divers.3dshapes/LL1538.wings diff --git a/modules/packages3d/Divers/LL1538.wrl b/modules/packages3d/Divers.3dshapes/LL1538.wrl similarity index 100% rename from modules/packages3d/Divers/LL1538.wrl rename to modules/packages3d/Divers.3dshapes/LL1538.wrl diff --git a/modules/packages3d/Divers/LL1587.wings b/modules/packages3d/Divers.3dshapes/LL1587.wings similarity index 100% rename from modules/packages3d/Divers/LL1587.wings rename to modules/packages3d/Divers.3dshapes/LL1587.wings diff --git a/modules/packages3d/Divers/LL1587.wrl b/modules/packages3d/Divers.3dshapes/LL1587.wrl similarity index 100% rename from modules/packages3d/Divers/LL1587.wrl rename to modules/packages3d/Divers.3dshapes/LL1587.wrl diff --git a/modules/packages3d/Divers/OPTORESISTOR_NSL-32.wings b/modules/packages3d/Divers.3dshapes/OPTORESISTOR_NSL-32.wings similarity index 100% rename from modules/packages3d/Divers/OPTORESISTOR_NSL-32.wings rename to modules/packages3d/Divers.3dshapes/OPTORESISTOR_NSL-32.wings diff --git a/modules/packages3d/Divers/OPTORESISTOR_NSL-32.wrl b/modules/packages3d/Divers.3dshapes/OPTORESISTOR_NSL-32.wrl similarity index 100% rename from modules/packages3d/Divers/OPTORESISTOR_NSL-32.wrl rename to modules/packages3d/Divers.3dshapes/OPTORESISTOR_NSL-32.wrl diff --git a/modules/packages3d/Divers/SELF26.wings b/modules/packages3d/Divers.3dshapes/SELF26.wings similarity index 100% rename from modules/packages3d/Divers/SELF26.wings rename to modules/packages3d/Divers.3dshapes/SELF26.wings diff --git a/modules/packages3d/Divers/SELF26.wrl b/modules/packages3d/Divers.3dshapes/SELF26.wrl similarity index 100% rename from modules/packages3d/Divers/SELF26.wrl rename to modules/packages3d/Divers.3dshapes/SELF26.wrl diff --git a/modules/packages3d/Divers/TCXO_G158.wings b/modules/packages3d/Divers.3dshapes/TCXO_G158.wings similarity index 100% rename from modules/packages3d/Divers/TCXO_G158.wings rename to modules/packages3d/Divers.3dshapes/TCXO_G158.wings diff --git a/modules/packages3d/Divers/TCXO_G158.wrl b/modules/packages3d/Divers.3dshapes/TCXO_G158.wrl similarity index 100% rename from modules/packages3d/Divers/TCXO_G158.wrl rename to modules/packages3d/Divers.3dshapes/TCXO_G158.wrl diff --git a/modules/packages3d/Divers/douille_4mm.wings b/modules/packages3d/Divers.3dshapes/douille_4mm.wings similarity index 100% rename from modules/packages3d/Divers/douille_4mm.wings rename to modules/packages3d/Divers.3dshapes/douille_4mm.wings diff --git a/modules/packages3d/Divers/douille_4mm.wrl b/modules/packages3d/Divers.3dshapes/douille_4mm.wrl similarity index 100% rename from modules/packages3d/Divers/douille_4mm.wrl rename to modules/packages3d/Divers.3dshapes/douille_4mm.wrl diff --git a/modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-CarType.wings b/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-CarType.wings similarity index 100% rename from modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-CarType.wings rename to modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-CarType.wings diff --git a/modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-CarType.wrl b/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-CarType.wrl similarity index 100% rename from modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-CarType.wrl rename to modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-CarType.wrl diff --git a/modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-Mini.wings b/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-Mini.wings similarity index 100% rename from modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-Mini.wings rename to modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-Mini.wings diff --git a/modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-Mini.wrl b/modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-Mini.wrl similarity index 100% rename from modules/packages3d/Fuse_Holders_and_Fuses/BladeFuse-Mini.wrl rename to modules/packages3d/Fuse_Holders_and_Fuses.3dshapes/BladeFuse-Mini.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HTFS-Series_LEM-HallEffektCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HTFS-Series_LEM-HallEffektCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HTFS-Series_LEM-HallEffektCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HTFS-Series_LEM-HallEffektCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HTFS-Series_LEM-HallEffektCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HTFS-Series_LEM-HallEffektCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HTFS-Series_LEM-HallEffektCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HTFS-Series_LEM-HallEffektCurrentTransducer.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX02_HX03_HallEffectCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX02_HX03_HallEffectCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX02_HX03_HallEffectCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX02_HX03_HallEffectCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX02_HX03_HallEffectCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX02_HX03_HallEffectCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX02_HX03_HallEffectCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX02_HX03_HallEffectCurrentTransducer.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX04_HX05_HallEffectCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX04_HX05_HallEffectCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX04_HX05_HallEffectCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX04_HX05_HallEffectCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX04_HX05_HallEffectCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX04_HX05_HallEffectCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX04_HX05_HallEffectCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX04_HX05_HallEffectCurrentTransducer.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX06_HX10_HallEffectCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX06_HX10_HallEffectCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX06_HX10_HallEffectCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX06_HX10_HallEffectCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX06_HX10_HallEffectCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX06_HX10_HallEffectCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX06_HX10_HallEffectCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX06_HX10_HallEffectCurrentTransducer.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX15_HallEffectCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX15_HallEffectCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX15_HallEffectCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX15_HallEffectCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX15_HallEffectCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX15_HallEffectCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX15_HallEffectCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX15_HallEffectCurrentTransducer.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX20_HX25_HallEffectCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX20_HX25_HallEffectCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX20_HX25_HallEffectCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX20_HX25_HallEffectCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX20_HX25_HallEffectCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX20_HX25_HallEffectCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX20_HX25_HallEffectCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX20_HX25_HallEffectCurrentTransducer.wrl diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX50_HallEffectCurrentTransducer.wings b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX50_HallEffectCurrentTransducer.wings similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX50_HallEffectCurrentTransducer.wings rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX50_HallEffectCurrentTransducer.wings diff --git a/modules/packages3d/Hall-Effect_Transducers_LEM/HX50_HallEffectCurrentTransducer.wrl b/modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX50_HallEffectCurrentTransducer.wrl similarity index 100% rename from modules/packages3d/Hall-Effect_Transducers_LEM/HX50_HallEffectCurrentTransducer.wrl rename to modules/packages3d/Hall-Effect_Transducers_LEM.3dshapes/HX50_HallEffectCurrentTransducer.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_2x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_2x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_2x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_2x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_2x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_2x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_2x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_2x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-10-1EP_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-10-1EP_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_2x3mm_Pitch0.45mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_2x3mm_Pitch0.45mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_2x3mm_Pitch0.45mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_2x3mm_Pitch0.45mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_2x3mm_Pitch0.45mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_2x3mm_Pitch0.45mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_2x3mm_Pitch0.45mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_2x3mm_Pitch0.45mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x3mm_Pitch0.45mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x3mm_Pitch0.45mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x3mm_Pitch0.45mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x3mm_Pitch0.45mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x3mm_Pitch0.45mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x3mm_Pitch0.45mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x3mm_Pitch0.45mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x3mm_Pitch0.45mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_3x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_3x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-12-1EP_4x4mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-12-1EP_4x4mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_3x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_3x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_3x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_3x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_3x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_3x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_3x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_3x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_4x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_4x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_4x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_4x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_4x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_4x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-14-1EP_4x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-14-1EP_4x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x4mm_Pitch0.45mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x4mm_Pitch0.45mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x4mm_Pitch0.45mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x4mm_Pitch0.45mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x4mm_Pitch0.45mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x4mm_Pitch0.45mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x4mm_Pitch0.45mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x4mm_Pitch0.45mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_3x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_3x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_4x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_4x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_4x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_4x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_4x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_4x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_4x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_4x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_5x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_5x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_5x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_5x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_5x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_5x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-16-1EP_5x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-16-1EP_5x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_3x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_3x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_3x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_3x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_3x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_3x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_3x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_3x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_4x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_4x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_4x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_4x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_4x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_4x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-18-1EP_4x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-18-1EP_4x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-20-1EP_5x6mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-20-1EP_5x6mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-20-1EP_5x6mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-20-1EP_5x6mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-20-1EP_5x6mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-20-1EP_5x6mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-20-1EP_5x6mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-20-1EP_5x6mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-22-1EP_5x6mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-22-1EP_5x6mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-22-1EP_5x6mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-22-1EP_5x6mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-22-1EP_5x6mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-22-1EP_5x6mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-22-1EP_5x6mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-22-1EP_5x6mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-24-1EP_4x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-24-1EP_4x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-24-1EP_4x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-24-1EP_4x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-24-1EP_4x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-24-1EP_4x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-24-1EP_4x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-24-1EP_4x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-32-1EP_4x7mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-32-1EP_4x7mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-32-1EP_4x7mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-32-1EP_4x7mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-32-1EP_4x7mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-32-1EP_4x7mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-32-1EP_4x7mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-32-1EP_4x7mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-44-1EP_5x8.9mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_2x2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_2x2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_3x3mm_Pitch0.95mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_3x3mm_Pitch0.95mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_3x3mm_Pitch0.95mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_3x3mm_Pitch0.95mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_3x3mm_Pitch0.95mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_3x3mm_Pitch0.95mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-6-1EP_3x3mm_Pitch0.95mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-6-1EP_3x3mm_Pitch0.95mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.45mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.45mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.45mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.45mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.45mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.45mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.45mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.45mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x2mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x2mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_2x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_2x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.45mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.45mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.45mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.45mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.45mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.45mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.45mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.45mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x2mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x2mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_3x3mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_3x3mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_4x4mm_Pitch0.8mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_4x4mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_4x4mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_4x4mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_4x4mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_4x4mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-8-1EP_4x4mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-8-1EP_4x4mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/DFN-S-8-1EP_6x5mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-12-1EP_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-12-1EP_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-12-1EP_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-12-1EP_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-12-1EP_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-12-1EP_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-12-1EP_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-12-1EP_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_4x4mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_4x4mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_4x4mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_4x4mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_4x4mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_4x4mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-16-1EP_4x4mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-16-1EP_4x4mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_3x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_3x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_3x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_3x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_3x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_3x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_3x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_3x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_4x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_4x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_5x5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_5x5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_5x5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_5x5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_5x5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_5x5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-20-1EP_5x5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-20-1EP_5x5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_3x4mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_3x4mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_3x4mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_3x4mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_3x4mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_3x4mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_3x4mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_3x4mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_4x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_4x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_5x5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_5x5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_5x5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_5x5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_5x5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_5x5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-24-1EP_5x5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-24-1EP_5x5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_3x6mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_3x6mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_3x6mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_3x6mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_3x6mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_3x6mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_3x6mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_3x6mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x4mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x4mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x4mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x4mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x4mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x4mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x4mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x4mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_4x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_4x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x6mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x6mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x6mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x6mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x6mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x6mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_5x6mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_5x6mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_6x6mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_6x6mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_6x6mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_6x6mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_6x6mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_6x6mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-28-1EP_6x6mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-28-1EP_6x6mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_4x4mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_4x4mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_4x4mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_4x4mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_4x4mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_4x4mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_4x4mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_4x4mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_5x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_5x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_5x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_5x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_5x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_5x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_5x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_5x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_7x7mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_7x7mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_7x7mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_7x7mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_7x7mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_7x7mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-32-1EP_7x7mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-32-1EP_7x7mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-36-1EP_5x6mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-36-1EP_5x6mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-36-1EP_5x6mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-36-1EP_5x6mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-36-1EP_5x6mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-36-1EP_5x6mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-36-1EP_5x6mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-36-1EP_5x6mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_4x6mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_4x6mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_4x6mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_4x6mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_4x6mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_4x6mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_4x6mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_4x6mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_5x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_5x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_5x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_5x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_5x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_5x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-38-1EP_5x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-38-1EP_5x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_5x5mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_5x5mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_5x5mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_5x5mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_5x5mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_5x5mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_5x5mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_5x5mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_6x6mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_6x6mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_6x6mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_6x6mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_6x6mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_6x6mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-40-1EP_6x6mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-40-1EP_6x6mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-42-1EP_5x6mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-42-1EP_5x6mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-42-1EP_5x6mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-42-1EP_5x6mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-42-1EP_5x6mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-42-1EP_5x6mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-42-1EP_5x6mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-42-1EP_5x6mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_7x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_7x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_7x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_7x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_7x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_7x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_7x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_7x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_8x8mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_8x8mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_8x8mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_8x8mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_8x8mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_8x8mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-44-1EP_8x8mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-44-1EP_8x8mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-48-1EP_7x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-48-1EP_7x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-48-1EP_7x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-48-1EP_7x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-48-1EP_7x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-48-1EP_7x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-48-1EP_7x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-48-1EP_7x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-52-1EP_7x8mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-52-1EP_7x8mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-52-1EP_7x8mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-52-1EP_7x8mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-52-1EP_7x8mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-52-1EP_7x8mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-52-1EP_7x8mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-52-1EP_7x8mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-64-1EP_9x9mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-64-1EP_9x9mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-64-1EP_9x9mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-64-1EP_9x9mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/QFN-64-1EP_9x9mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-64-1EP_9x9mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/QFN-64-1EP_9x9mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/QFN-64-1EP_9x9mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_4x4mm_Pitch0.65mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_4x4mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_4x4mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_4x4mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_4x4mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_4x4mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-16-1EP_4x4mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-16-1EP_4x4mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_3x3mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_3x3mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_3x3mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_3x3mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_3x3mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_3x3mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_3x3mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_3x3mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_4x4mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_4x4mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_4x4mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_4x4mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_4x4mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_4x4mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-20-1EP_4x4mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-20-1EP_4x4mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-28-1EP_4x4mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-28-1EP_4x4mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-28-1EP_4x4mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-28-1EP_4x4mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-28-1EP_4x4mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-28-1EP_4x4mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-28-1EP_4x4mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-28-1EP_4x4mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-40-1EP_5x5mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-40-1EP_5x5mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-40-1EP_5x5mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-40-1EP_5x5mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-40-1EP_5x5mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-40-1EP_5x5mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-40-1EP_5x5mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-40-1EP_5x5mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-48-1EP_6x6mm_Pitch0.4mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-48-1EP_6x6mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-48-1EP_6x6mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-48-1EP_6x6mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/UQFN-48-1EP_6x6mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-48-1EP_6x6mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/UQFN-48-1EP_6x6mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/UQFN-48-1EP_6x6mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_DFN_QFN/VDFN-8-1EP_2x2mm_Pitch0.5mm.wings b/modules/packages3d/Housings_DFN_QFN.3dshapes/VDFN-8-1EP_2x2mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/VDFN-8-1EP_2x2mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_DFN_QFN.3dshapes/VDFN-8-1EP_2x2mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_DFN_QFN/VDFN-8-1EP_2x2mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_DFN_QFN.3dshapes/VDFN-8-1EP_2x2mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_DFN_QFN/VDFN-8-1EP_2x2mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_DFN_QFN.3dshapes/VDFN-8-1EP_2x2mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-100_14x14mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-100_14x14mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-100_14x14mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-100_14x14mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-100_14x14mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-100_14x14mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-100_14x14mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-100_14x14mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-128_14x14mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x14mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-128_14x14mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x14mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-128_14x14mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x14mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-128_14x14mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x14mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-128_14x20mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x20mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-128_14x20mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x20mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-128_14x20mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x20mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-128_14x20mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-128_14x20mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-144_20x20mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-144_20x20mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-144_20x20mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-144_20x20mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-144_20x20mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-144_20x20mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-144_20x20mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-144_20x20mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-160_24x24mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-160_24x24mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-160_24x24mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-160_24x24mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-160_24x24mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-160_24x24mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-160_24x24mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-160_24x24mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-176_20x20mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-176_20x20mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-176_20x20mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-176_20x20mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-176_20x20mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-176_20x20mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-176_20x20mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-176_20x20mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-176_24x24mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-176_24x24mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-176_24x24mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-176_24x24mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-176_24x24mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-176_24x24mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-176_24x24mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-176_24x24mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-208_28x28mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-208_28x28mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-208_28x28mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-208_28x28mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-208_28x28mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-208_28x28mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-208_28x28mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-208_28x28mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-216_24x24mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-216_24x24mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-216_24x24mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-216_24x24mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-216_24x24mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-216_24x24mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-216_24x24mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-216_24x24mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-32_5x5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-32_5x5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-32_5x5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-32_5x5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-32_5x5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-32_5x5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-32_5x5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-32_5x5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-32_7x7mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-32_7x7mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-32_7x7mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-32_7x7mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-32_7x7mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-32_7x7mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-32_7x7mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-32_7x7mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-36_7x7mm_Pitch0.65mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-36_7x7mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-36_7x7mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-36_7x7mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-36_7x7mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-36_7x7mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-36_7x7mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-36_7x7mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-44_10x10mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-44_10x10mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-44_10x10mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-44_10x10mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-44_10x10mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-44_10x10mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-44_10x10mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-44_10x10mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-48_7x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-48_7x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-48_7x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-48_7x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-48_7x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-48_7x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-48_7x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-48_7x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-52-1EP_10x10mm_Pitch0.65mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-52-1EP_10x10mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-52-1EP_10x10mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-52-1EP_10x10mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-52-1EP_10x10mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-52-1EP_10x10mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-52-1EP_10x10mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-52-1EP_10x10mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-52_10x10mm_Pitch0.65mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-52_10x10mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-52_10x10mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-52_10x10mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-52_10x10mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-52_10x10mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-52_10x10mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-52_10x10mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-64_10x10mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-64_10x10mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-64_10x10mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-64_10x10mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-64_10x10mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-64_10x10mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-64_10x10mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-64_10x10mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-64_14x14mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-64_14x14mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-64_14x14mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-64_14x14mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-64_14x14mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-64_14x14mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-64_14x14mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-64_14x14mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-64_7x7mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-64_7x7mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-64_7x7mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-64_7x7mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-64_7x7mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-64_7x7mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-64_7x7mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-64_7x7mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/LQFP-80_12x12mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/LQFP-80_12x12mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-80_12x12mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-80_12x12mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/LQFP-80_12x12mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/LQFP-80_12x12mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/LQFP-80_12x12mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/LQFP-80_12x12mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/PQFP-100_14x20mm_Pitch0.65mm.wings b/modules/packages3d/Housings_QFP.3dshapes/PQFP-100_14x20mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/PQFP-100_14x20mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/PQFP-100_14x20mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_QFP/PQFP-100_14x20mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/PQFP-100_14x20mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/PQFP-100_14x20mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/PQFP-100_14x20mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_QFP/PQFP-256_28x28mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/PQFP-256_28x28mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/PQFP-256_28x28mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/PQFP-256_28x28mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/PQFP-256_28x28mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/PQFP-256_28x28mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/PQFP-256_28x28mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/PQFP-256_28x28mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/PQFP-80_14x20mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/PQFP-80_14x20mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/PQFP-80_14x20mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/PQFP-80_14x20mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/PQFP-80_14x20mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/PQFP-80_14x20mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/PQFP-80_14x20mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/PQFP-80_14x20mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-100_12x12mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-100_12x12mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-100_12x12mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-100_12x12mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-100_12x12mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-100_12x12mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-100_12x12mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-100_12x12mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-100_14x14mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-100_14x14mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-100_14x14mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-100_14x14mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-100_14x14mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-100_14x14mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-100_14x14mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-100_14x14mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-120_14x14mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-120_14x14mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-120_14x14mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-120_14x14mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-120_14x14mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-120_14x14mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-120_14x14mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-120_14x14mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-128_14x14mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-128_14x14mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-128_14x14mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-128_14x14mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-128_14x14mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-128_14x14mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-128_14x14mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-128_14x14mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-144_16x16mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-144_16x16mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-144_16x16mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-144_16x16mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-144_16x16mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-144_16x16mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-144_16x16mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-144_16x16mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-144_20x20mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-144_20x20mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-144_20x20mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-144_20x20mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-144_20x20mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-144_20x20mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-144_20x20mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-144_20x20mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-32_7x7mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-32_7x7mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-32_7x7mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-32_7x7mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-32_7x7mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-32_7x7mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-32_7x7mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-32_7x7mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-44-1EP_10x10mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-44-1EP_10x10mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-44-1EP_10x10mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-44-1EP_10x10mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-44-1EP_10x10mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-44-1EP_10x10mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-44-1EP_10x10mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-44-1EP_10x10mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-44_10x10mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-44_10x10mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-44_10x10mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-44_10x10mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-44_10x10mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-44_10x10mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-44_10x10mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-44_10x10mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-48-1EP_7x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-48-1EP_7x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-48-1EP_7x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-48-1EP_7x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-48-1EP_7x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-48-1EP_7x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-48-1EP_7x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-48-1EP_7x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-48_7x7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-48_7x7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-48_7x7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-48_7x7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-48_7x7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-48_7x7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-48_7x7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-48_7x7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-64_10x10mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-64_10x10mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-64_10x10mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-64_10x10mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-64_10x10mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-64_10x10mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-64_10x10mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-64_10x10mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-64_14x14mm_Pitch0.8mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-64_14x14mm_Pitch0.8mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-64_14x14mm_Pitch0.8mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-64_14x14mm_Pitch0.8mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-64_14x14mm_Pitch0.8mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-64_14x14mm_Pitch0.8mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-64_14x14mm_Pitch0.8mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-64_14x14mm_Pitch0.8mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-64_7x7mm_Pitch0.4mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-64_7x7mm_Pitch0.4mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-64_7x7mm_Pitch0.4mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-64_7x7mm_Pitch0.4mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-64_7x7mm_Pitch0.4mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-64_7x7mm_Pitch0.4mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-64_7x7mm_Pitch0.4mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-64_7x7mm_Pitch0.4mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-80_12x12mm_Pitch0.5mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-80_12x12mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-80_12x12mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-80_12x12mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-80_12x12mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-80_12x12mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-80_12x12mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-80_12x12mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_QFP/TQFP-80_14x14mm_Pitch0.65mm.wings b/modules/packages3d/Housings_QFP.3dshapes/TQFP-80_14x14mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-80_14x14mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-80_14x14mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_QFP/TQFP-80_14x14mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_QFP.3dshapes/TQFP-80_14x14mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_QFP/TQFP-80_14x14mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_QFP.3dshapes/TQFP-80_14x14mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_ROHM/VLM0806_Housing.wings b/modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing.wings similarity index 100% rename from modules/packages3d/Housings_ROHM/VLM0806_Housing.wings rename to modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing.wings diff --git a/modules/packages3d/Housings_ROHM/VLM0806_Housing.wrl b/modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_ROHM/VLM0806_Housing.wrl rename to modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing.wrl diff --git a/modules/packages3d/Housings_ROHM/VLM0806_Housing_Handsoldering.wings b/modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_ROHM/VLM0806_Housing_Handsoldering.wings rename to modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing_Handsoldering.wings diff --git a/modules/packages3d/Housings_ROHM/VLM0806_Housing_Handsoldering.wrl b/modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_ROHM/VLM0806_Housing_Handsoldering.wrl rename to modules/packages3d/Housings_ROHM.3dshapes/VLM0806_Housing_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SIP/SIP9_Housing.wings b/modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing.wings similarity index 100% rename from modules/packages3d/Housings_SIP/SIP9_Housing.wings rename to modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing.wings diff --git a/modules/packages3d/Housings_SIP/SIP9_Housing.wrl b/modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_SIP/SIP9_Housing.wrl rename to modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing.wrl diff --git a/modules/packages3d/Housings_SIP/SIP9_Housing_BigPads.wings b/modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing_BigPads.wings similarity index 100% rename from modules/packages3d/Housings_SIP/SIP9_Housing_BigPads.wings rename to modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing_BigPads.wings diff --git a/modules/packages3d/Housings_SIP/SIP9_Housing_BigPads.wrl b/modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing_BigPads.wrl similarity index 100% rename from modules/packages3d/Housings_SIP/SIP9_Housing_BigPads.wrl rename to modules/packages3d/Housings_SIP.3dshapes/SIP9_Housing_BigPads.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-14_3.9x8.7mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-14_3.9x8.7mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-14_3.9x8.7mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-14_3.9x8.7mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-14_3.9x8.7mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-14_3.9x8.7mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-14_3.9x8.7mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-14_3.9x8.7mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-16_3.9x9.9mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_3.9x9.9mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-16_3.9x9.9mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_3.9x9.9mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-16_3.9x9.9mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_3.9x9.9mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-16_3.9x9.9mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_3.9x9.9mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-16_7.5x10.3mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_7.5x10.3mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-16_7.5x10.3mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_7.5x10.3mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-16_7.5x10.3mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_7.5x10.3mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-16_7.5x10.3mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-16_7.5x10.3mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-18_7.5x11.6mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-18_7.5x11.6mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-18_7.5x11.6mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-18_7.5x11.6mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-18_7.5x11.6mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-18_7.5x11.6mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-18_7.5x11.6mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-18_7.5x11.6mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-20_7.5x12.8mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-20_7.5x12.8mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-20_7.5x12.8mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-20_7.5x12.8mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-20_7.5x12.8mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-20_7.5x12.8mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-20_7.5x12.8mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-20_7.5x12.8mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-24_7.5x15.4mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-24_7.5x15.4mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-24_7.5x15.4mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-24_7.5x15.4mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-24_7.5x15.4mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-24_7.5x15.4mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-24_7.5x15.4mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-24_7.5x15.4mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-28_7.5x17.9mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-28_7.5x17.9mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-28_7.5x17.9mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-28_7.5x17.9mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-28_7.5x17.9mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-28_7.5x17.9mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-28_7.5x17.9mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-28_7.5x17.9mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIC-8_3.9x4.9mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-8_3.9x4.9mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOIC/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wings b/modules/packages3d/Housings_SOIC.3dshapes/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wings similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wings rename to modules/packages3d/Housings_SOIC.3dshapes/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wings diff --git a/modules/packages3d/Housings_SOIC/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wrl b/modules/packages3d/Housings_SOIC.3dshapes/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wrl similarity index 100% rename from modules/packages3d/Housings_SOIC/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wrl rename to modules/packages3d/Housings_SOIC.3dshapes/SOIJ-8_5.3x5.3mm_Pitch1.27mm.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6_Handsoldering.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6_Handsoldering.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6_Handsoldering.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SC-70-6_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SC-70-6_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse_Handsoldering.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse_Handsoldering.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse_Handsoldering.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143R_Reverse_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143R_Reverse_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143_Handsoldering.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143_Handsoldering.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143_Handsoldering.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-143_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-143_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-5.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-5.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-5.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-5.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-5.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-6.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-6.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-6.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23-6.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23-6.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23_Handsoldering.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23_Handsoldering.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23_Handsoldering.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/SOT-23_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/SOT-23_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A.wrl diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A_Handsoldering.wings b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A_Handsoldering.wings rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A_Handsoldering.wrl b/modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6/TSOT-6-MK06A_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-23_SOT-143_TSOT-6.3dshapes/TSOT-6-MK06A_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT-89/SOT89-3_Housing.wings b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wings similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-3_Housing.wings rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wings diff --git a/modules/packages3d/Housings_SOT-89/SOT89-3_Housing.wrl b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-3_Housing.wrl rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing.wrl diff --git a/modules/packages3d/Housings_SOT-89/SOT89-3_Housing_Handsoldering.wings b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-3_Housing_Handsoldering.wings rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-89/SOT89-3_Housing_Handsoldering.wrl b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-3_Housing_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-3_Housing_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT-89/SOT89-5_Housing.wings b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wings similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-5_Housing.wings rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wings diff --git a/modules/packages3d/Housings_SOT-89/SOT89-5_Housing.wrl b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-5_Housing.wrl rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing.wrl diff --git a/modules/packages3d/Housings_SOT-89/SOT89-5_Housing_Handsoldering.wings b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wings similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-5_Housing_Handsoldering.wings rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wings diff --git a/modules/packages3d/Housings_SOT-89/SOT89-5_Housing_Handsoldering.wrl b/modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Housings_SOT-89/SOT89-5_Housing_Handsoldering.wrl rename to modules/packages3d/Housings_SOT-89.3dshapes/SOT89-5_Housing_Handsoldering.wrl diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal.wings b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wings similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal.wings rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wings diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal.wrl b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wrl similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal.wrl rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal.wrl diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal_Reverse.wings b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wings similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal_Reverse.wings rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wings diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal_Reverse.wrl b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wrl similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Horizontal_Reverse.wrl rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Horizontal_Reverse.wrl diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical.wings b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wings similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical.wings rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wings diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical.wrl b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wrl similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical.wrl rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical.wrl diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_BigPads.wings b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wings similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_BigPads.wings rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wings diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_BigPads.wrl b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wrl similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_BigPads.wrl rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_BigPads.wrl diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_Mirrored.wings b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wings similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_Mirrored.wings rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wings diff --git a/modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_Mirrored.wrl b/modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wrl similarity index 100% rename from modules/packages3d/Housings_SOT/SOT126_SOT32_Housing_Vertical_Mirrored.wrl rename to modules/packages3d/Housings_SOT.3dshapes/SOT126_SOT32_Housing_Vertical_Mirrored.wrl diff --git a/modules/packages3d/Housings_SSOP/MSOP-10-1EP_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-10-1EP_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-10-1EP_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-10-1EP_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_SSOP/MSOP-10-1EP_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-10-1EP_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-10-1EP_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-10-1EP_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_SSOP/MSOP-10_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-10_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-10_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-10_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_SSOP/MSOP-10_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-10_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-10_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-10_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_SSOP/MSOP-12-1EP_3x4mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-12-1EP_3x4mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-12-1EP_3x4mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-12-1EP_3x4mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/MSOP-12-1EP_3x4mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-12-1EP_3x4mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-12-1EP_3x4mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-12-1EP_3x4mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/MSOP-12_3x4mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-12_3x4mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-12_3x4mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-12_3x4mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/MSOP-12_3x4mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-12_3x4mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-12_3x4mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-12_3x4mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/MSOP-8-1EP_3x3mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8-1EP_3x3mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-8-1EP_3x3mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-8-1EP_3x3mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/MSOP-8-1EP_3x3mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8-1EP_3x3mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-8-1EP_3x3mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-8-1EP_3x3mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/MSOP-8_3x3mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8_3x3mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-8_3x3mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-8_3x3mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/MSOP-8_3x3mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/MSOP-8_3x3mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/MSOP-8_3x3mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/MSOP-8_3x3mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/QSOP-16_3.9x4.9mm_Pitch0.635mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/QSOP-16_3.9x4.9mm_Pitch0.635mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/QSOP-16_3.9x4.9mm_Pitch0.635mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/QSOP-16_3.9x4.9mm_Pitch0.635mm.wings diff --git a/modules/packages3d/Housings_SSOP/QSOP-16_3.9x4.9mm_Pitch0.635mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/QSOP-16_3.9x4.9mm_Pitch0.635mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/QSOP-16_3.9x4.9mm_Pitch0.635mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/QSOP-16_3.9x4.9mm_Pitch0.635mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-14_5.3x6.2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-14_5.3x6.2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-14_5.3x6.2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-14_5.3x6.2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-14_5.3x6.2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-14_5.3x6.2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-14_5.3x6.2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-14_5.3x6.2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-16_3.9x4.9mm_Pitch0.635mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_3.9x4.9mm_Pitch0.635mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-16_3.9x4.9mm_Pitch0.635mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_3.9x4.9mm_Pitch0.635mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-16_3.9x4.9mm_Pitch0.635mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_3.9x4.9mm_Pitch0.635mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-16_3.9x4.9mm_Pitch0.635mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_3.9x4.9mm_Pitch0.635mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-16_4.4x5.2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_4.4x5.2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-16_4.4x5.2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_4.4x5.2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-16_4.4x5.2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_4.4x5.2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-16_4.4x5.2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_4.4x5.2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-16_5.3x6.2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_5.3x6.2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-16_5.3x6.2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_5.3x6.2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-16_5.3x6.2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_5.3x6.2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-16_5.3x6.2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-16_5.3x6.2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-20_4.4x6.5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_4.4x6.5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-20_4.4x6.5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_4.4x6.5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-20_4.4x6.5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_4.4x6.5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-20_4.4x6.5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_4.4x6.5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-20_5.3x7.2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_5.3x7.2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-20_5.3x7.2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_5.3x7.2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-20_5.3x7.2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_5.3x7.2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-20_5.3x7.2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-20_5.3x7.2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-24_3.9x8.7mm_Pitch0.635mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_3.9x8.7mm_Pitch0.635mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-24_3.9x8.7mm_Pitch0.635mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_3.9x8.7mm_Pitch0.635mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-24_3.9x8.7mm_Pitch0.635mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_3.9x8.7mm_Pitch0.635mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-24_3.9x8.7mm_Pitch0.635mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_3.9x8.7mm_Pitch0.635mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-24_5.3x8.2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_5.3x8.2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-24_5.3x8.2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_5.3x8.2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-24_5.3x8.2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_5.3x8.2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-24_5.3x8.2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-24_5.3x8.2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-28_5.3x10.2mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-28_5.3x10.2mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-28_5.3x10.2mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-28_5.3x10.2mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-28_5.3x10.2mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-28_5.3x10.2mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-28_5.3x10.2mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-28_5.3x10.2mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-48_7.5x15.9mm_Pitch0.635mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-48_7.5x15.9mm_Pitch0.635mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-48_7.5x15.9mm_Pitch0.635mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-48_7.5x15.9mm_Pitch0.635mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-48_7.5x15.9mm_Pitch0.635mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-48_7.5x15.9mm_Pitch0.635mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-48_7.5x15.9mm_Pitch0.635mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-48_7.5x15.9mm_Pitch0.635mm.wrl diff --git a/modules/packages3d/Housings_SSOP/SSOP-56_7.5x18.5mm_Pitch0.635mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-56_7.5x18.5mm_Pitch0.635mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-56_7.5x18.5mm_Pitch0.635mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-56_7.5x18.5mm_Pitch0.635mm.wings diff --git a/modules/packages3d/Housings_SSOP/SSOP-56_7.5x18.5mm_Pitch0.635mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/SSOP-56_7.5x18.5mm_Pitch0.635mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/SSOP-56_7.5x18.5mm_Pitch0.635mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/SSOP-56_7.5x18.5mm_Pitch0.635mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-10_3x3mm_Pitch0.5mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-10_3x3mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-10_3x3mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-10_3x3mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-10_3x3mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-10_3x3mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-10_3x3mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-10_3x3mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-14_4.4x5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-14_4.4x5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-14_4.4x5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-14_4.4x5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-14_4.4x5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-14_4.4x5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-14_4.4x5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-14_4.4x5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16-1EP_4.4x5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-16_4.4x5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16_4.4x5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-16_4.4x5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16_4.4x5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-16_4.4x5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16_4.4x5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-16_4.4x5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-16_4.4x5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-20_4.4x6.5mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-24_4.4x7.8mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-28_4.4x9.7mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-32_6.1x11mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-32_6.1x11mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-32_6.1x11mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-32_6.1x11mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-32_6.1x11mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-32_6.1x11mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-32_6.1x11mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-32_6.1x11mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-38_4.4x9.7mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-48_6.1x12.5mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-56_6.1x14mm_Pitch0.5mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-56_6.1x14mm_Pitch0.5mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-56_6.1x14mm_Pitch0.5mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-56_6.1x14mm_Pitch0.5mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-56_6.1x14mm_Pitch0.5mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-56_6.1x14mm_Pitch0.5mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-56_6.1x14mm_Pitch0.5mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-56_6.1x14mm_Pitch0.5mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-8_3x3mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_3x3mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-8_3x3mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_3x3mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-8_3x3mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_3x3mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-8_3x3mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_3x3mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/TSSOP-8_4.4x3mm_Pitch0.65mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_4.4x3mm_Pitch0.65mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-8_4.4x3mm_Pitch0.65mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_4.4x3mm_Pitch0.65mm.wings diff --git a/modules/packages3d/Housings_SSOP/TSSOP-8_4.4x3mm_Pitch0.65mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_4.4x3mm_Pitch0.65mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/TSSOP-8_4.4x3mm_Pitch0.65mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/TSSOP-8_4.4x3mm_Pitch0.65mm.wrl diff --git a/modules/packages3d/Housings_SSOP/VSO-40_7.6x15.4mm_Pitch0.762mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/VSO-40_7.6x15.4mm_Pitch0.762mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/VSO-40_7.6x15.4mm_Pitch0.762mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/VSO-40_7.6x15.4mm_Pitch0.762mm.wings diff --git a/modules/packages3d/Housings_SSOP/VSO-40_7.6x15.4mm_Pitch0.762mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/VSO-40_7.6x15.4mm_Pitch0.762mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/VSO-40_7.6x15.4mm_Pitch0.762mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/VSO-40_7.6x15.4mm_Pitch0.762mm.wrl diff --git a/modules/packages3d/Housings_SSOP/VSO-56_11.1x21.5mm_Pitch0.75mm.wings b/modules/packages3d/Housings_SSOP.3dshapes/VSO-56_11.1x21.5mm_Pitch0.75mm.wings similarity index 100% rename from modules/packages3d/Housings_SSOP/VSO-56_11.1x21.5mm_Pitch0.75mm.wings rename to modules/packages3d/Housings_SSOP.3dshapes/VSO-56_11.1x21.5mm_Pitch0.75mm.wings diff --git a/modules/packages3d/Housings_SSOP/VSO-56_11.1x21.5mm_Pitch0.75mm.wrl b/modules/packages3d/Housings_SSOP.3dshapes/VSO-56_11.1x21.5mm_Pitch0.75mm.wrl similarity index 100% rename from modules/packages3d/Housings_SSOP/VSO-56_11.1x21.5mm_Pitch0.75mm.wrl rename to modules/packages3d/Housings_SSOP.3dshapes/VSO-56_11.1x21.5mm_Pitch0.75mm.wrl diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_2Pin.wings b/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wings similarity index 100% rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_2Pin.wings rename to modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wings diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_2Pin.wrl b/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wrl similarity index 100% rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_2Pin.wrl rename to modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_2Pin.wrl diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_3Pin.wings b/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wings similarity index 100% rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_3Pin.wings rename to modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wings diff --git a/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_3Pin.wrl b/modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wrl similarity index 100% rename from modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43/TO-18_3Pin.wrl rename to modules/packages3d/Housings_TO-12_TO-18_TO-42_TO-43.3dshapes/TO-18_3Pin.wrl diff --git a/modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_NoHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_NoHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_NoHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_NoHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_NoHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_WithHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_WithHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_WithHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/PowerMacro_PackageStyle-M234_WithHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/PowerMacro_PackageStyle-M234_WithHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_LongPad-NoHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_LongPad-NoHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_LongPad-NoHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_LongPad-NoHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-NoHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_LongPad-WithHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_LongPad-WithHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_LongPad-WithHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_LongPad-WithHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_LongPad-WithHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-NoHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-NoHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-NoHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-NoHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-NoHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-WithHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-WithHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-WithHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-3_ShortPad-WithHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-3_ShortPad-WithHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_LongPad-NoHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_LongPad-NoHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_LongPad-NoHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_LongPad-NoHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-NoHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_LongPad-WithHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_LongPad-WithHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_LongPad-WithHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_LongPad-WithHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_LongPad-WithHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-NoHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-NoHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-NoHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-NoHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-NoHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-WithHole_Housing.wings b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wings similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-WithHole_Housing.wings rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wings diff --git a/modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-WithHole_Housing.wrl b/modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wrl similarity index 100% rename from modules/packages3d/Housings_TO-50/TO-50-4_ShortPad-WithHole_Housing.wrl rename to modules/packages3d/Housings_TO-50.3dshapes/TO-50-4_ShortPad-WithHole_Housing.wrl diff --git a/modules/packages3d/Housings_TO-78/TO-78_Housing_10Pin.wings b/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wings similarity index 100% rename from modules/packages3d/Housings_TO-78/TO-78_Housing_10Pin.wings rename to modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wings diff --git a/modules/packages3d/Housings_TO-78/TO-78_Housing_10Pin.wrl b/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wrl similarity index 100% rename from modules/packages3d/Housings_TO-78/TO-78_Housing_10Pin.wrl rename to modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_10Pin.wrl diff --git a/modules/packages3d/Housings_TO-78/TO-78_Housing_6Pin.wings b/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wings similarity index 100% rename from modules/packages3d/Housings_TO-78/TO-78_Housing_6Pin.wings rename to modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wings diff --git a/modules/packages3d/Housings_TO-78/TO-78_Housing_6Pin.wrl b/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wrl similarity index 100% rename from modules/packages3d/Housings_TO-78/TO-78_Housing_6Pin.wrl rename to modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_6Pin.wrl diff --git a/modules/packages3d/Housings_TO-78/TO-78_Housing_8Pin.wings b/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wings similarity index 100% rename from modules/packages3d/Housings_TO-78/TO-78_Housing_8Pin.wings rename to modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wings diff --git a/modules/packages3d/Housings_TO-78/TO-78_Housing_8Pin.wrl b/modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wrl similarity index 100% rename from modules/packages3d/Housings_TO-78/TO-78_Housing_8Pin.wrl rename to modules/packages3d/Housings_TO-78.3dshapes/TO-78_Housing_8Pin.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Inline_Narrow_Oval.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Inline_Narrow_Oval.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Inline_Narrow_Oval.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Inline_Narrow_Oval.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Inline_Narrow_Oval.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Molded_Narrow.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Molded_Narrow.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Molded_Narrow.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal1_Molded_Narrow.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal1_Molded_Narrow.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Inline_Narrow_Oval.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Inline_Narrow_Oval.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Inline_Narrow_Oval.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Inline_Narrow_Oval.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Inline_Narrow_Oval.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Molded_Narrow.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Molded_Narrow.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Molded_Narrow.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Horizontal2_Molded_Narrow.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Horizontal2_Molded_Narrow.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Inline_Narrow_Oval.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Inline_Narrow_Oval.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Inline_Narrow_Oval.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Inline_Narrow_Oval.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Narrow_Oval.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Inline_Wide.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Inline_Wide.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Inline_Wide.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Inline_Wide.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Inline_Wide.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Oval.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Oval.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Oval.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Oval.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Oval.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Reverse.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Reverse.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Reverse.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Narrow_Reverse.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Narrow_Reverse.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval_Reverse.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval_Reverse.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval_Reverse.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Oval_Reverse.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Oval_Reverse.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Reverse.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Reverse.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Reverse.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Molded_Wide_Reverse.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Molded_Wide_Reverse.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Rugged.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Rugged.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Rugged.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Rugged.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged.wrl diff --git a/modules/packages3d/Housings_TO-92/TO-92_Rugged_Reverse.wings b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wings similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Rugged_Reverse.wings rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wings diff --git a/modules/packages3d/Housings_TO-92/TO-92_Rugged_Reverse.wrl b/modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wrl similarity index 100% rename from modules/packages3d/Housings_TO-92/TO-92_Rugged_Reverse.wrl rename to modules/packages3d/Housings_TO-92.3dshapes/TO-92_Rugged_Reverse.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_L8-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_L8-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MN-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MN-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MP-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MP-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MT-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MT-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MX-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MX-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Numnbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Numnbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Numnbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Numnbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Numnbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Numnbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_MZ-Outline_Numnbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_MZ-Outline_Numnbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_S1-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_S1-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SH-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SH-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SJ-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SJ-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_SQ-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_SQ-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Names.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Names.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Names.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Names.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Names.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Names.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Names.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Names.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers.wrl diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wings b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wings similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wings rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wings diff --git a/modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wrl b/modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wrl similarity index 100% rename from modules/packages3d/IR-DirectFETs/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wrl rename to modules/packages3d/IR-DirectFETs.3dshapes/IR-directFET_ST-Outline_Numbers_SquareHeatSink.wrl diff --git a/modules/packages3d/Inductors/INDUCTOR_V.wings b/modules/packages3d/Inductors.3dshapes/INDUCTOR_V.wings similarity index 100% rename from modules/packages3d/Inductors/INDUCTOR_V.wings rename to modules/packages3d/Inductors.3dshapes/INDUCTOR_V.wings diff --git a/modules/packages3d/Inductors/INDUCTOR_V.wrl b/modules/packages3d/Inductors.3dshapes/INDUCTOR_V.wrl similarity index 100% rename from modules/packages3d/Inductors/INDUCTOR_V.wrl rename to modules/packages3d/Inductors.3dshapes/INDUCTOR_V.wrl diff --git a/modules/packages3d/Inductors/SELF-WE-PD-XXL.wings b/modules/packages3d/Inductors.3dshapes/SELF-WE-PD-XXL.wings similarity index 100% rename from modules/packages3d/Inductors/SELF-WE-PD-XXL.wings rename to modules/packages3d/Inductors.3dshapes/SELF-WE-PD-XXL.wings diff --git a/modules/packages3d/Inductors/SELF-WE-PD-XXL.wrl b/modules/packages3d/Inductors.3dshapes/SELF-WE-PD-XXL.wrl similarity index 100% rename from modules/packages3d/Inductors/SELF-WE-PD-XXL.wrl rename to modules/packages3d/Inductors.3dshapes/SELF-WE-PD-XXL.wrl diff --git a/modules/packages3d/Inductors/SELF-WE-PD3S.wings b/modules/packages3d/Inductors.3dshapes/SELF-WE-PD3S.wings similarity index 100% rename from modules/packages3d/Inductors/SELF-WE-PD3S.wings rename to modules/packages3d/Inductors.3dshapes/SELF-WE-PD3S.wings diff --git a/modules/packages3d/Inductors/SELF-WE-PD3S.wrl b/modules/packages3d/Inductors.3dshapes/SELF-WE-PD3S.wrl similarity index 100% rename from modules/packages3d/Inductors/SELF-WE-PD3S.wrl rename to modules/packages3d/Inductors.3dshapes/SELF-WE-PD3S.wrl diff --git a/modules/packages3d/Inductors/SELF-WE-TPC_M.wings b/modules/packages3d/Inductors.3dshapes/SELF-WE-TPC_M.wings similarity index 100% rename from modules/packages3d/Inductors/SELF-WE-TPC_M.wings rename to modules/packages3d/Inductors.3dshapes/SELF-WE-TPC_M.wings diff --git a/modules/packages3d/Inductors/SELF-WE-TPC_M.wrl b/modules/packages3d/Inductors.3dshapes/SELF-WE-TPC_M.wrl similarity index 100% rename from modules/packages3d/Inductors/SELF-WE-TPC_M.wrl rename to modules/packages3d/Inductors.3dshapes/SELF-WE-TPC_M.wrl diff --git a/modules/packages3d/Inductors/self_cms_we-pd3.wings b/modules/packages3d/Inductors.3dshapes/self_cms_we-pd3.wings similarity index 100% rename from modules/packages3d/Inductors/self_cms_we-pd3.wings rename to modules/packages3d/Inductors.3dshapes/self_cms_we-pd3.wings diff --git a/modules/packages3d/Inductors/self_cms_we-pd3.wrl b/modules/packages3d/Inductors.3dshapes/self_cms_we-pd3.wrl similarity index 100% rename from modules/packages3d/Inductors/self_cms_we-pd3.wrl rename to modules/packages3d/Inductors.3dshapes/self_cms_we-pd3.wrl diff --git a/modules/packages3d/Inductors/self_cms_we-tpc_XL.wings b/modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wings similarity index 100% rename from modules/packages3d/Inductors/self_cms_we-tpc_XL.wings rename to modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wings diff --git a/modules/packages3d/Inductors/self_cms_we-tpc_XL.wrl b/modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wrl similarity index 100% rename from modules/packages3d/Inductors/self_cms_we-tpc_XL.wrl rename to modules/packages3d/Inductors.3dshapes/self_cms_we-tpc_XL.wrl diff --git a/modules/packages3d/LEDs/LED-3MM.wings b/modules/packages3d/LEDs.3dshapes/LED-3MM.wings similarity index 100% rename from modules/packages3d/LEDs/LED-3MM.wings rename to modules/packages3d/LEDs.3dshapes/LED-3MM.wings diff --git a/modules/packages3d/LEDs/LED-3MM.wrl b/modules/packages3d/LEDs.3dshapes/LED-3MM.wrl similarity index 100% rename from modules/packages3d/LEDs/LED-3MM.wrl rename to modules/packages3d/LEDs.3dshapes/LED-3MM.wrl diff --git a/modules/packages3d/LEDs/LED-5MM-3.wings b/modules/packages3d/LEDs.3dshapes/LED-5MM-3.wings similarity index 100% rename from modules/packages3d/LEDs/LED-5MM-3.wings rename to modules/packages3d/LEDs.3dshapes/LED-5MM-3.wings diff --git a/modules/packages3d/LEDs/LED-5MM-3.wrl b/modules/packages3d/LEDs.3dshapes/LED-5MM-3.wrl similarity index 100% rename from modules/packages3d/LEDs/LED-5MM-3.wrl rename to modules/packages3d/LEDs.3dshapes/LED-5MM-3.wrl diff --git a/modules/packages3d/LEDs/LED-5MM.wings b/modules/packages3d/LEDs.3dshapes/LED-5MM.wings similarity index 100% rename from modules/packages3d/LEDs/LED-5MM.wings rename to modules/packages3d/LEDs.3dshapes/LED-5MM.wings diff --git a/modules/packages3d/LEDs/LED-5MM.wrl b/modules/packages3d/LEDs.3dshapes/LED-5MM.wrl similarity index 100% rename from modules/packages3d/LEDs/LED-5MM.wrl rename to modules/packages3d/LEDs.3dshapes/LED-5MM.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_1-1_P1200_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_1-1_P1200_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_1-1_P1200_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_1-1_P1200_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_1-1_P1200_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_1-1_P1200_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_1-1_P1200_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_1-1_P1200_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P1165_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P1165_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P1165_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P1165_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P1165_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P1165_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P1165_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P1165_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL_HandSoldering.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL_HandSoldering.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL_HandSoldering.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL_HandSoldering.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL_HandSoldering.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL_HandSoldering.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P2781_ETAL_HandSoldering.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P2781_ETAL_HandSoldering.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL_HandSoldering.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL_HandSoldering.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL_HandSoldering.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL_HandSoldering.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL_HandSoldering.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL_HandSoldering.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3000_ETAL_HandSoldering.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3000_ETAL_HandSoldering.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL_HandSoldering.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL_HandSoldering.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL_HandSoldering.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL_HandSoldering.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL_HandSoldering.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL_HandSoldering.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3181_ETAL_HandSoldering.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3181_ETAL_HandSoldering.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL_HandSoldering.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL_HandSoldering.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL_HandSoldering.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL_HandSoldering.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL_HandSoldering.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL_HandSoldering.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3188_ETAL_HandSoldering.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3188_ETAL_HandSoldering.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL_HandSoldering.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL_HandSoldering.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL_HandSoldering.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL_HandSoldering.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL_HandSoldering.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL_HandSoldering.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3191_ETAL_HandSoldering.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3191_ETAL_HandSoldering.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3324_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3324_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3324_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3324_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3324_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3324_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3324_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3324_ETAL.wrl diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3356_ETAL.wings b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3356_ETAL.wings similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3356_ETAL.wings rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3356_ETAL.wings diff --git a/modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3356_ETAL.wrl b/modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3356_ETAL.wrl similarity index 100% rename from modules/packages3d/NF-Transformers_ETAL/NF-Transformer_P3356_ETAL.wrl rename to modules/packages3d/NF-Transformers_ETAL.3dshapes/NF-Transformer_P3356_ETAL.wrl diff --git a/modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200.wings b/modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200.wings similarity index 100% rename from modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200.wings rename to modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200.wings diff --git a/modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200.wrl b/modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200.wrl similarity index 100% rename from modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200.wrl rename to modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200.wrl diff --git a/modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200_LargePads.wings b/modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200_LargePads.wings similarity index 100% rename from modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200_LargePads.wings rename to modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200_LargePads.wings diff --git a/modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200_LargePads.wrl b/modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200_LargePads.wrl similarity index 100% rename from modules/packages3d/Oscillator-Modules/OSCILLATOR_KXO-200_LargePads.wrl rename to modules/packages3d/Oscillator-Modules.3dshapes/OSCILLATOR_KXO-200_LargePads.wrl diff --git a/modules/packages3d/PFF_PSF_PSS_Leadforms/PFF_Leadform_5pins.wings b/modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PFF_Leadform_5pins.wings similarity index 100% rename from modules/packages3d/PFF_PSF_PSS_Leadforms/PFF_Leadform_5pins.wings rename to modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PFF_Leadform_5pins.wings diff --git a/modules/packages3d/PFF_PSF_PSS_Leadforms/PFF_Leadform_5pins.wrl b/modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PFF_Leadform_5pins.wrl similarity index 100% rename from modules/packages3d/PFF_PSF_PSS_Leadforms/PFF_Leadform_5pins.wrl rename to modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PFF_Leadform_5pins.wrl diff --git a/modules/packages3d/PFF_PSF_PSS_Leadforms/PSF_Leadform_5pins.wrl b/modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PSF_Leadform_5pins.wrl similarity index 100% rename from modules/packages3d/PFF_PSF_PSS_Leadforms/PSF_Leadform_5pins.wrl rename to modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PSF_Leadform_5pins.wrl diff --git a/modules/packages3d/PFF_PSF_PSS_Leadforms/PSS_Leadform_5pins.wings b/modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PSS_Leadform_5pins.wings similarity index 100% rename from modules/packages3d/PFF_PSF_PSS_Leadforms/PSS_Leadform_5pins.wings rename to modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PSS_Leadform_5pins.wings diff --git a/modules/packages3d/PFF_PSF_PSS_Leadforms/PSS_Leadform_5pins.wrl b/modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PSS_Leadform_5pins.wrl similarity index 100% rename from modules/packages3d/PFF_PSF_PSS_Leadforms/PSS_Leadform_5pins.wrl rename to modules/packages3d/PFF_PSF_PSS_Leadforms.3dshapes/PSS_Leadform_5pins.wrl diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings diff --git a/modules/packages3d/Pentawatts/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl b/modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl similarity index 100% rename from modules/packages3d/Pentawatts/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl rename to modules/packages3d/Pentawatts.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x01.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x01.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x01.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x01.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x01.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x02.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x02.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x02.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x02.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x02.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x03.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x03.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x03.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x03.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x04.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x04.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x04.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x04.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x04.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x05.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x05.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x05.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x05.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x05.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x06.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x06.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x06.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x06.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x06.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x07.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x07.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x07.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x07.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x07.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x08.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x08.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x08.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x08.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x08.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x09.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x09.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x09.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x09.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x09.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x10.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x10.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x10.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x10.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x10.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x11.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x11.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x11.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x11.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x11.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x12.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x12.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x12.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x12.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x12.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x13.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x13.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x13.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x13.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x13.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x14.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x14.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x14.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x14.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x14.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x15.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x15.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x15.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x15.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x15.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x16.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x16.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x16.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x16.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x16.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x17.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x17.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x17.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x17.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x17.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x18.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x18.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x18.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x18.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x18.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x19.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x19.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x19.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x19.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x19.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x20.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x20.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x20.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x20.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x20.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x21.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x21.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x21.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x21.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x21.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x22.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x22.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x22.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x22.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x22.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x23.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x23.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x23.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x23.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x23.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x24.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x24.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x24.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x24.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x24.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x25.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x25.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x25.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x25.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x25.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x26.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x26.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x26.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x26.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x26.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x27.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x27.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x27.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x27.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x27.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x28.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x28.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x28.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x28.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x28.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x29.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x29.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x29.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x29.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x29.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x30.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x30.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x30.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x30.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x30.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x31.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x31.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x31.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x31.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x31.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x32.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x32.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x32.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x32.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x32.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x33.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x33.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x33.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x33.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x33.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x34.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x34.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x34.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x34.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x34.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x35.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x35.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x35.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x35.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x35.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x36.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x36.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x36.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x36.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x36.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x37.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x37.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x37.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x37.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x37.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x38.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x38.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x38.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x38.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x38.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x39.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x39.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x39.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x39.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x39.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x40.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x40.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_1x40.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_1x40.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_1x40.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x01.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x01.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x01.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x01.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x01.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x02.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x02.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x02.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x02.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x02.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x03.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x03.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x03.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x03.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x03.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x04.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x04.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x04.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x04.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x04.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x05.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x05.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x05.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x05.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x05.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x06.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x06.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x06.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x06.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x06.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x07.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x07.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x07.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x07.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x07.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x08.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x08.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x08.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x08.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x08.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x09.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x09.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x09.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x09.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x09.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x10.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x10.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x10.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x10.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x10.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x11.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x11.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x11.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x11.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x11.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x12.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x12.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x12.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x12.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x12.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x13.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x13.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x13.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x13.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x13.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x14.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x14.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x14.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x14.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x14.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x15.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x15.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x15.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x15.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x15.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x16.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x16.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x16.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x16.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x16.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x17.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x17.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x17.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x17.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x17.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x18.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x18.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x18.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x18.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x18.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x19.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x19.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x19.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x19.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x19.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x20.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x20.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x20.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x20.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x20.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x21.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x21.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x21.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x21.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x21.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x22.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x22.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x22.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x22.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x22.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x23.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x23.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x23.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x23.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x23.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x24.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x24.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x24.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x24.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x24.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x25.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x25.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x25.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x25.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x25.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x26.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x26.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x26.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x26.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x26.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x27.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x27.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x27.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x27.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x27.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x28.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x28.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x28.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x28.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x28.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x29.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x29.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x29.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x29.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x29.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x30.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x30.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x30.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x30.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x30.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x31.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x31.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x31.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x31.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x31.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x32.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x32.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x32.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x32.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x32.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x33.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x33.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x33.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x33.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x33.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x34.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x34.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x34.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x34.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x34.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x35.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x35.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x35.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x35.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x35.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x36.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x36.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x36.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x36.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x36.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x37.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x37.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x37.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x37.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x37.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x38.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x38.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x38.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x38.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x38.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x39.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x39.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x39.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x39.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x39.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x40.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x40.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Angled_2x40.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Angled_2x40.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Angled_2x40.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x01.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x01.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x01.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x01.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x01.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x02.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x02.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x02.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x02.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x03.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x03.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x03.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x03.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x03.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x04.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x04.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x04.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x04.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x04.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x05.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x05.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x05.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x05.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x05.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x06.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x06.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x06.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x06.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x06.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x07.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x07.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x07.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x07.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x07.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x08.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x08.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x08.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x08.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x08.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x09.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x09.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x09.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x09.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x09.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x10.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x10.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x10.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x10.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x10.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x11.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x11.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x11.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x11.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x11.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x12.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x12.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x12.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x12.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x12.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x13.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x13.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x13.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x13.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x13.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x14.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x14.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x14.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x14.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x14.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x15.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x15.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x15.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x15.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x15.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x16.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x16.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x16.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x16.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x16.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x17.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x17.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x17.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x17.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x17.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x18.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x18.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x18.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x18.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x18.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x19.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x19.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x19.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x19.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x19.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x20.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x20.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x20.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x20.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x20.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x21.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x21.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x21.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x21.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x21.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x22.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x22.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x22.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x22.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x22.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x23.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x23.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x23.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x23.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x23.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x24.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x24.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x24.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x24.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x24.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x25.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x25.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x25.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x25.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x25.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x26.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x26.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x26.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x26.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x26.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x27.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x27.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x27.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x27.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x27.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x28.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x28.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x28.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x28.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x28.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x29.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x29.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x29.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x29.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x29.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x30.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x30.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x30.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x30.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x30.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x31.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x31.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x31.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x31.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x31.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x32.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x32.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x32.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x32.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x32.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x33.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x33.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x33.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x33.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x33.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x34.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x34.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x34.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x34.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x34.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x35.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x35.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x35.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x35.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x35.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x36.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x36.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x36.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x36.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x36.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x37.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x37.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x37.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x37.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x37.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x38.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x38.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x38.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x38.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x38.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x39.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x39.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x39.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x39.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x39.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x40.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x40.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_1x40.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_1x40.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_1x40.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x01.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x01.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x01.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x01.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x01.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x02.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x02.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x02.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x02.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x02.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x03.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x03.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x03.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x03.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x03.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x04.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x04.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x04.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x04.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x04.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x05.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x05.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x05.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x05.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x05.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x06.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x06.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x06.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x06.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x06.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x07.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x07.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x07.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x07.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x07.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x08.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x08.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x08.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x08.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x08.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x09.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x09.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x09.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x09.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x09.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x10.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x10.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x10.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x10.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x10.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x11.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x11.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x11.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x11.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x11.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x12.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x12.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x12.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x12.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x12.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x13.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x13.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x13.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x13.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x13.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x14.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x14.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x14.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x14.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x14.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x15.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x15.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x15.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x15.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x15.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x16.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x16.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x16.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x16.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x16.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x17.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x17.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x17.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x17.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x17.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x18.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x18.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x18.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x18.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x18.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x19.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x19.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x19.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x19.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x19.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x20.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x20.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x20.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x20.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x20.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x21.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x21.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x21.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x21.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x21.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x22.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x22.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x22.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x22.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x22.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x23.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x23.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x23.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x23.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x23.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x24.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x24.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x24.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x24.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x24.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x25.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x25.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x25.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x25.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x25.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x26.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x26.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x26.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x26.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x26.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x27.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x27.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x27.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x27.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x27.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x28.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x28.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x28.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x28.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x28.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x29.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x29.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x29.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x29.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x29.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x30.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x30.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x30.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x30.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x30.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x31.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x31.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x31.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x31.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x31.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x32.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x32.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x32.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x32.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x32.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x33.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x33.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x33.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x33.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x33.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x34.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x34.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x34.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x34.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x34.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x35.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x35.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x35.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x35.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x35.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x36.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x36.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x36.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x36.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x36.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x37.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x37.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x37.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x37.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x37.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x38.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x38.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x38.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x38.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x38.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x39.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x39.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x39.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x39.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x39.wrl diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x40.wings b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40.wings similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x40.wings rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40.wings diff --git a/modules/packages3d/Pin_Headers/Pin_Header_Straight_2x40.wrl b/modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40.wrl similarity index 100% rename from modules/packages3d/Pin_Headers/Pin_Header_Straight_2x40.wrl rename to modules/packages3d/Pin_Headers.3dshapes/Pin_Header_Straight_2x40.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_15mm.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_15mm.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_15mm.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_15mm.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_15mm.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_15mm.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_15mm.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_15mm.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_20mm.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_20mm.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_20mm.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_20mm.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_20mm.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_20mm.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_20mm.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_20mm.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_25mm.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_25mm.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_25mm.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_25mm.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_25mm.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_25mm.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-double_25mm.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-double_25mm.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_15mm.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_15mm.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_15mm.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_15mm.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_15mm.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_15mm.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_15mm.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_15mm.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_20mm.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_20mm.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_20mm.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_20mm.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_20mm.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_20mm.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Alps-RK163-single_20mm.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Alps-RK163-single_20mm.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3005_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3005_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3005_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3005_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3005_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3005_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3005_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3005_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3006P_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006P_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3006P_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006P_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3006P_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006P_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3006P_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006P_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3006W_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006W_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3006W_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006W_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3006W_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006W_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3006W_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006W_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3006Y_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296P_3-8Zoll_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296W_3-8Zoll_Inline_ScrewUp.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296X_3-8Zoll_Inline_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Y_3-8Zoll_Angular_ScrewUp.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3296Z_3-8Zoll_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339H_Angular_ScrewUp.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339H_Angular_ScrewUp.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339H_Angular_ScrewUp.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339H_Angular_ScrewUp.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339H_Angular_ScrewUp.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339H_Angular_ScrewUp.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339H_Angular_ScrewUp.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339H_Angular_ScrewUp.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339P_Angular_ScrewUp.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339P_Angular_ScrewUp.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339P_Angular_ScrewUp.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339P_Angular_ScrewUp.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339P_Angular_ScrewUp.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339P_Angular_ScrewUp.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339P_Angular_ScrewUp.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339P_Angular_ScrewUp.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339S_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339S_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339S_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339S_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339S_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339S_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339S_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339S_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339W_Angular_ScrewFront.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339W_Angular_ScrewFront.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339W_Angular_ScrewFront.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339W_Angular_ScrewFront.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Bourns_3339W_Angular_ScrewFront.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339W_Angular_ScrewFront.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Bourns_3339W_Angular_ScrewFront.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Bourns_3339W_Angular_ScrewFront.wrl diff --git a/modules/packages3d/Potentiometers/Potentiometer_Triwood_RM-065.wings b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wings similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Triwood_RM-065.wings rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wings diff --git a/modules/packages3d/Potentiometers/Potentiometer_Triwood_RM-065.wrl b/modules/packages3d/Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wrl similarity index 100% rename from modules/packages3d/Potentiometers/Potentiometer_Triwood_RM-065.wrl rename to modules/packages3d/Potentiometers.3dshapes/Potentiometer_Triwood_RM-065.wrl diff --git a/modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK.wings b/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wings similarity index 100% rename from modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK.wings rename to modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wings diff --git a/modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK.wrl b/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wrl similarity index 100% rename from modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK.wrl rename to modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK.wrl diff --git a/modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-1.wings b/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wings similarity index 100% rename from modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-1.wings rename to modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wings diff --git a/modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-1.wrl b/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wrl similarity index 100% rename from modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-1.wrl rename to modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-1.wrl diff --git a/modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-2.wings b/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wings similarity index 100% rename from modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-2.wings rename to modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wings diff --git a/modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-2.wrl b/modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wrl similarity index 100% rename from modules/packages3d/Power_Packages_SMD/SOT-669_LFPAK_ThermalVias-2.wrl rename to modules/packages3d/Power_Packages_SMD.3dshapes/SOT-669_LFPAK_ThermalVias-2.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Horizontal.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Horizontal.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Horizontal.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Horizontal.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Horizontal.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Vertical.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Vertical.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Vertical.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Multiwatt_15_Vertical.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Multiwatt_15_Vertical.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ1_Horizontal_TO220-5-TA05B.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered-Typ2_Horizontal_TO220-5-T05E.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Staggered_Verical_TO220-5-T05D.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/Pentawatt_Neutral_Straight_Vertical_TO220-5-T05A.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/SLA704XM.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/SLA704XM.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/SLA704XM.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/SLA704XM.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/SLA704XM.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/STK672-040-E.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/STK672-040-E.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/STK672-040-E.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/STK672-040-E.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-040-E.wrl diff --git a/modules/packages3d/Power_Packages_ThroughHole/STK672-080-E.wings b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wings similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/STK672-080-E.wings rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wings diff --git a/modules/packages3d/Power_Packages_ThroughHole/STK672-080-E.wrl b/modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wrl similarity index 100% rename from modules/packages3d/Power_Packages_ThroughHole/STK672-080-E.wrl rename to modules/packages3d/Power_Packages_ThroughHole.3dshapes/STK672-080-E.wrl diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SANYOU_SRD_Series_Form_C.wings b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SANYOU_SRD_Series_Form_C.wings similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SANYOU_SRD_Series_Form_C.wings rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SANYOU_SRD_Series_Form_C.wings diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SANYOU_SRD_Series_Form_C.wrl b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SANYOU_SRD_Series_Form_C.wrl similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SANYOU_SRD_Series_Form_C.wrl rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SANYOU_SRD_Series_Form_C.wrl diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPDS_OMRON-G6E.wings b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDS_OMRON-G6E.wings similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPDS_OMRON-G6E.wings rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDS_OMRON-G6E.wings diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPDS_OMRON-G6E.wrl b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDS_OMRON-G6E.wrl similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPDS_OMRON-G6E.wrl rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDS_OMRON-G6E.wrl diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wings b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wings similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wings rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wings diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wrl b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wrl similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wrl rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Laying_FinderType34Point51.wrl diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wings b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wings similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wings rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wings diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wrl b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wrl similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wrl rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPDT_SingleRow_Standing_FinderType34Point51.wrl diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_bistable.wings b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_bistable.wings similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_bistable.wings rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_bistable.wings diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_bistable.wrl b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_bistable.wrl similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_bistable.wrl rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_bistable.wrl diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_mono.wings b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_mono.wings similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_mono.wings rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_mono.wings diff --git a/modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_mono.wrl b/modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_mono.wrl similarity index 100% rename from modules/packages3d/Relays_ThroughHole/Relay_SPST_Schrack-RP-3SL_mono.wrl rename to modules/packages3d/Relays_ThroughHole.3dshapes/Relay_SPST_Schrack-RP-3SL_mono.wrl diff --git a/modules/packages3d/Resistors_SMD/R_0201.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_0201.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0201.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_0201.wings diff --git a/modules/packages3d/Resistors_SMD/R_0201.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_0201.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0201.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_0201.wrl diff --git a/modules/packages3d/Resistors_SMD/R_0402.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_0402.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0402.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_0402.wings diff --git a/modules/packages3d/Resistors_SMD/R_0402.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_0402.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0402.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_0402.wrl diff --git a/modules/packages3d/Resistors_SMD/R_0603.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_0603.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0603.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_0603.wings diff --git a/modules/packages3d/Resistors_SMD/R_0603.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_0603.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0603.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_0603.wrl diff --git a/modules/packages3d/Resistors_SMD/R_0603_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_0603_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0603_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_0603_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_0603_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0603_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_0805.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_0805.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0805.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_0805.wings diff --git a/modules/packages3d/Resistors_SMD/R_0805.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_0805.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0805.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_0805.wrl diff --git a/modules/packages3d/Resistors_SMD/R_0805_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_0805_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0805_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_0805_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_0805_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_0805_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_1206.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_1206.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1206.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_1206.wings diff --git a/modules/packages3d/Resistors_SMD/R_1206.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_1206.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1206.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_1206.wrl diff --git a/modules/packages3d/Resistors_SMD/R_1206_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_1206_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1206_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_1206_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_1206_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_1206_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1206_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_1206_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_1210.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_1210.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1210.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_1210.wings diff --git a/modules/packages3d/Resistors_SMD/R_1210.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_1210.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1210.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_1210.wrl diff --git a/modules/packages3d/Resistors_SMD/R_1210_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_1210_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1210_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_1210_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_1210_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_1210_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1210_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_1210_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_1218.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_1218.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1218.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_1218.wings diff --git a/modules/packages3d/Resistors_SMD/R_1218.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_1218.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1218.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_1218.wrl diff --git a/modules/packages3d/Resistors_SMD/R_1218_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_1218_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1218_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_1218_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_1218_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_1218_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_1218_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_1218_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_2010.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_2010.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2010.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_2010.wings diff --git a/modules/packages3d/Resistors_SMD/R_2010.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_2010.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2010.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_2010.wrl diff --git a/modules/packages3d/Resistors_SMD/R_2010_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_2010_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2010_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_2010_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_2010_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_2010_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2010_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_2010_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_2512.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_2512.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2512.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_2512.wings diff --git a/modules/packages3d/Resistors_SMD/R_2512.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_2512.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2512.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_2512.wrl diff --git a/modules/packages3d/Resistors_SMD/R_2512_HandSoldering.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_2512_HandSoldering.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2512_HandSoldering.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_2512_HandSoldering.wings diff --git a/modules/packages3d/Resistors_SMD/R_2512_HandSoldering.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_2512_HandSoldering.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_2512_HandSoldering.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_2512_HandSoldering.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Concave_2x0603.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_2x0603.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Concave_2x0603.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_2x0603.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Concave_2x0603.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_2x0603.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Concave_2x0603.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_2x0603.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Concave_4x0402.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0402.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Concave_4x0402.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0402.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Concave_4x0402.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0402.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Concave_4x0402.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0402.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Concave_4x0603.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0603.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Concave_4x0603.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0603.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Concave_4x0603.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0603.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Concave_4x0603.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Concave_4x0603.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_2x0402.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0402.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_2x0402.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0402.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_2x0402.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0402.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_2x0402.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0402.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_2x0603.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0603.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_2x0603.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0603.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_2x0603.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0603.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_2x0603.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x0603.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_2x1206.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x1206.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_2x1206.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x1206.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_2x1206.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x1206.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_2x1206.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_2x1206.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_4x0402.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0402.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_4x0402.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0402.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_4x0402.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0402.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_4x0402.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0402.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_4x0603.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0603.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_4x0603.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0603.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_4x0603.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0603.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_4x0603.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x0603.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_4x1206.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x1206.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_4x1206.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x1206.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_4x1206.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x1206.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_4x1206.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_4x1206.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_5x0603.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x0603.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_5x0603.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x0603.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_5x0603.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x0603.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_5x0603.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x0603.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_5x1206.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x1206.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_5x1206.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x1206.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_5x1206.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x1206.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_5x1206.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_5x1206.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_8x0602.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_8x0602.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_8x0602.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_8x0602.wings diff --git a/modules/packages3d/Resistors_SMD/R_Array_Convex_8x0602.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_8x0602.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Array_Convex_8x0602.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Array_Convex_8x0602.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Cat16-2.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-2.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Cat16-2.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-2.wings diff --git a/modules/packages3d/Resistors_SMD/R_Cat16-2.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-2.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Cat16-2.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-2.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Cat16-4.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-4.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Cat16-4.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-4.wings diff --git a/modules/packages3d/Resistors_SMD/R_Cat16-4.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-4.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Cat16-4.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-4.wrl diff --git a/modules/packages3d/Resistors_SMD/R_Cat16-8.wings b/modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-8.wings similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Cat16-8.wings rename to modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-8.wings diff --git a/modules/packages3d/Resistors_SMD/R_Cat16-8.wrl b/modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-8.wrl similarity index 100% rename from modules/packages3d/Resistors_SMD/R_Cat16-8.wrl rename to modules/packages3d/Resistors_SMD.3dshapes/R_Cat16-8.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L19mm-W8mm-H8mm-p25mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L23mm-W9mm-H9mm-p30mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L36mm-W11mm-H10mm-p45mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L50mm-W14mm-H13mm-p60mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Ceramic_Horizontal_L65mm-W16mm-H15mm-p80mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM10mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM10mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM10mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM10mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM10mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM10mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM10mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM10mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM15mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM15mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM15mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM15mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM15mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM15mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM15mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM15mm.wrl diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM20mm.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM20mm.wings similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM20mm.wings rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM20mm.wings diff --git a/modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM20mm.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM20mm.wrl similarity index 100% rename from modules/packages3d/Resistors_ThroughHole/Resistor_Horizontal_RM20mm.wrl rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Horizontal_RM20mm.wrl diff --git a/modules/packages3d/SMD_Packages/BGA-256.wings b/modules/packages3d/SMD_Packages.3dshapes/BGA-256.wings similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-256.wings rename to modules/packages3d/SMD_Packages.3dshapes/BGA-256.wings diff --git a/modules/packages3d/SMD_Packages/BGA-256.wrl b/modules/packages3d/SMD_Packages.3dshapes/BGA-256.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-256.wrl rename to modules/packages3d/SMD_Packages.3dshapes/BGA-256.wrl diff --git a/modules/packages3d/SMD_Packages/BGA-256_pitch1mm_dia0.4mm.wings b/modules/packages3d/SMD_Packages.3dshapes/BGA-256_pitch1mm_dia0.4mm.wings similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-256_pitch1mm_dia0.4mm.wings rename to modules/packages3d/SMD_Packages.3dshapes/BGA-256_pitch1mm_dia0.4mm.wings diff --git a/modules/packages3d/SMD_Packages/BGA-256_pitch1mm_dia0.4mm.wrl b/modules/packages3d/SMD_Packages.3dshapes/BGA-256_pitch1mm_dia0.4mm.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-256_pitch1mm_dia0.4mm.wrl rename to modules/packages3d/SMD_Packages.3dshapes/BGA-256_pitch1mm_dia0.4mm.wrl diff --git a/modules/packages3d/SMD_Packages/BGA-352.wings b/modules/packages3d/SMD_Packages.3dshapes/BGA-352.wings similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-352.wings rename to modules/packages3d/SMD_Packages.3dshapes/BGA-352.wings diff --git a/modules/packages3d/SMD_Packages/BGA-352.wrl b/modules/packages3d/SMD_Packages.3dshapes/BGA-352.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-352.wrl rename to modules/packages3d/SMD_Packages.3dshapes/BGA-352.wrl diff --git a/modules/packages3d/SMD_Packages/BGA-48.wings b/modules/packages3d/SMD_Packages.3dshapes/BGA-48.wings similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-48.wings rename to modules/packages3d/SMD_Packages.3dshapes/BGA-48.wings diff --git a/modules/packages3d/SMD_Packages/BGA-48.wrl b/modules/packages3d/SMD_Packages.3dshapes/BGA-48.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-48.wrl rename to modules/packages3d/SMD_Packages.3dshapes/BGA-48.wrl diff --git a/modules/packages3d/SMD_Packages/BGA-64-0.8mm.wings b/modules/packages3d/SMD_Packages.3dshapes/BGA-64-0.8mm.wings similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-64-0.8mm.wings rename to modules/packages3d/SMD_Packages.3dshapes/BGA-64-0.8mm.wings diff --git a/modules/packages3d/SMD_Packages/BGA-64-0.8mm.wrl b/modules/packages3d/SMD_Packages.3dshapes/BGA-64-0.8mm.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/BGA-64-0.8mm.wrl rename to modules/packages3d/SMD_Packages.3dshapes/BGA-64-0.8mm.wrl diff --git a/modules/packages3d/SMD_Packages/Conn-20.wings b/modules/packages3d/SMD_Packages.3dshapes/Conn-20.wings similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-20.wings rename to modules/packages3d/SMD_Packages.3dshapes/Conn-20.wings diff --git a/modules/packages3d/SMD_Packages/Conn-20.wrl b/modules/packages3d/SMD_Packages.3dshapes/Conn-20.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-20.wrl rename to modules/packages3d/SMD_Packages.3dshapes/Conn-20.wrl diff --git a/modules/packages3d/SMD_Packages/Conn-3.wings b/modules/packages3d/SMD_Packages.3dshapes/Conn-3.wings similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-3.wings rename to modules/packages3d/SMD_Packages.3dshapes/Conn-3.wings diff --git a/modules/packages3d/SMD_Packages/Conn-3.wrl b/modules/packages3d/SMD_Packages.3dshapes/Conn-3.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-3.wrl rename to modules/packages3d/SMD_Packages.3dshapes/Conn-3.wrl diff --git a/modules/packages3d/SMD_Packages/Conn-3_Inv.wings b/modules/packages3d/SMD_Packages.3dshapes/Conn-3_Inv.wings similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-3_Inv.wings rename to modules/packages3d/SMD_Packages.3dshapes/Conn-3_Inv.wings diff --git a/modules/packages3d/SMD_Packages/Conn-3_Inv.wrl b/modules/packages3d/SMD_Packages.3dshapes/Conn-3_Inv.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-3_Inv.wrl rename to modules/packages3d/SMD_Packages.3dshapes/Conn-3_Inv.wrl diff --git a/modules/packages3d/SMD_Packages/Conn-5.wings b/modules/packages3d/SMD_Packages.3dshapes/Conn-5.wings similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-5.wings rename to modules/packages3d/SMD_Packages.3dshapes/Conn-5.wings diff --git a/modules/packages3d/SMD_Packages/Conn-5.wrl b/modules/packages3d/SMD_Packages.3dshapes/Conn-5.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-5.wrl rename to modules/packages3d/SMD_Packages.3dshapes/Conn-5.wrl diff --git a/modules/packages3d/SMD_Packages/Conn-5_Inv.wings b/modules/packages3d/SMD_Packages.3dshapes/Conn-5_Inv.wings similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-5_Inv.wings rename to modules/packages3d/SMD_Packages.3dshapes/Conn-5_Inv.wings diff --git a/modules/packages3d/SMD_Packages/Conn-5_Inv.wrl b/modules/packages3d/SMD_Packages.3dshapes/Conn-5_Inv.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/Conn-5_Inv.wrl rename to modules/packages3d/SMD_Packages.3dshapes/Conn-5_Inv.wrl diff --git a/modules/packages3d/SMD_Packages/DIP-8_SMD.wings b/modules/packages3d/SMD_Packages.3dshapes/DIP-8_SMD.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DIP-8_SMD.wings rename to modules/packages3d/SMD_Packages.3dshapes/DIP-8_SMD.wings diff --git a/modules/packages3d/SMD_Packages/DIP-8_SMD.wrl b/modules/packages3d/SMD_Packages.3dshapes/DIP-8_SMD.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DIP-8_SMD.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DIP-8_SMD.wrl diff --git a/modules/packages3d/SMD_Packages/DO-214-AA.wings b/modules/packages3d/SMD_Packages.3dshapes/DO-214-AA.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DO-214-AA.wings rename to modules/packages3d/SMD_Packages.3dshapes/DO-214-AA.wings diff --git a/modules/packages3d/SMD_Packages/DO-214-AA.wrl b/modules/packages3d/SMD_Packages.3dshapes/DO-214-AA.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DO-214-AA.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DO-214-AA.wrl diff --git a/modules/packages3d/SMD_Packages/DO-214-AA_SMB.wings b/modules/packages3d/SMD_Packages.3dshapes/DO-214-AA_SMB.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DO-214-AA_SMB.wings rename to modules/packages3d/SMD_Packages.3dshapes/DO-214-AA_SMB.wings diff --git a/modules/packages3d/SMD_Packages/DO-214-AA_SMB.wrl b/modules/packages3d/SMD_Packages.3dshapes/DO-214-AA_SMB.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DO-214-AA_SMB.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DO-214-AA_SMB.wrl diff --git a/modules/packages3d/SMD_Packages/DO-214-AC_SMA.wings b/modules/packages3d/SMD_Packages.3dshapes/DO-214-AC_SMA.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DO-214-AC_SMA.wings rename to modules/packages3d/SMD_Packages.3dshapes/DO-214-AC_SMA.wings diff --git a/modules/packages3d/SMD_Packages/DO-214-AC_SMA.wrl b/modules/packages3d/SMD_Packages.3dshapes/DO-214-AC_SMA.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DO-214-AC_SMA.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DO-214-AC_SMA.wrl diff --git a/modules/packages3d/SMD_Packages/DPAK-2-1EP_GDS.wings b/modules/packages3d/SMD_Packages.3dshapes/DPAK-2-1EP_GDS.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-2-1EP_GDS.wings rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-2-1EP_GDS.wings diff --git a/modules/packages3d/SMD_Packages/DPAK-2-1EP_GDS.wrl b/modules/packages3d/SMD_Packages.3dshapes/DPAK-2-1EP_GDS.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-2-1EP_GDS.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-2-1EP_GDS.wrl diff --git a/modules/packages3d/SMD_Packages/DPAK-2.wings b/modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-2.wings rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wings diff --git a/modules/packages3d/SMD_Packages/DPAK-2.wrl b/modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-2.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-2.wrl diff --git a/modules/packages3d/SMD_Packages/DPAK-3.wings b/modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-3.wings rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wings diff --git a/modules/packages3d/SMD_Packages/DPAK-3.wrl b/modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-3.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-3.wrl diff --git a/modules/packages3d/SMD_Packages/DPAK-3_GDS.wings b/modules/packages3d/SMD_Packages.3dshapes/DPAK-3_GDS.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-3_GDS.wings rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-3_GDS.wings diff --git a/modules/packages3d/SMD_Packages/DPAK-3_GDS.wrl b/modules/packages3d/SMD_Packages.3dshapes/DPAK-3_GDS.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-3_GDS.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-3_GDS.wrl diff --git a/modules/packages3d/SMD_Packages/DPAK-5.wings b/modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wings similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-5.wings rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wings diff --git a/modules/packages3d/SMD_Packages/DPAK-5.wrl b/modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/DPAK-5.wrl rename to modules/packages3d/SMD_Packages.3dshapes/DPAK-5.wrl diff --git a/modules/packages3d/SMD_Packages/Fuse_SMD.wings b/modules/packages3d/SMD_Packages.3dshapes/Fuse_SMD.wings similarity index 100% rename from modules/packages3d/SMD_Packages/Fuse_SMD.wings rename to modules/packages3d/SMD_Packages.3dshapes/Fuse_SMD.wings diff --git a/modules/packages3d/SMD_Packages/Fuse_SMD.wrl b/modules/packages3d/SMD_Packages.3dshapes/Fuse_SMD.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/Fuse_SMD.wrl rename to modules/packages3d/SMD_Packages.3dshapes/Fuse_SMD.wrl diff --git a/modules/packages3d/SMD_Packages/LFCSP-40-1EP.wings b/modules/packages3d/SMD_Packages.3dshapes/LFCSP-40-1EP.wings similarity index 100% rename from modules/packages3d/SMD_Packages/LFCSP-40-1EP.wings rename to modules/packages3d/SMD_Packages.3dshapes/LFCSP-40-1EP.wings diff --git a/modules/packages3d/SMD_Packages/LFCSP-40-1EP.wrl b/modules/packages3d/SMD_Packages.3dshapes/LFCSP-40-1EP.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/LFCSP-40-1EP.wrl rename to modules/packages3d/SMD_Packages.3dshapes/LFCSP-40-1EP.wrl diff --git a/modules/packages3d/SMD_Packages/MSOP-10-0.5mm.wings b/modules/packages3d/SMD_Packages.3dshapes/MSOP-10-0.5mm.wings similarity index 100% rename from modules/packages3d/SMD_Packages/MSOP-10-0.5mm.wings rename to modules/packages3d/SMD_Packages.3dshapes/MSOP-10-0.5mm.wings diff --git a/modules/packages3d/SMD_Packages/MSOP-10-0.5mm.wrl b/modules/packages3d/SMD_Packages.3dshapes/MSOP-10-0.5mm.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/MSOP-10-0.5mm.wrl rename to modules/packages3d/SMD_Packages.3dshapes/MSOP-10-0.5mm.wrl diff --git a/modules/packages3d/SMD_Packages/MSOP-8.wings b/modules/packages3d/SMD_Packages.3dshapes/MSOP-8.wings similarity index 100% rename from modules/packages3d/SMD_Packages/MSOP-8.wings rename to modules/packages3d/SMD_Packages.3dshapes/MSOP-8.wings diff --git a/modules/packages3d/SMD_Packages/MSOP-8.wrl b/modules/packages3d/SMD_Packages.3dshapes/MSOP-8.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/MSOP-8.wrl rename to modules/packages3d/SMD_Packages.3dshapes/MSOP-8.wrl diff --git a/modules/packages3d/SMD_Packages/PQFP-100.wings b/modules/packages3d/SMD_Packages.3dshapes/PQFP-100.wings similarity index 100% rename from modules/packages3d/SMD_Packages/PQFP-100.wings rename to modules/packages3d/SMD_Packages.3dshapes/PQFP-100.wings diff --git a/modules/packages3d/SMD_Packages/PQFP-100.wrl b/modules/packages3d/SMD_Packages.3dshapes/PQFP-100.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/PQFP-100.wrl rename to modules/packages3d/SMD_Packages.3dshapes/PQFP-100.wrl diff --git a/modules/packages3d/SMD_Packages/PQFP-160.wings b/modules/packages3d/SMD_Packages.3dshapes/PQFP-160.wings similarity index 100% rename from modules/packages3d/SMD_Packages/PQFP-160.wings rename to modules/packages3d/SMD_Packages.3dshapes/PQFP-160.wings diff --git a/modules/packages3d/SMD_Packages/PQFP-160.wrl b/modules/packages3d/SMD_Packages.3dshapes/PQFP-160.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/PQFP-160.wrl rename to modules/packages3d/SMD_Packages.3dshapes/PQFP-160.wrl diff --git a/modules/packages3d/SMD_Packages/PQFP-208.wings b/modules/packages3d/SMD_Packages.3dshapes/PQFP-208.wings similarity index 100% rename from modules/packages3d/SMD_Packages/PQFP-208.wings rename to modules/packages3d/SMD_Packages.3dshapes/PQFP-208.wings diff --git a/modules/packages3d/SMD_Packages/PQFP-208.wrl b/modules/packages3d/SMD_Packages.3dshapes/PQFP-208.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/PQFP-208.wrl rename to modules/packages3d/SMD_Packages.3dshapes/PQFP-208.wrl diff --git a/modules/packages3d/SMD_Packages/QFN-28-1EP.wings b/modules/packages3d/SMD_Packages.3dshapes/QFN-28-1EP.wings similarity index 100% rename from modules/packages3d/SMD_Packages/QFN-28-1EP.wings rename to modules/packages3d/SMD_Packages.3dshapes/QFN-28-1EP.wings diff --git a/modules/packages3d/SMD_Packages/QFN-28-1EP.wrl b/modules/packages3d/SMD_Packages.3dshapes/QFN-28-1EP.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/QFN-28-1EP.wrl rename to modules/packages3d/SMD_Packages.3dshapes/QFN-28-1EP.wrl diff --git a/modules/packages3d/SMD_Packages/QFN-48-1EP.wings b/modules/packages3d/SMD_Packages.3dshapes/QFN-48-1EP.wings similarity index 100% rename from modules/packages3d/SMD_Packages/QFN-48-1EP.wings rename to modules/packages3d/SMD_Packages.3dshapes/QFN-48-1EP.wings diff --git a/modules/packages3d/SMD_Packages/QFN-48-1EP.wrl b/modules/packages3d/SMD_Packages.3dshapes/QFN-48-1EP.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/QFN-48-1EP.wrl rename to modules/packages3d/SMD_Packages.3dshapes/QFN-48-1EP.wrl diff --git a/modules/packages3d/SMD_Packages/QFN_24-1EP.wings b/modules/packages3d/SMD_Packages.3dshapes/QFN_24-1EP.wings similarity index 100% rename from modules/packages3d/SMD_Packages/QFN_24-1EP.wings rename to modules/packages3d/SMD_Packages.3dshapes/QFN_24-1EP.wings diff --git a/modules/packages3d/SMD_Packages/QFN_24-1EP.wrl b/modules/packages3d/SMD_Packages.3dshapes/QFN_24-1EP.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/QFN_24-1EP.wrl rename to modules/packages3d/SMD_Packages.3dshapes/QFN_24-1EP.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-0402.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-0402.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-0402.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-0402.wings diff --git a/modules/packages3d/SMD_Packages/SMD-0402.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-0402.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-0402.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-0402.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-0805.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-0805.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-0805.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-0805.wings diff --git a/modules/packages3d/SMD_Packages/SMD-0805.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-0805.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-0805.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-0805.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1206.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1206.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1206.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1206.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1206.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1206.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1206.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1206.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1206_Pol.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1206_Pol.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1206_Pol.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1206_Pol.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1206_Pol.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1206_Pol.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1206_Pol.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1206_Pol.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1210.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1210.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1210.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1210.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1210.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1210.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1210.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1210.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1210_Pol.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1210_Pol.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1210_Pol.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1210_Pol.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1210_Pol.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1210_Pol.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1210_Pol.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1210_Pol.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1812.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1812.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1812.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1812.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1812.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1812.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1812.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1812.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1812_c.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1812_c.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1812_c.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1812_c.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1812_c.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1812_c.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1812_c.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1812_c.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-1812_l.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-1812_l.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1812_l.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1812_l.wings diff --git a/modules/packages3d/SMD_Packages/SMD-1812_l.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-1812_l.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-1812_l.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-1812_l.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-2010_Pol.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-2010_Pol.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-2010_Pol.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-2010_Pol.wings diff --git a/modules/packages3d/SMD_Packages/SMD-2010_Pol.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-2010_Pol.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-2010_Pol.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-2010_Pol.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-2112_Pol.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-2112_Pol.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-2112_Pol.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-2112_Pol.wings diff --git a/modules/packages3d/SMD_Packages/SMD-2112_Pol.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-2112_Pol.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-2112_Pol.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-2112_Pol.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-2512_Pol.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-2512_Pol.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-2512_Pol.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-2512_Pol.wings diff --git a/modules/packages3d/SMD_Packages/SMD-2512_Pol.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-2512_Pol.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-2512_Pol.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-2512_Pol.wrl diff --git a/modules/packages3d/SMD_Packages/SMD-4032.wings b/modules/packages3d/SMD_Packages.3dshapes/SMD-4032.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-4032.wings rename to modules/packages3d/SMD_Packages.3dshapes/SMD-4032.wings diff --git a/modules/packages3d/SMD_Packages/SMD-4032.wrl b/modules/packages3d/SMD_Packages.3dshapes/SMD-4032.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SMD-4032.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SMD-4032.wrl diff --git a/modules/packages3d/SMD_Packages/SO-16-E.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-16-E.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-E.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-E.wings diff --git a/modules/packages3d/SMD_Packages/SO-16-E.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-16-E.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-E.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-E.wrl diff --git a/modules/packages3d/SMD_Packages/SO-16-L.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-16-L.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-L.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-L.wings diff --git a/modules/packages3d/SMD_Packages/SO-16-L.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-16-L.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-L.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-L.wrl diff --git a/modules/packages3d/SMD_Packages/SO-16-N.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-16-N.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-N.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-N.wings diff --git a/modules/packages3d/SMD_Packages/SO-16-N.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-16-N.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-N.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-N.wrl diff --git a/modules/packages3d/SMD_Packages/SO-16-W.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-16-W.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-W.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-W.wings diff --git a/modules/packages3d/SMD_Packages/SO-16-W.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-16-W.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-16-W.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-16-W.wrl diff --git a/modules/packages3d/SMD_Packages/SO-20-L.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-20-L.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-20-L.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-20-L.wings diff --git a/modules/packages3d/SMD_Packages/SO-20-L.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-20-L.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-20-L.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-20-L.wrl diff --git a/modules/packages3d/SMD_Packages/SO-24-E.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-24-E.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-24-E.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-24-E.wings diff --git a/modules/packages3d/SMD_Packages/SO-24-E.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-24-E.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-24-E.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-24-E.wrl diff --git a/modules/packages3d/SMD_Packages/SO-28.wings b/modules/packages3d/SMD_Packages.3dshapes/SO-28.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SO-28.wings rename to modules/packages3d/SMD_Packages.3dshapes/SO-28.wings diff --git a/modules/packages3d/SMD_Packages/SO-28.wrl b/modules/packages3d/SMD_Packages.3dshapes/SO-28.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SO-28.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SO-28.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-14_N.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-14_N.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-14_N.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-14_N.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-14_N.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-14_N.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-14_N.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-14_N.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-14_W.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-14_W.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-14_W.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-14_W.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-14_W.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-14_W.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-14_W.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-14_W.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-24-W.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-24-W.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-24-W.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-24-W.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-24-W.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-24-W.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-24-W.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-24-W.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-24.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-24.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-24.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-24.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-24.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-24.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-24.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-24.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-8-N-1EP.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N-1EP.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-8-N-1EP.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N-1EP.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-8-N-1EP.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N-1EP.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-8-N-1EP.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N-1EP.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-8-N.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-8-N.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-8-N.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-8-N.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-8-N.wrl diff --git a/modules/packages3d/SMD_Packages/SOIC-8-W.wings b/modules/packages3d/SMD_Packages.3dshapes/SOIC-8-W.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-8-W.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-8-W.wings diff --git a/modules/packages3d/SMD_Packages/SOIC-8-W.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOIC-8-W.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOIC-8-W.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOIC-8-W.wrl diff --git a/modules/packages3d/SMD_Packages/SOJ-28-W.wings b/modules/packages3d/SMD_Packages.3dshapes/SOJ-28-W.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-28-W.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-28-W.wings diff --git a/modules/packages3d/SMD_Packages/SOJ-28-W.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOJ-28-W.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-28-W.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-28-W.wrl diff --git a/modules/packages3d/SMD_Packages/SOJ-32-W.wings b/modules/packages3d/SMD_Packages.3dshapes/SOJ-32-W.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-32-W.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-32-W.wings diff --git a/modules/packages3d/SMD_Packages/SOJ-32-W.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOJ-32-W.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-32-W.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-32-W.wrl diff --git a/modules/packages3d/SMD_Packages/SOJ-32.wings b/modules/packages3d/SMD_Packages.3dshapes/SOJ-32.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-32.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-32.wings diff --git a/modules/packages3d/SMD_Packages/SOJ-32.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOJ-32.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-32.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-32.wrl diff --git a/modules/packages3d/SMD_Packages/SOJ-40.wings b/modules/packages3d/SMD_Packages.3dshapes/SOJ-40.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-40.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-40.wings diff --git a/modules/packages3d/SMD_Packages/SOJ-40.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOJ-40.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-40.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-40.wrl diff --git a/modules/packages3d/SMD_Packages/SOJ-42.wings b/modules/packages3d/SMD_Packages.3dshapes/SOJ-42.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-42.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-42.wings diff --git a/modules/packages3d/SMD_Packages/SOJ-42.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOJ-42.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOJ-42.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOJ-42.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-223.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-223.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-223.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-223.wings diff --git a/modules/packages3d/SMD_Packages/SOT-223.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-223.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-223.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-223.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-23-EBC.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-23-EBC.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23-EBC.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23-EBC.wings diff --git a/modules/packages3d/SMD_Packages/SOT-23-EBC.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-23-EBC.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23-EBC.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23-EBC.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-23-GDS.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-23-GDS.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23-GDS.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23-GDS.wings diff --git a/modules/packages3d/SMD_Packages/SOT-23-GDS.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-23-GDS.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23-GDS.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23-GDS.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-23_Inv.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23_Inv.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv.wings diff --git a/modules/packages3d/SMD_Packages/SOT-23_Inv.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23_Inv.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-23_Inv2.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv2.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23_Inv2.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv2.wings diff --git a/modules/packages3d/SMD_Packages/SOT-23_Inv2.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv2.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-23_Inv2.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-23_Inv2.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-323.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-323.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-323.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-323.wings diff --git a/modules/packages3d/SMD_Packages/SOT-323.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-323.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-323.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-323.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-353.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-353.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-353.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-353.wings diff --git a/modules/packages3d/SMD_Packages/SOT-353.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-353.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-353.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-353.wrl diff --git a/modules/packages3d/SMD_Packages/SOT-553.wings b/modules/packages3d/SMD_Packages.3dshapes/SOT-553.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-553.wings rename to modules/packages3d/SMD_Packages.3dshapes/SOT-553.wings diff --git a/modules/packages3d/SMD_Packages/SOT-553.wrl b/modules/packages3d/SMD_Packages.3dshapes/SOT-553.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SOT-553.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SOT-553.wrl diff --git a/modules/packages3d/SMD_Packages/SSOP-14.wings b/modules/packages3d/SMD_Packages.3dshapes/SSOP-14.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-14.wings rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-14.wings diff --git a/modules/packages3d/SMD_Packages/SSOP-14.wrl b/modules/packages3d/SMD_Packages.3dshapes/SSOP-14.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-14.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-14.wrl diff --git a/modules/packages3d/SMD_Packages/SSOP-17.wings b/modules/packages3d/SMD_Packages.3dshapes/SSOP-17.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-17.wings rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-17.wings diff --git a/modules/packages3d/SMD_Packages/SSOP-17.wrl b/modules/packages3d/SMD_Packages.3dshapes/SSOP-17.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-17.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-17.wrl diff --git a/modules/packages3d/SMD_Packages/SSOP-20.wings b/modules/packages3d/SMD_Packages.3dshapes/SSOP-20.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-20.wings rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-20.wings diff --git a/modules/packages3d/SMD_Packages/SSOP-20.wrl b/modules/packages3d/SMD_Packages.3dshapes/SSOP-20.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-20.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-20.wrl diff --git a/modules/packages3d/SMD_Packages/SSOP-28.wings b/modules/packages3d/SMD_Packages.3dshapes/SSOP-28.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-28.wings rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-28.wings diff --git a/modules/packages3d/SMD_Packages/SSOP-28.wrl b/modules/packages3d/SMD_Packages.3dshapes/SSOP-28.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-28.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-28.wrl diff --git a/modules/packages3d/SMD_Packages/SSOP-8.wings b/modules/packages3d/SMD_Packages.3dshapes/SSOP-8.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-8.wings rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-8.wings diff --git a/modules/packages3d/SMD_Packages/SSOP-8.wrl b/modules/packages3d/SMD_Packages.3dshapes/SSOP-8.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP-8.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SSOP-8.wrl diff --git a/modules/packages3d/SMD_Packages/SSOP8-9.wings b/modules/packages3d/SMD_Packages.3dshapes/SSOP8-9.wings similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP8-9.wings rename to modules/packages3d/SMD_Packages.3dshapes/SSOP8-9.wings diff --git a/modules/packages3d/SMD_Packages/SSOP8-9.wrl b/modules/packages3d/SMD_Packages.3dshapes/SSOP8-9.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/SSOP8-9.wrl rename to modules/packages3d/SMD_Packages.3dshapes/SSOP8-9.wrl diff --git a/modules/packages3d/SMD_Packages/ST23AK#1.wings b/modules/packages3d/SMD_Packages.3dshapes/ST23AK#1.wings similarity index 100% rename from modules/packages3d/SMD_Packages/ST23AK#1.wings rename to modules/packages3d/SMD_Packages.3dshapes/ST23AK#1.wings diff --git a/modules/packages3d/SMD_Packages/ST23AK#1.wrl b/modules/packages3d/SMD_Packages.3dshapes/ST23AK#1.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/ST23AK#1.wrl rename to modules/packages3d/SMD_Packages.3dshapes/ST23AK#1.wrl diff --git a/modules/packages3d/SMD_Packages/TQFP-100.wings b/modules/packages3d/SMD_Packages.3dshapes/TQFP-100.wings similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-100.wings rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-100.wings diff --git a/modules/packages3d/SMD_Packages/TQFP-100.wrl b/modules/packages3d/SMD_Packages.3dshapes/TQFP-100.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-100.wrl rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-100.wrl diff --git a/modules/packages3d/SMD_Packages/TQFP-144.wings b/modules/packages3d/SMD_Packages.3dshapes/TQFP-144.wings similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-144.wings rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-144.wings diff --git a/modules/packages3d/SMD_Packages/TQFP-144.wrl b/modules/packages3d/SMD_Packages.3dshapes/TQFP-144.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-144.wrl rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-144.wrl diff --git a/modules/packages3d/SMD_Packages/TQFP-32.wings b/modules/packages3d/SMD_Packages.3dshapes/TQFP-32.wings similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-32.wings rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-32.wings diff --git a/modules/packages3d/SMD_Packages/TQFP-32.wrl b/modules/packages3d/SMD_Packages.3dshapes/TQFP-32.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-32.wrl rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-32.wrl diff --git a/modules/packages3d/SMD_Packages/TQFP-44.wings b/modules/packages3d/SMD_Packages.3dshapes/TQFP-44.wings similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-44.wings rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-44.wings diff --git a/modules/packages3d/SMD_Packages/TQFP-44.wrl b/modules/packages3d/SMD_Packages.3dshapes/TQFP-44.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-44.wrl rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-44.wrl diff --git a/modules/packages3d/SMD_Packages/TQFP-64.wings b/modules/packages3d/SMD_Packages.3dshapes/TQFP-64.wings similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-64.wings rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-64.wings diff --git a/modules/packages3d/SMD_Packages/TQFP-64.wrl b/modules/packages3d/SMD_Packages.3dshapes/TQFP-64.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/TQFP-64.wrl rename to modules/packages3d/SMD_Packages.3dshapes/TQFP-64.wrl diff --git a/modules/packages3d/SMD_Packages/TSSOIC-24.wings b/modules/packages3d/SMD_Packages.3dshapes/TSSOIC-24.wings similarity index 100% rename from modules/packages3d/SMD_Packages/TSSOIC-24.wings rename to modules/packages3d/SMD_Packages.3dshapes/TSSOIC-24.wings diff --git a/modules/packages3d/SMD_Packages/TSSOIC-24.wrl b/modules/packages3d/SMD_Packages.3dshapes/TSSOIC-24.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/TSSOIC-24.wrl rename to modules/packages3d/SMD_Packages.3dshapes/TSSOIC-24.wrl diff --git a/modules/packages3d/SMD_Packages/VQFP-100.wings b/modules/packages3d/SMD_Packages.3dshapes/VQFP-100.wings similarity index 100% rename from modules/packages3d/SMD_Packages/VQFP-100.wings rename to modules/packages3d/SMD_Packages.3dshapes/VQFP-100.wings diff --git a/modules/packages3d/SMD_Packages/VQFP-100.wrl b/modules/packages3d/SMD_Packages.3dshapes/VQFP-100.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/VQFP-100.wrl rename to modules/packages3d/SMD_Packages.3dshapes/VQFP-100.wrl diff --git a/modules/packages3d/SMD_Packages/VQFP-44.wings b/modules/packages3d/SMD_Packages.3dshapes/VQFP-44.wings similarity index 100% rename from modules/packages3d/SMD_Packages/VQFP-44.wings rename to modules/packages3d/SMD_Packages.3dshapes/VQFP-44.wings diff --git a/modules/packages3d/SMD_Packages/VQFP-44.wrl b/modules/packages3d/SMD_Packages.3dshapes/VQFP-44.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/VQFP-44.wrl rename to modules/packages3d/SMD_Packages.3dshapes/VQFP-44.wrl diff --git a/modules/packages3d/SMD_Packages/VQFP64.wings b/modules/packages3d/SMD_Packages.3dshapes/VQFP64.wings similarity index 100% rename from modules/packages3d/SMD_Packages/VQFP64.wings rename to modules/packages3d/SMD_Packages.3dshapes/VQFP64.wings diff --git a/modules/packages3d/SMD_Packages/VQFP64.wrl b/modules/packages3d/SMD_Packages.3dshapes/VQFP64.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/VQFP64.wrl rename to modules/packages3d/SMD_Packages.3dshapes/VQFP64.wrl diff --git a/modules/packages3d/SMD_Packages/VSOP-56.wings b/modules/packages3d/SMD_Packages.3dshapes/VSOP-56.wings similarity index 100% rename from modules/packages3d/SMD_Packages/VSOP-56.wings rename to modules/packages3d/SMD_Packages.3dshapes/VSOP-56.wings diff --git a/modules/packages3d/SMD_Packages/VSOP-56.wrl b/modules/packages3d/SMD_Packages.3dshapes/VSOP-56.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/VSOP-56.wrl rename to modules/packages3d/SMD_Packages.3dshapes/VSOP-56.wrl diff --git a/modules/packages3d/SMD_Packages/uMAX-10_Maxim.wings b/modules/packages3d/SMD_Packages.3dshapes/uMAX-10_Maxim.wings similarity index 100% rename from modules/packages3d/SMD_Packages/uMAX-10_Maxim.wings rename to modules/packages3d/SMD_Packages.3dshapes/uMAX-10_Maxim.wings diff --git a/modules/packages3d/SMD_Packages/uMAX-10_Maxim.wrl b/modules/packages3d/SMD_Packages.3dshapes/uMAX-10_Maxim.wrl similarity index 100% rename from modules/packages3d/SMD_Packages/uMAX-10_Maxim.wrl rename to modules/packages3d/SMD_Packages.3dshapes/uMAX-10_Maxim.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x01.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x01.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x01.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x01.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x01.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x01.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x01.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x01.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x02.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x02.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x02.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x02.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x02.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x02.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x02.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x02.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x03.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x03.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x03.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x03.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x03.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x03.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x03.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x03.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x04.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x04.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x04.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x04.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x04.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x04.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x04.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x04.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x05.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x05.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x05.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x05.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x05.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x05.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x05.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x05.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x06.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x06.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x06.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x06.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x06.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x06.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x06.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x06.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x07.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x07.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x07.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x07.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x07.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x07.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x07.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x07.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x08.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x08.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x08.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x08.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x08.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x08.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x08.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x08.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x09.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x09.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x09.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x09.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x09.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x09.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x09.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x09.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x10.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x10.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x10.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x10.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x10.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x10.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x10.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x10.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x11.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x11.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x11.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x11.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x11.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x11.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x11.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x11.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x12.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x12.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x12.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x12.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x12.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x12.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x12.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x12.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x13.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x13.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x13.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x13.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x13.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x13.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x13.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x13.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x14.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x14.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x14.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x14.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x14.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x14.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x14.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x14.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x15.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x15.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x15.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x15.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x15.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x15.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x15.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x15.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x16.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x16.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x16.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x16.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x16.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x16.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x16.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x16.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x17.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x17.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x17.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x17.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x17.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x17.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x17.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x17.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x18.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x18.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x18.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x18.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x18.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x18.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x18.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x18.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x19.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x19.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x19.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x19.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x19.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x19.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x19.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x19.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x20.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x20.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x20.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x20.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x20.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x20.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x20.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x20.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x21.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x21.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x21.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x21.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x21.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x21.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x21.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x21.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x22.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x22.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x22.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x22.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x22.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x22.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x22.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x22.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x23.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x23.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x23.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x23.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x23.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x23.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x23.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x23.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x24.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x24.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x24.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x24.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x24.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x24.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x24.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x24.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x25.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x25.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x25.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x25.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x25.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x25.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x25.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x25.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x26.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x26.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x26.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x26.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x26.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x26.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x26.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x26.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x27.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x27.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x27.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x27.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x27.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x27.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x27.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x27.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x28.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x28.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x28.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x28.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x28.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x28.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x28.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x28.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x29.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x29.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x29.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x29.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x29.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x29.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x29.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x29.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x30.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x30.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x30.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x30.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x30.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x30.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x30.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x30.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x31.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x31.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x31.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x31.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x31.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x31.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x31.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x31.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x32.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x32.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x32.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x32.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x32.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x32.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x32.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x32.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x33.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x33.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x33.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x33.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x33.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x33.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x33.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x33.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x34.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x34.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x34.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x34.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x34.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x34.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x34.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x34.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x35.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x35.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x35.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x35.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x35.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x35.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x35.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x35.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x36.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x36.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x36.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x36.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x36.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x36.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x36.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x36.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x37.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x37.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x37.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x37.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x37.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x37.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x37.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x37.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x38.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x38.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x38.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x38.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x38.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x38.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x38.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x38.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x39.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x39.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x39.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x39.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x39.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x39.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x39.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x39.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x40.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x40.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x40.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x40.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x40.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x40.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_1x40.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_1x40.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x01.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x01.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x01.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x01.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x01.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x01.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x01.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x01.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x02.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x02.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x02.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x02.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x02.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x02.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x02.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x02.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x03.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x03.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x03.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x03.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x03.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x03.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x03.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x03.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x04.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x04.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x04.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x04.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x04.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x04.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x04.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x04.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x05.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x05.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x05.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x05.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x05.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x05.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x05.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x05.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x06.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x06.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x06.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x06.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x06.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x06.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x06.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x06.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x07.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x07.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x07.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x07.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x07.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x07.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x07.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x07.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x08.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x08.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x08.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x08.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x08.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x08.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x08.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x08.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x09.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x09.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x09.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x09.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x09.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x09.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x09.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x09.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x10.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x10.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x10.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x10.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x10.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x10.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x10.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x10.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x11.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x11.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x11.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x11.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x11.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x11.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x11.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x11.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x12.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x12.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x12.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x12.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x12.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x12.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x12.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x12.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x13.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x13.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x13.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x13.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x13.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x13.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x13.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x13.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x14.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x14.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x14.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x14.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x14.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x14.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x14.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x14.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x15.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x15.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x15.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x15.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x15.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x15.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x15.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x15.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x16.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x16.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x16.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x16.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x16.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x16.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x16.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x16.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x17.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x17.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x17.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x17.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x17.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x17.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x17.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x17.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x18.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x18.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x18.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x18.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x18.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x18.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x18.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x18.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x19.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x19.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x19.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x19.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x19.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x19.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x19.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x19.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x20.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x20.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x20.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x20.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x20.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x20.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x20.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x20.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x21.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x21.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x21.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x21.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x21.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x21.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x21.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x21.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x22.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x22.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x22.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x22.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x22.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x22.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x22.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x22.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x23.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x23.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x23.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x23.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x23.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x23.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x23.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x23.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x24.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x24.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x24.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x24.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x24.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x24.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x24.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x24.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x25.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x25.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x25.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x25.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x25.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x25.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x25.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x25.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x26.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x26.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x26.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x26.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x26.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x26.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x26.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x26.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x27.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x27.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x27.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x27.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x27.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x27.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x27.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x27.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x28.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x28.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x28.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x28.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x28.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x28.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x28.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x28.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x29.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x29.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x29.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x29.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x29.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x29.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x29.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x29.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x30.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x30.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x30.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x30.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x30.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x30.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x30.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x30.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x31.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x31.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x31.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x31.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x31.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x31.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x31.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x31.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x32.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x32.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x32.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x32.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x32.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x32.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x32.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x32.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x33.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x33.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x33.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x33.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x33.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x33.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x33.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x33.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x34.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x34.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x34.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x34.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x34.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x34.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x34.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x34.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x35.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x35.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x35.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x35.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x35.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x35.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x35.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x35.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x36.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x36.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x36.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x36.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x36.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x36.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x36.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x36.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x37.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x37.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x37.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x37.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x37.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x37.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x37.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x37.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x38.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x38.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x38.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x38.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x38.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x38.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x38.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x38.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x39.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x39.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x39.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x39.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x39.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x39.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x39.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x39.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x40.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x40.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x40.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x40.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x40.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x40.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Angled_2x40.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Angled_2x40.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x01.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x01.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x01.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x01.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x01.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x01.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x01.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x01.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x02.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x02.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x02.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x02.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x02.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x02.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x02.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x02.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x03.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x03.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x03.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x03.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x03.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x03.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x03.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x03.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x04.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x04.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x04.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x04.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x04.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x04.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x04.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x04.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x05.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x05.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x05.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x05.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x05.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x05.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x05.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x05.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x06.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x06.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x06.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x06.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x06.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x06.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x06.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x06.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x07.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x07.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x07.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x07.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x07.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x07.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x07.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x07.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x08.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x08.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x08.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x08.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x08.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x08.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x08.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x08.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x09.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x09.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x09.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x09.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x09.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x09.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x09.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x09.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x10.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x10.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x10.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x10.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x10.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x10.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x10.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x10.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x11.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x11.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x11.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x11.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x11.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x11.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x11.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x11.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x12.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x12.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x12.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x12.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x12.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x12.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x12.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x12.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x13.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x13.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x13.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x13.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x13.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x13.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x13.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x13.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x14.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x14.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x14.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x14.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x14.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x14.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x14.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x14.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x15.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x15.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x15.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x15.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x15.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x15.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x15.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x15.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x16.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x16.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x16.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x16.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x16.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x16.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x16.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x16.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x17.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x17.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x17.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x17.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x17.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x17.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x17.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x17.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x18.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x18.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x18.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x18.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x18.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x18.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x18.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x18.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x19.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x19.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x19.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x19.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x19.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x19.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x19.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x19.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x20.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x20.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x20.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x20.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x20.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x20.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x20.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x20.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x21.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x21.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x21.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x21.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x21.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x21.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x21.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x21.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x22.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x22.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x22.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x22.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x22.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x22.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x22.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x22.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x23.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x23.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x23.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x23.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x23.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x23.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x23.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x23.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x24.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x24.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x24.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x24.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x24.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x24.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x24.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x24.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x25.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x25.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x25.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x25.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x25.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x25.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x25.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x25.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x26.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x26.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x26.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x26.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x26.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x26.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x26.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x26.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x27.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x27.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x27.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x27.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x27.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x27.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x27.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x27.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x28.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x28.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x28.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x28.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x28.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x28.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x28.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x28.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x29.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x29.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x29.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x29.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x29.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x29.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x29.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x29.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x30.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x30.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x30.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x30.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x30.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x30.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x30.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x30.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x31.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x31.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x31.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x31.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x31.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x31.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x31.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x31.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x32.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x32.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x32.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x32.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x32.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x32.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x32.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x32.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x33.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x33.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x33.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x33.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x33.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x33.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x33.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x33.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x34.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x34.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x34.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x34.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x34.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x34.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x34.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x34.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x35.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x35.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x35.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x35.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x35.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x35.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x35.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x35.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x36.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x36.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x36.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x36.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x36.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x36.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x36.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x36.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x37.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x37.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x37.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x37.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x37.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x37.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x37.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x37.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x38.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x38.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x38.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x38.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x38.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x38.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x38.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x38.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x39.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x39.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x39.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x39.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x39.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x39.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x39.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x39.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x40.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x40.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x40.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x40.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x40.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x40.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_1x40.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_1x40.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x01.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x01.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x01.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x01.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x01.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x01.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x01.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x01.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x02.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x02.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x02.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x02.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x02.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x02.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x02.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x02.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x03.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x03.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x03.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x03.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x03.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x03.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x03.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x03.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x04.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x04.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x04.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x04.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x04.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x04.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x04.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x04.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x05.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x05.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x05.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x05.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x05.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x05.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x05.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x05.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x06.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x06.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x06.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x06.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x06.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x06.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x06.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x06.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x07.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x07.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x07.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x07.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x07.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x07.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x07.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x07.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x08.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x08.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x08.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x08.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x08.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x08.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x08.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x08.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x09.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x09.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x09.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x09.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x09.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x09.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x09.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x09.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x10.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x10.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x10.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x10.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x10.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x10.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x10.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x10.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x11.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x11.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x11.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x11.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x11.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x11.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x11.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x11.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x12.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x12.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x12.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x12.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x12.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x12.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x12.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x12.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x13.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x13.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x13.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x13.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x13.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x13.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x13.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x13.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x14.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x14.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x14.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x14.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x14.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x14.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x14.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x14.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x15.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x15.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x15.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x15.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x15.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x15.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x15.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x15.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x16.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x16.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x16.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x16.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x16.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x16.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x16.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x16.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x17.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x17.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x17.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x17.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x17.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x17.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x17.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x17.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x18.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x18.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x18.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x18.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x18.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x18.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x18.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x18.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x19.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x19.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x19.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x19.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x19.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x19.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x19.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x19.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x20.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x20.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x20.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x20.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x20.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x20.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x20.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x20.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x21.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x21.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x21.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x21.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x21.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x21.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x21.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x21.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x22.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x22.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x22.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x22.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x22.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x22.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x22.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x22.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x23.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x23.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x23.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x23.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x23.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x23.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x23.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x23.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x24.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x24.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x24.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x24.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x24.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x24.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x24.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x24.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x25.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x25.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x25.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x25.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x25.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x25.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x25.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x25.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x26.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x26.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x26.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x26.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x26.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x26.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x26.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x26.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x27.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x27.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x27.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x27.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x27.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x27.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x27.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x27.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x28.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x28.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x28.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x28.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x28.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x28.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x28.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x28.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x29.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x29.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x29.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x29.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x29.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x29.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x29.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x29.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x30.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x30.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x30.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x30.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x30.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x30.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x30.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x30.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x31.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x31.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x31.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x31.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x31.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x31.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x31.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x31.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x32.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x32.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x32.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x32.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x32.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x32.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x32.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x32.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x33.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x33.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x33.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x33.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x33.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x33.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x33.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x33.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x34.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x34.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x34.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x34.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x34.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x34.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x34.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x34.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x35.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x35.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x35.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x35.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x35.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x35.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x35.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x35.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x36.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x36.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x36.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x36.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x36.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x36.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x36.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x36.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x37.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x37.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x37.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x37.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x37.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x37.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x37.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x37.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x38.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x38.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x38.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x38.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x38.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x38.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x38.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x38.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x39.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x39.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x39.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x39.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x39.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x39.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x39.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x39.wrl diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x40.wings b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x40.wings similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x40.wings rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x40.wings diff --git a/modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x40.wrl b/modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x40.wrl similarity index 100% rename from modules/packages3d/Socket_Strips/Socket_Strip_Straight_2x40.wrl rename to modules/packages3d/Socket_Strips.3dshapes/Socket_Strip_Straight_2x40.wrl diff --git a/modules/packages3d/Sockets/40tex-Ell600.wings b/modules/packages3d/Sockets.3dshapes/40tex-Ell600.wings similarity index 100% rename from modules/packages3d/Sockets/40tex-Ell600.wings rename to modules/packages3d/Sockets.3dshapes/40tex-Ell600.wings diff --git a/modules/packages3d/Sockets/40tex-Ell600.wrl b/modules/packages3d/Sockets.3dshapes/40tex-Ell600.wrl similarity index 100% rename from modules/packages3d/Sockets/40tex-Ell600.wrl rename to modules/packages3d/Sockets.3dshapes/40tex-Ell600.wrl diff --git a/modules/packages3d/Sockets/40tex600.wings b/modules/packages3d/Sockets.3dshapes/40tex600.wings similarity index 100% rename from modules/packages3d/Sockets/40tex600.wings rename to modules/packages3d/Sockets.3dshapes/40tex600.wings diff --git a/modules/packages3d/Sockets/40tex600.wrl b/modules/packages3d/Sockets.3dshapes/40tex600.wrl similarity index 100% rename from modules/packages3d/Sockets/40tex600.wrl rename to modules/packages3d/Sockets.3dshapes/40tex600.wrl diff --git a/modules/packages3d/Sockets/PGA120.wings b/modules/packages3d/Sockets.3dshapes/PGA120.wings similarity index 100% rename from modules/packages3d/Sockets/PGA120.wings rename to modules/packages3d/Sockets.3dshapes/PGA120.wings diff --git a/modules/packages3d/Sockets/PGA120.wrl b/modules/packages3d/Sockets.3dshapes/PGA120.wrl similarity index 100% rename from modules/packages3d/Sockets/PGA120.wrl rename to modules/packages3d/Sockets.3dshapes/PGA120.wrl diff --git a/modules/packages3d/Sockets/PLCC68.wings b/modules/packages3d/Sockets.3dshapes/PLCC68.wings similarity index 100% rename from modules/packages3d/Sockets/PLCC68.wings rename to modules/packages3d/Sockets.3dshapes/PLCC68.wings diff --git a/modules/packages3d/Sockets/PLCC68.wrl b/modules/packages3d/Sockets.3dshapes/PLCC68.wrl similarity index 100% rename from modules/packages3d/Sockets/PLCC68.wrl rename to modules/packages3d/Sockets.3dshapes/PLCC68.wrl diff --git a/modules/packages3d/Sockets/PLCC84.wings b/modules/packages3d/Sockets.3dshapes/PLCC84.wings similarity index 100% rename from modules/packages3d/Sockets/PLCC84.wings rename to modules/packages3d/Sockets.3dshapes/PLCC84.wings diff --git a/modules/packages3d/Sockets/PLCC84.wrl b/modules/packages3d/Sockets.3dshapes/PLCC84.wrl similarity index 100% rename from modules/packages3d/Sockets/PLCC84.wrl rename to modules/packages3d/Sockets.3dshapes/PLCC84.wrl diff --git a/modules/packages3d/Sockets/SUPPORT_SO8_ZIF.wings b/modules/packages3d/Sockets.3dshapes/SUPPORT_SO8_ZIF.wings similarity index 100% rename from modules/packages3d/Sockets/SUPPORT_SO8_ZIF.wings rename to modules/packages3d/Sockets.3dshapes/SUPPORT_SO8_ZIF.wings diff --git a/modules/packages3d/Sockets/SUPPORT_SO8_ZIF.wrl b/modules/packages3d/Sockets.3dshapes/SUPPORT_SO8_ZIF.wrl similarity index 100% rename from modules/packages3d/Sockets/SUPPORT_SO8_ZIF.wrl rename to modules/packages3d/Sockets.3dshapes/SUPPORT_SO8_ZIF.wrl diff --git a/modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP.wings b/modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP.wings similarity index 100% rename from modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP.wings rename to modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP.wings diff --git a/modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP.wrl b/modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP.wrl similarity index 100% rename from modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP.wrl rename to modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP.wrl diff --git a/modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP_LargePads.wings b/modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP_LargePads.wings similarity index 100% rename from modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP_LargePads.wings rename to modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP_LargePads.wings diff --git a/modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP_LargePads.wrl b/modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP_LargePads.wrl similarity index 100% rename from modules/packages3d/Sockets_BNC/BNC_Socket_TYCO-AMP_LargePads.wrl rename to modules/packages3d/Sockets_BNC.3dshapes/BNC_Socket_TYCO-AMP_LargePads.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-10__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-10__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-10__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-10__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-10__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-10__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-10__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-10__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-10__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-14__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-14__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-14__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-14__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-14__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-14__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-14__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-14__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-14__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-16__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-16__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-16__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-16__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-16__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-16__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-16__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-16__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-16__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-18__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-18__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-18__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-18__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-18__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-18__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-18__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-18__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-18__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-20__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-20__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-20__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-20__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-20__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-20__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-20__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-20__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-20__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-22__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-22__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-22__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-22__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-22__400.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__400.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-22__400.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__400.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-22__400_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__400_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-22__400_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-22__400_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-22__400_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-24__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-24__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-24__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-24__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-24__400.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__400.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-24__400.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__400.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-24__400_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__400_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-24__400_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__400_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__400_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-24__600.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__600.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-24__600.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__600.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-24__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-24__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-24__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-24__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-28__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-28__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-28__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-28__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-28__300__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__300__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-28__300__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__300__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__300__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-28__600.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__600.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-28__600.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__600.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-28__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-28__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-28__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-28__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-32__600.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-32__600.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-32__600.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-32__600.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-32__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-32__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-32__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-32__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-32__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-40__600.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-40__600.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-40__600.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-40__600.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-40__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-40__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-40__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-40__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-40__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-48__600.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-48__600.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-48__600.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-48__600.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-48__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-48__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-48__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-48__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-48__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-64__600.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__600.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-64__600.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__600.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-64__600_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__600_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-64__600_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__600_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__600_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-64__900.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__900.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-64__900.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__900.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-64__900_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__900_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-64__900_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-64__900_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-64__900_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-6__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-6__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-6__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-6__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-6__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-6__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-6__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-6__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-6__300_ELL.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-8__300.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-8__300.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-8__300.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-8__300.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300.wrl diff --git a/modules/packages3d/Sockets_DIP/DIP-8__300_ELL.wings b/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300_ELL.wings similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-8__300_ELL.wings rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300_ELL.wings diff --git a/modules/packages3d/Sockets_DIP/DIP-8__300_ELL.wrl b/modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300_ELL.wrl similarity index 100% rename from modules/packages3d/Sockets_DIP/DIP-8__300_ELL.wrl rename to modules/packages3d/Sockets_DIP.3dshapes/DIP-8__300_ELL.wrl diff --git a/modules/packages3d/Sockets_PGA/U9.wings b/modules/packages3d/Sockets_PGA.3dshapes/U9.wings similarity index 100% rename from modules/packages3d/Sockets_PGA/U9.wings rename to modules/packages3d/Sockets_PGA.3dshapes/U9.wings diff --git a/modules/packages3d/Sockets_PGA/U9.wrl b/modules/packages3d/Sockets_PGA.3dshapes/U9.wrl similarity index 100% rename from modules/packages3d/Sockets_PGA/U9.wrl rename to modules/packages3d/Sockets_PGA.3dshapes/U9.wrl diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_BigPads.wings b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_BigPads.wings similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_BigPads.wings rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_BigPads.wings diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_BigPads.wrl b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_BigPads.wrl similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_BigPads.wrl rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_BigPads.wrl diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_SmallPads.wings b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_SmallPads.wings similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_SmallPads.wings rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_SmallPads.wings diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_SmallPads.wrl b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_SmallPads.wrl similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-II_SmallPads.wrl rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-II_SmallPads.wrl diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_BigPads.wings b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_BigPads.wings similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_BigPads.wings rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_BigPads.wings diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_BigPads.wrl b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_BigPads.wrl similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_BigPads.wrl rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_BigPads.wrl diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_SmallPads.wings b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_SmallPads.wings similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_SmallPads.wings rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_SmallPads.wings diff --git a/modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_SmallPads.wrl b/modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_SmallPads.wrl similarity index 100% rename from modules/packages3d/Transistors_OldSowjetAera/OldSowjetaera_Transistor_Type-I_SmallPads.wrl rename to modules/packages3d/Transistors_OldSowjetAera.3dshapes/OldSowjetaera_Transistor_Type-I_SmallPads.wrl diff --git a/modules/packages3d/Transistors_SMD/VLM0806_Housing.wings b/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/VLM0806_Housing.wings rename to modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wings diff --git a/modules/packages3d/Transistors_SMD/VLM0806_Housing.wrl b/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/VLM0806_Housing.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing.wrl diff --git a/modules/packages3d/Transistors_SMD/VLM0806_Housing_Handsoldering.wings b/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/VLM0806_Housing_Handsoldering.wings rename to modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wings diff --git a/modules/packages3d/Transistors_SMD/VLM0806_Housing_Handsoldering.wrl b/modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/VLM0806_Housing_Handsoldering.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/VLM0806_Housing_Handsoldering.wrl diff --git a/modules/packages3d/Transistors_SMD/powermite3.wings b/modules/packages3d/Transistors_SMD.3dshapes/powermite3.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/powermite3.wings rename to modules/packages3d/Transistors_SMD.3dshapes/powermite3.wings diff --git a/modules/packages3d/Transistors_SMD/powermite3.wrl b/modules/packages3d/Transistors_SMD.3dshapes/powermite3.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/powermite3.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/powermite3.wrl diff --git a/modules/packages3d/Transistors_SMD/sc70-5.wings b/modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/sc70-5.wings rename to modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wings diff --git a/modules/packages3d/Transistors_SMD/sc70-5.wrl b/modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/sc70-5.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/sc70-5.wrl diff --git a/modules/packages3d/Transistors_SMD/sc70.wings b/modules/packages3d/Transistors_SMD.3dshapes/sc70.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/sc70.wings rename to modules/packages3d/Transistors_SMD.3dshapes/sc70.wings diff --git a/modules/packages3d/Transistors_SMD/sc70.wrl b/modules/packages3d/Transistors_SMD.3dshapes/sc70.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/sc70.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/sc70.wrl diff --git a/modules/packages3d/Transistors_SMD/sot404.wings b/modules/packages3d/Transistors_SMD.3dshapes/sot404.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/sot404.wings rename to modules/packages3d/Transistors_SMD.3dshapes/sot404.wings diff --git a/modules/packages3d/Transistors_SMD/sot404.wrl b/modules/packages3d/Transistors_SMD.3dshapes/sot404.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/sot404.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/sot404.wrl diff --git a/modules/packages3d/Transistors_SMD/sot428.wings b/modules/packages3d/Transistors_SMD.3dshapes/sot428.wings similarity index 100% rename from modules/packages3d/Transistors_SMD/sot428.wings rename to modules/packages3d/Transistors_SMD.3dshapes/sot428.wings diff --git a/modules/packages3d/Transistors_SMD/sot428.wrl b/modules/packages3d/Transistors_SMD.3dshapes/sot428.wrl similarity index 100% rename from modules/packages3d/Transistors_SMD/sot428.wrl rename to modules/packages3d/Transistors_SMD.3dshapes/sot428.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_MountedFromLS_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Horizontal_Reverse_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Bipolar-BCE_Vertical_MountedFromLS_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_MountedFromLS_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Horizontal_Reverse_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_FET-GDS_Vertical_MountedFromLS_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_MountedFromLS_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Horizontal_Reverse_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_PadsOnly.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_PadsOnly.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_PadsOnly.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_PadsOnly.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_PadsOnly.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wings diff --git a/modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl b/modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-220/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl rename to modules/packages3d/Transistors_TO-220.3dshapes/TO-220_Neutral123_Vertical_MountedFromLS_LargePads.wrl diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS.wings b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS.wings rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS.wings diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS.wrl b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS.wrl rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS.wrl diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS.wings b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS.wings similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS.wings rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS.wings diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS.wrl b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS.wrl rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS.wrl diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wings b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wings rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wings diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wrl b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wrl rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_MountedFromLS_largePads.wrl diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_largePads.wings b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_largePads.wings similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_largePads.wings rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_largePads.wings diff --git a/modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_largePads.wrl b/modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_largePads.wrl similarity index 100% rename from modules/packages3d/Transistors_TO-247/TO-247_Vertical_FET-GDS_largePads.wrl rename to modules/packages3d/Transistors_TO-247.3dshapes/TO-247_Vertical_FET-GDS_largePads.wrl diff --git a/modules/packages3d/Valves/VALVE-ECC-83-1.wings b/modules/packages3d/Valves.3dshapes/VALVE-ECC-83-1.wings similarity index 100% rename from modules/packages3d/Valves/VALVE-ECC-83-1.wings rename to modules/packages3d/Valves.3dshapes/VALVE-ECC-83-1.wings diff --git a/modules/packages3d/Valves/VALVE-ECC-83-1.wrl b/modules/packages3d/Valves.3dshapes/VALVE-ECC-83-1.wrl similarity index 100% rename from modules/packages3d/Valves/VALVE-ECC-83-1.wrl rename to modules/packages3d/Valves.3dshapes/VALVE-ECC-83-1.wrl diff --git a/modules/packages3d/Valves/VALVE-ECC-83-2.wings b/modules/packages3d/Valves.3dshapes/VALVE-ECC-83-2.wings similarity index 100% rename from modules/packages3d/Valves/VALVE-ECC-83-2.wings rename to modules/packages3d/Valves.3dshapes/VALVE-ECC-83-2.wings diff --git a/modules/packages3d/Valves/VALVE-ECC-83-2.wrl b/modules/packages3d/Valves.3dshapes/VALVE-ECC-83-2.wrl similarity index 100% rename from modules/packages3d/Valves/VALVE-ECC-83-2.wrl rename to modules/packages3d/Valves.3dshapes/VALVE-ECC-83-2.wrl diff --git a/modules/packages3d/unused_3d/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wings b/modules/packages3d/unused_3d.3dshapes/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wings similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wings rename to modules/packages3d/unused_3d.3dshapes/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wings diff --git a/modules/packages3d/unused_3d/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wrl b/modules/packages3d/unused_3d.3dshapes/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wrl similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wrl rename to modules/packages3d/unused_3d.3dshapes/Capacitors_Electrolytic.Cap_35.5x18mm_RM7.5.wrl diff --git a/modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x13_5.wings b/modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x13_5.wings similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x13_5.wings rename to modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x13_5.wings diff --git a/modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x13_5.wrl b/modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x13_5.wrl similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x13_5.wrl rename to modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x13_5.wrl diff --git a/modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x16.wings b/modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x16.wings similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x16.wings rename to modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x16.wings diff --git a/modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x16.wrl b/modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x16.wrl similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_SMD.c_elec_12_5x16.wrl rename to modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_12_5x16.wrl diff --git a/modules/packages3d/unused_3d/Capacitors_SMD.c_elec_16x16_5.wings b/modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_16x16_5.wings similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_SMD.c_elec_16x16_5.wings rename to modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_16x16_5.wings diff --git a/modules/packages3d/unused_3d/Capacitors_SMD.c_elec_16x16_5.wrl b/modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_16x16_5.wrl similarity index 100% rename from modules/packages3d/unused_3d/Capacitors_SMD.c_elec_16x16_5.wrl rename to modules/packages3d/unused_3d.3dshapes/Capacitors_SMD.c_elec_16x16_5.wrl diff --git a/modules/packages3d/unused_3d/Conn_Europe.c64acmd.wings b/modules/packages3d/unused_3d.3dshapes/Conn_Europe.c64acmd.wings similarity index 100% rename from modules/packages3d/unused_3d/Conn_Europe.c64acmd.wings rename to modules/packages3d/unused_3d.3dshapes/Conn_Europe.c64acmd.wings diff --git a/modules/packages3d/unused_3d/Conn_Europe.c64acmd.wrl b/modules/packages3d/unused_3d.3dshapes/Conn_Europe.c64acmd.wrl similarity index 100% rename from modules/packages3d/unused_3d/Conn_Europe.c64acmd.wrl rename to modules/packages3d/unused_3d.3dshapes/Conn_Europe.c64acmd.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_01.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_01.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_01.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_01.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_01.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_01.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_01.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_01.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_02.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_02.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_02.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_02.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_02.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_02.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_02.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_02.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_03.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_03.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_03.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_03.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_03.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_03.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_03.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_03.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_04.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_04.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_04.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_04.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_04.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_04.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_04.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_04.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_05.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_05.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_05.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_05.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_05.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_05.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_05.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_05.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_06.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_06.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_06.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_06.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_06.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_06.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_06.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_06.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_07.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_07.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_07.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_07.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_07.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_07.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_07.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_07.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_08.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_08.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_08.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_08.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_08.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_08.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_08.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_08.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_09.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_09.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_09.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_09.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_09.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_09.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_09.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_09.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_10.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_10.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_10.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_10.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_10.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_10.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_10.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_10.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_11.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_11.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_11.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_11.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_11.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_11.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_11.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_11.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_12.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_12.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_12.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_12.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_12.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_12.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_12.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_12.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_13.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_13.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_13.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_13.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_13.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_13.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_13.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_13.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_14.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_14.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_14.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_14.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_14.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_14.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_14.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_14.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_15.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_15.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_15.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_15.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_15.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_15.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_15.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_15.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_16.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_16.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_16.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_16.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_16.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_16.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_16.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_16.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_17.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_17.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_17.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_17.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_17.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_17.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_17.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_17.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_18.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_18.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_18.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_18.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_18.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_18.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_18.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_18.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_19.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_19.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_19.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_19.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_19.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_19.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_19.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_19.wrl diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_20.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_20.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_20.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_20.wings diff --git a/modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_20.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_20.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.female_pcb_pin.female_pcb_pin_20.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.female_pcb_pin.female_pcb_pin_20.wrl diff --git a/modules/packages3d/unused_3d/Connectors.fpc_conn_zif_smt_18.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.fpc_conn_zif_smt_18.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.fpc_conn_zif_smt_18.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.fpc_conn_zif_smt_18.wings diff --git a/modules/packages3d/unused_3d/Connectors.fpc_conn_zif_smt_18.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.fpc_conn_zif_smt_18.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.fpc_conn_zif_smt_18.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.fpc_conn_zif_smt_18.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_1x1_90.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x1_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_1x1_90.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x1_90.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_1x1_90.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x1_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_1x1_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x1_90.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_1x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_1x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x2_90.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_1x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_1x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_1x2_90.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2_90.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.header_5x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.header_5x2_90.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_13x2.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_13x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_13x2.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_13x2.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_13x2.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_13x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_13x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_13x2.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1_90.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1_90.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1_90.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1_90.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x1_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x1_90.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2_90.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_1x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_1x2_90.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2.wrl diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2_90.wings diff --git a/modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.header_sockets.socket_5x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.header_sockets.socket_5x2_90.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal15x5.8x7RM2.5-5.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal17.5x5.8x7RM2.5-6.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal20x5.8x7RM2.5-7.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_horizontal22.5x5.8x7RM2.5-8.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical15x5.8x7RM2.5-5.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical17.5x5.8x7RM2.5-6.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical20x5.8x7RM2.5-7.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch2.5mm.wafer_vertical22.5x5.8x7RM2.5-8.wrl diff --git a/modules/packages3d/unused_3d/Connectors.pitch3.96mm.JWT_A3963-2.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch3.96mm.JWT_A3963-2.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch3.96mm.JWT_A3963-2.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch3.96mm.JWT_A3963-2.wings diff --git a/modules/packages3d/unused_3d/Connectors.pitch3.96mm.JWT_A3963-2.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.pitch3.96mm.JWT_A3963-2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.pitch3.96mm.JWT_A3963-2.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.pitch3.96mm.JWT_A3963-2.wrl diff --git a/modules/packages3d/unused_3d/Connectors.subclick_horiz.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.subclick_horiz.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.subclick_horiz.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.subclick_horiz.wings diff --git a/modules/packages3d/unused_3d/Connectors.subclick_horiz.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.subclick_horiz.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.subclick_horiz.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.subclick_horiz.wrl diff --git a/modules/packages3d/unused_3d/Connectors.testpoint_2pads.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.testpoint_2pads.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.testpoint_2pads.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.testpoint_2pads.wrl diff --git a/modules/packages3d/unused_3d/Connectors.usb.normal.usb_a.usb_a_through_hole.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_a.usb_a_through_hole.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.usb.normal.usb_a.usb_a_through_hole.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_a.usb_a_through_hole.wings diff --git a/modules/packages3d/unused_3d/Connectors.usb.normal.usb_a.usb_a_through_hole.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_a.usb_a_through_hole.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.usb.normal.usb_a.usb_a_through_hole.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_a.usb_a_through_hole.wrl diff --git a/modules/packages3d/unused_3d/Connectors.usb.normal.usb_b.usb_b_through_hole.wings b/modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_b.usb_b_through_hole.wings similarity index 100% rename from modules/packages3d/unused_3d/Connectors.usb.normal.usb_b.usb_b_through_hole.wings rename to modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_b.usb_b_through_hole.wings diff --git a/modules/packages3d/unused_3d/Connectors.usb.normal.usb_b.usb_b_through_hole.wrl b/modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_b.usb_b_through_hole.wrl similarity index 100% rename from modules/packages3d/unused_3d/Connectors.usb.normal.usb_b.usb_b_through_hole.wrl rename to modules/packages3d/unused_3d.3dshapes/Connectors.usb.normal.usb_b.usb_b_through_hole.wrl diff --git a/modules/packages3d/unused_3d/Device.crystal_low_profile.wings b/modules/packages3d/unused_3d.3dshapes/Device.crystal_low_profile.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.crystal_low_profile.wings rename to modules/packages3d/unused_3d.3dshapes/Device.crystal_low_profile.wings diff --git a/modules/packages3d/unused_3d/Device.crystal_low_profile.wrl b/modules/packages3d/unused_3d.3dshapes/Device.crystal_low_profile.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.crystal_low_profile.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.crystal_low_profile.wrl diff --git a/modules/packages3d/unused_3d/Device.douille_4mm(black).wings b/modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(black).wings similarity index 100% rename from modules/packages3d/unused_3d/Device.douille_4mm(black).wings rename to modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(black).wings diff --git a/modules/packages3d/unused_3d/Device.douille_4mm(black).wrl b/modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(black).wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.douille_4mm(black).wrl rename to modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(black).wrl diff --git a/modules/packages3d/unused_3d/Device.douille_4mm(green).wings b/modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(green).wings similarity index 100% rename from modules/packages3d/unused_3d/Device.douille_4mm(green).wings rename to modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(green).wings diff --git a/modules/packages3d/unused_3d/Device.douille_4mm(green).wrl b/modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(green).wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.douille_4mm(green).wrl rename to modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(green).wrl diff --git a/modules/packages3d/unused_3d/Device.douille_4mm(red).wings b/modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(red).wings similarity index 100% rename from modules/packages3d/unused_3d/Device.douille_4mm(red).wings rename to modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(red).wings diff --git a/modules/packages3d/unused_3d/Device.douille_4mm(red).wrl b/modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(red).wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.douille_4mm(red).wrl rename to modules/packages3d/unused_3d.3dshapes/Device.douille_4mm(red).wrl diff --git a/modules/packages3d/unused_3d/Device.polyswitch.wings b/modules/packages3d/unused_3d.3dshapes/Device.polyswitch.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.polyswitch.wings rename to modules/packages3d/unused_3d.3dshapes/Device.polyswitch.wings diff --git a/modules/packages3d/unused_3d/Device.polyswitch.wrl b/modules/packages3d/unused_3d.3dshapes/Device.polyswitch.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.polyswitch.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.polyswitch.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_push.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_push.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_push.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_push.wings diff --git a/modules/packages3d/unused_3d/Device.switch_push.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_push.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_push.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_push.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_slide_right_angle_terminal.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_slide_right_angle_terminal.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_slide_right_angle_terminal.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_slide_right_angle_terminal.wings diff --git a/modules/packages3d/unused_3d/Device.switch_slide_right_angle_terminal.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_slide_right_angle_terminal.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_slide_right_angle_terminal.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_slide_right_angle_terminal.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_slide_straight_terminal.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_slide_straight_terminal.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_slide_straight_terminal.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_slide_straight_terminal.wings diff --git a/modules/packages3d/unused_3d/Device.switch_slide_straight_terminal.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_slide_straight_terminal.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_slide_straight_terminal.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_slide_straight_terminal.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wings diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_horizontal_right_angle_PC_terminal.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_right_angle_PC_terminal.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_right_angle_PC_terminal.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_right_angle_PC_terminal.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_right_angle_PC_terminal.wings diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_right_angle_PC_terminal.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_right_angle_PC_terminal.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_right_angle_PC_terminal.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_right_angle_PC_terminal.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal.wings diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal.wrl diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal_dt.wings b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal_dt.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal_dt.wings rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal_dt.wings diff --git a/modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal_dt.wrl b/modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal_dt.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.switch_toggle_straight_terminal_dt.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.switch_toggle_straight_terminal_dt.wrl diff --git a/modules/packages3d/unused_3d/Device.transf_LL1538.wings b/modules/packages3d/unused_3d.3dshapes/Device.transf_LL1538.wings similarity index 100% rename from modules/packages3d/unused_3d/Device.transf_LL1538.wings rename to modules/packages3d/unused_3d.3dshapes/Device.transf_LL1538.wings diff --git a/modules/packages3d/unused_3d/Device.transf_LL1538.wrl b/modules/packages3d/unused_3d.3dshapes/Device.transf_LL1538.wrl similarity index 100% rename from modules/packages3d/unused_3d/Device.transf_LL1538.wrl rename to modules/packages3d/unused_3d.3dshapes/Device.transf_LL1538.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.header_1x1_90.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x1_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.header_1x1_90.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x1_90.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.header_1x1_90.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x1_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.header_1x1_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x1_90.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.header_1x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.header_1x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x2_90.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.header_1x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.header_1x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.header_1x2_90.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.header_5x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.header_5x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.header_5x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.header_5x2_90.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.header_5x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.header_5x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.header_5x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.header_5x2_90.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.jumper.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.jumper.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.jumper.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.jumper.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.jumper_on.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper_on.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.jumper_on.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper_on.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.jumper_on.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper_on.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.jumper_on.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.jumper_on.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pin_1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pin_1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pin_1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pin_1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pin_1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pin_1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pin_1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pin_1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_12x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_12x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_12x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_12x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_12x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_12x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_12x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_12x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_12x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_13x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_13x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_13x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_13x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_13x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_13x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_13x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_13x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_18x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_18x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_18x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_18x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_18x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_18x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_18x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_18x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_20x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_20x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_20x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_20x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_20x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_20x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_20x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_20x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_28x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_28x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_28x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_28x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_28x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_28x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_28x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_28x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_2x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_2x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_2x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_2x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_2x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_2x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_2x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_2x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_2x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_30x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_30x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_30x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_30x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_30x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_30x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_30x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_30x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_3x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_3x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_3x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_3x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_3x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_3x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_3x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_3x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_3x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_4x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_4x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_4x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_4x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_4x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_4x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_4x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_4x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_4x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_5x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_5x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_5x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_5x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_5x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_5x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_5x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_5x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_5x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_6x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_6x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_6x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_6x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_6x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_6x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_6x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_6x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_6x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_8x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_8x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_8x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_8x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_8x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_8x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_8x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_8x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_28x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_28x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_28x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_28x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_28x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_28x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_28x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_28x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_5x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_5x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_5x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_5x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_5x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_5x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_5x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_5x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_6x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_6x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_6x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_6x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_6x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_6x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_6x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_6x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_7x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_7x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_7x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_7x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.pins_array_female_7x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_7x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.pins_array_female_7x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.pins_array_female_7x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x1.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x1.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x1.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x1.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x1_90.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x1_90.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1_90.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x1_90.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x1_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x1_90.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x2.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x2.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2_90.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_1x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_1x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_1x2_90.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_5x2.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_5x2.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_5x2.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_5x2.wrl diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_5x2_90.wings b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_5x2_90.wings similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_5x2_90.wings rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_5x2_90.wings diff --git a/modules/packages3d/unused_3d/Pin_Array.socket_5x2_90.wrl b/modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_5x2_90.wrl similarity index 100% rename from modules/packages3d/unused_3d/Pin_Array.socket_5x2_90.wrl rename to modules/packages3d/unused_3d.3dshapes/Pin_Array.socket_5x2_90.wrl diff --git a/modules/packages3d/unused_3d/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wings b/modules/packages3d/unused_3d.3dshapes/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wings similarity index 100% rename from modules/packages3d/unused_3d/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wings rename to modules/packages3d/unused_3d.3dshapes/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wings diff --git a/modules/packages3d/unused_3d/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wrl b/modules/packages3d/unused_3d.3dshapes/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wrl similarity index 100% rename from modules/packages3d/unused_3d/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wrl rename to modules/packages3d/unused_3d.3dshapes/TO220AC_Dioden.TO220AC-Horizontal_Reverse.wrl diff --git a/modules/packages3d/unused_3d/TO263-3.TO263-3.wings b/modules/packages3d/unused_3d.3dshapes/TO263-3.TO263-3.wings similarity index 100% rename from modules/packages3d/unused_3d/TO263-3.TO263-3.wings rename to modules/packages3d/unused_3d.3dshapes/TO263-3.TO263-3.wings diff --git a/modules/packages3d/unused_3d/TO263-3.TO263-3.wrl b/modules/packages3d/unused_3d.3dshapes/TO263-3.TO263-3.wrl similarity index 100% rename from modules/packages3d/unused_3d/TO263-3.TO263-3.wrl rename to modules/packages3d/unused_3d.3dshapes/TO263-3.TO263-3.wrl diff --git a/modules/packages3d/unused_3d/device.douille_4mm(black).wings b/modules/packages3d/unused_3d.3dshapes/device.douille_4mm(black).wings similarity index 100% rename from modules/packages3d/unused_3d/device.douille_4mm(black).wings rename to modules/packages3d/unused_3d.3dshapes/device.douille_4mm(black).wings diff --git a/modules/packages3d/unused_3d/device.douille_4mm(black).wrl b/modules/packages3d/unused_3d.3dshapes/device.douille_4mm(black).wrl similarity index 100% rename from modules/packages3d/unused_3d/device.douille_4mm(black).wrl rename to modules/packages3d/unused_3d.3dshapes/device.douille_4mm(black).wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_10.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_10.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_10.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_10.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_10.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_10.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_10.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_10.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_12.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_12.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_12.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_12.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_12.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_12.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_12.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_12.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_14.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_14.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_14.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_14.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_14.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_14.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_14.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_14.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_16.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_16.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_16.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_16.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_16.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_16.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_16.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_16.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_18.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_18.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_18.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_18.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_18.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_18.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_18.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_18.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_20.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_20.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_20.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_20.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_20.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_20.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_20.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_20.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_22.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_22.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_22.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_22.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_22_400.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_400.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_22_400.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_400.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_22_400.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_400.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_22_400.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_400.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_22_600.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_600.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_22_600.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_600.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_22_600.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_600.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_22_600.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_22_600.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_24_300.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_300.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_24_300.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_300.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_24_300.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_300.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_24_300.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_300.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_24_400.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_400.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_24_400.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_400.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_24_400.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_400.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_24_400.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_400.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_24_600.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_600.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_24_600.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_600.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_24_600.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_600.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_24_600.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_24_600.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_28_300.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_300.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_28_300.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_300.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_28_300.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_300.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_28_300.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_300.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_28_600.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_600.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_28_600.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_600.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_28_600.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_600.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_28_600.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_28_600.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_32_600.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_32_600.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_32_600.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_32_600.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_32_600.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_32_600.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_32_600.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_32_600.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_40_600.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_40_600.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_40_600.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_40_600.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_40_600.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_40_600.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_40_600.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_40_600.wrl diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_8.wings b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_8.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_8.wings rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_8.wings diff --git a/modules/packages3d/unused_3d/dil.sockets.dil_socket_8.wrl b/modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_8.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.sockets.dil_socket_8.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.sockets.dil_socket_8.wrl diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_10.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_10.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_10.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_10.wings diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_10.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_10.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_10.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_10.wrl diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_12.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_12.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_12.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_12.wings diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_12.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_12.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_12.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_12.wrl diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_4.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_4.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_4.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_4.wings diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_4.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_4.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_4.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_4.wrl diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_8.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_8.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_8.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_8.wings diff --git a/modules/packages3d/unused_3d/dil.switches.dip_switch_8.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_8.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches.dip_switch_8.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches.dip_switch_8.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp02_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp02_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp02_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp02_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp02_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp02_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp02_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp02_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp03_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp03_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp03_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp03_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp03_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp03_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp03_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp03_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp04_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp04_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp04_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp04_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp04_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp04_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp04_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp04_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp05_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp05_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp05_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp05_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp05_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp05_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp05_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp05_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp06_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp06_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp06_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp06_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp06_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp06_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp06_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp06_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp07_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp07_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp07_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp07_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp07_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp07_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp07_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp07_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp08_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp08_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp08_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp08_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp08_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp08_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp08_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp08_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp09_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp09_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp09_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp09_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp09_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp09_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp09_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp09_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp10_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp10_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp10_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp10_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp10_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp10_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp10_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp10_red.wrl diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp12_red.wings b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp12_red.wings similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp12_red.wings rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp12_red.wings diff --git a/modules/packages3d/unused_3d/dil.switches_90deg.ds_dp12_red.wrl b/modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp12_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/dil.switches_90deg.ds_dp12_red.wrl rename to modules/packages3d/unused_3d.3dshapes/dil.switches_90deg.ds_dp12_red.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.c_27x13x22mmRM23.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.c_27x13x22mmRM23.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.c_27x13x22mmRM23.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.c_27x13x22mmRM23.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.c_27x13x22mmRM23.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.c_27x13x22mmRM23.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.c_27x13x22mmRM23.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.c_27x13x22mmRM23.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.cnp_18x5mm.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.cnp_18x5mm.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.cnp_18x5mm.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.cnp_18x5mm.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.cnp_18x5mm.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.cnp_18x5mm.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.cnp_18x5mm.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.cnp_18x5mm.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1_5v8.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1v7.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1v7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1v7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1v7.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1v7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1v7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c1v7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c1v7.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c2v10.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c2v10.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c2v10.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c2v10.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c2v10.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c2v10.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_horiz_c2v10.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_horiz_c2v10.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_big.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_big.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_big.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_big.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_big.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_big.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_big.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_big.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v5.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v5.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v5.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v7.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v7.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v7.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v8l.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v8l.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v8l.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v8l.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v8l.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v8l.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c1v8l.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c1v8l.wrl diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c2v10.wings b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c2v10.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c2v10.wings rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c2v10.wings diff --git a/modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c2v10.wrl b/modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c2v10.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.Capacitor.electrolytic.c_vert_c2v10.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.Capacitor.electrolytic.c_vert_c2v10.wrl diff --git a/modules/packages3d/unused_3d/discret.SELF_WEPD4.wings b/modules/packages3d/unused_3d.3dshapes/discret.SELF_WEPD4.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.SELF_WEPD4.wings rename to modules/packages3d/unused_3d.3dshapes/discret.SELF_WEPD4.wings diff --git a/modules/packages3d/unused_3d/discret.SELF_WEPD4.wrl b/modules/packages3d/unused_3d.3dshapes/discret.SELF_WEPD4.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.SELF_WEPD4.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.SELF_WEPD4.wrl diff --git a/modules/packages3d/unused_3d/discret.c_vert_c2v8.wings b/modules/packages3d/unused_3d.3dshapes/discret.c_vert_c2v8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.c_vert_c2v8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.c_vert_c2v8.wings diff --git a/modules/packages3d/unused_3d/discret.c_vert_c2v8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.c_vert_c2v8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.c_vert_c2v8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.c_vert_c2v8.wrl diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_3_cinza.wings b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_3_cinza.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_3_cinza.wings rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_3_cinza.wings diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_3_cinza.wrl b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_3_cinza.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_3_cinza.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_3_cinza.wrl diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_cinza.wings b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_cinza.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_cinza.wings rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_cinza.wings diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_cinza.wrl b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_cinza.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_cinza.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_cinza.wrl diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h1_azul.wings b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h1_azul.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h1_azul.wings rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h1_azul.wings diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h1_azul.wrl b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h1_azul.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h1_azul.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h1_azul.wrl diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h2_azul.wings b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h2_azul.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h2_azul.wings rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h2_azul.wings diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h2_azul.wrl b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h2_azul.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x2_h2_azul.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x2_h2_azul.wrl diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x4_h1_azul.wings b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x4_h1_azul.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x4_h1_azul.wings rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x4_h1_azul.wings diff --git a/modules/packages3d/unused_3d/discret.lcds.lcd_16x4_h1_azul.wrl b/modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x4_h1_azul.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.lcds.lcd_16x4_h1_azul.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.lcds.lcd_16x4_h1_azul.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.barraled_gre.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_gre.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.barraled_gre.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_gre.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.barraled_gre.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_gre.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.barraled_gre.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_gre.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.barraled_red.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_red.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.barraled_red.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_red.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.barraled_red.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.barraled_red.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.barraled_red.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_d_gre.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_gre.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_d_gre.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_gre.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_d_gre.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_gre.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_d_gre.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_gre.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_d_red.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_red.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_d_red.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_red.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_d_red.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_d_red.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_d_red.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_gre.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_gre.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_gre.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_gre.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_gre2.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_gre2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre2.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_gre2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_gre2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_gre2.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_red.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_red.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_red.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_red.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red.wrl diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_red2.wings b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_red2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red2.wings diff --git a/modules/packages3d/unused_3d/discret.led_displays.display7seg_red2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.led_displays.display7seg_red2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.led_displays.display7seg_red2.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led3_vertical_amarelo.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_amarelo.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led3_vertical_amarelo.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_amarelo.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led3_vertical_amarelo.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_amarelo.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led3_vertical_amarelo.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_amarelo.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led3_vertical_branco.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_branco.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led3_vertical_branco.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_branco.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led3_vertical_branco.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_branco.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led3_vertical_branco.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led3_vertical_branco.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H10mm.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H10mm.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H10mm.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H10mm.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H10mm.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H10mm.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H10mm.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H10mm.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H15mm.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H15mm.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H15mm.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H15mm.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H15mm.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H15mm.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H15mm.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H15mm.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H5mm.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H5mm.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H5mm.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H5mm.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H5mm.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H5mm.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5-3_vertical-H5mm.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5-3_vertical-H5mm.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led5_vertical_amarelo.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_amarelo.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5_vertical_amarelo.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_amarelo.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led5_vertical_amarelo.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_amarelo.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5_vertical_amarelo.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_amarelo.wrl diff --git a/modules/packages3d/unused_3d/discret.leds.led5_vertical_branco.wings b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_branco.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5_vertical_branco.wings rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_branco.wings diff --git a/modules/packages3d/unused_3d/discret.leds.led5_vertical_branco.wrl b/modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_branco.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.leds.led5_vertical_branco.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.leds.led5_vertical_branco.wrl diff --git a/modules/packages3d/unused_3d/discret.multiwatt.multiwatt11.wings b/modules/packages3d/unused_3d.3dshapes/discret.multiwatt.multiwatt11.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.multiwatt.multiwatt11.wings rename to modules/packages3d/unused_3d.3dshapes/discret.multiwatt.multiwatt11.wings diff --git a/modules/packages3d/unused_3d/discret.multiwatt.multiwatt11.wrl b/modules/packages3d/unused_3d.3dshapes/discret.multiwatt.multiwatt11.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.multiwatt.multiwatt11.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.multiwatt.multiwatt11.wrl diff --git a/modules/packages3d/unused_3d/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wings b/modules/packages3d/unused_3d.3dshapes/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wings rename to modules/packages3d/unused_3d.3dshapes/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wings diff --git a/modules/packages3d/unused_3d/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wrl b/modules/packages3d/unused_3d.3dshapes/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.potentiometer.Potentiometer_Trimmer-Suntan-TSR-3386P.wrl diff --git a/modules/packages3d/unused_3d/discret.potentiometer.pot_10t_vertical.wings b/modules/packages3d/unused_3d.3dshapes/discret.potentiometer.pot_10t_vertical.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.potentiometer.pot_10t_vertical.wings rename to modules/packages3d/unused_3d.3dshapes/discret.potentiometer.pot_10t_vertical.wings diff --git a/modules/packages3d/unused_3d/discret.potentiometer.pot_10t_vertical.wrl b/modules/packages3d/unused_3d.3dshapes/discret.potentiometer.pot_10t_vertical.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.potentiometer.pot_10t_vertical.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.potentiometer.pot_10t_vertical.wrl diff --git a/modules/packages3d/unused_3d/discret.push_butt_shape1_green.wings b/modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_green.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.push_butt_shape1_green.wings rename to modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_green.wings diff --git a/modules/packages3d/unused_3d/discret.push_butt_shape1_green.wrl b/modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_green.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.push_butt_shape1_green.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_green.wrl diff --git a/modules/packages3d/unused_3d/discret.push_butt_shape1_red.wings b/modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_red.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.push_butt_shape1_red.wings rename to modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_red.wings diff --git a/modules/packages3d/unused_3d/discret.push_butt_shape1_red.wrl b/modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_red.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.push_butt_shape1_red.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.push_butt_shape1_red.wrl diff --git a/modules/packages3d/unused_3d/discret.resistor1.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistor1.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistor1.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistor1.wrl diff --git a/modules/packages3d/unused_3d/discret.resistor2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistor2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistor2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistor2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100k.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100k.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100k.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100k.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100k.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100k.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_100k.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_100k.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10k.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10k.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10k.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10k.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10k.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10k.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_10k.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_10k.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_120R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_120R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_12R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_12R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_150R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_150R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_15R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_15R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_180R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_180R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_18R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_18R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K5.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K5.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K5.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1K8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1K8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M5.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M5.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M5.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1M8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1M8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R5.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R5.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R5.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1R8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1R8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1k.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1k.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1k.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1k.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1k.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1k.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_1k.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_1k.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_220R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_220R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_22R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_22R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_270R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_270R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_27R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_27R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2K7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2K7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2M7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2M7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_2R7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_2R7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_330R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_330R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_33R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_33R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_390R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_390R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_39R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_39R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K3.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K3.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K3.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K3.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K3.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K3.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K3.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K3.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K9.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K9.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K9.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K9.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K9.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K9.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3K9.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3K9.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M3.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M3.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M3.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M3.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M3.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M3.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M3.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M3.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M9.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M9.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M9.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M9.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M9.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M9.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3M9.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3M9.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R3.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R3.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R3.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R3.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R3.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R3.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R3.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R3.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R9.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R9.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R9.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R9.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R9.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R9.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_3R9.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_3R9.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_470R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_470R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_47R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_47R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4K7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4K7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4K7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4K7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4K7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4K7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4K7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4K7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4M7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4M7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4M7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4M7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4M7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4M7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4M7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4M7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4R7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4R7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4R7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4R7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4R7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4R7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_4R7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_4R7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_560R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_560R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_56R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_56R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5K6.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5K6.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5K6.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5K6.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5K6.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5K6.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5K6.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5K6.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5M6.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5M6.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5M6.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5M6.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5M6.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5M6.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5M6.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5M6.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5R6.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5R6.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5R6.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5R6.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5R6.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5R6.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_5R6.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_5R6.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_680R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_680R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_68R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_68R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6K8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6K8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6K8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6K8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6K8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6K8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6K8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6K8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6M8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6M8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6M8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6M8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6M8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6M8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6M8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6M8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6R8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6R8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6R8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6R8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6R8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6R8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_6R8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_6R8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_820R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_820R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_82R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_82R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8K2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8K2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8K2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8K2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8K2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8K2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8K2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8K2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8M2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8M2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8M2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8M2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8M2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8M2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8M2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8M2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8R2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8R2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8R2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8R2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8R2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8R2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.horizontal.r_h_8R2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.horizontal.r_h_8R2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100k.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100k.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100k.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100k.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100k.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100k.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_100k.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_100k.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10k.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10k.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10k.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10k.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10k.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10k.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_10k.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_10k.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_120R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_120R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_12R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_12R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_150R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_150R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_15R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_15R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_180R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_180R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_18R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_18R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K5.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K5.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K5.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1K8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1K8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M5.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M5.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M5.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1M8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1M8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R5.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R5.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R5.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R5.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R5.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R5.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R5.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R5.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1R8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1R8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1k.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1k.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1k.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1k.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1k.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1k.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_1k.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_1k.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_220R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_220R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_22R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_22R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_270R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_270R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_27R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_27R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2K7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2K7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2M7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2M7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_2R7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_2R7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_330R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_330R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_33R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_33R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_390R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_390R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_39R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_39R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K3.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K3.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K3.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K3.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K3.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K3.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K3.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K3.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K9.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K9.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K9.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K9.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K9.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K9.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3K9.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3K9.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M3.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M3.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M3.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M3.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M3.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M3.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M3.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M3.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M9.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M9.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M9.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M9.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M9.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M9.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3M9.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3M9.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R3.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R3.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R3.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R3.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R3.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R3.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R3.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R3.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R9.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R9.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R9.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R9.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R9.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R9.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_3R9.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_3R9.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_470R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_470R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_47R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_47R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4K7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4K7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4K7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4K7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4K7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4K7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4K7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4K7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4M7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4M7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4M7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4M7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4M7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4M7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4M7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4M7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4R7.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4R7.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4R7.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4R7.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4R7.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4R7.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_4R7.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_4R7.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_560R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_560R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_56R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_56R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5K6.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5K6.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5K6.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5K6.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5K6.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5K6.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5K6.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5K6.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5M6.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5M6.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5M6.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5M6.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5M6.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5M6.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5M6.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5M6.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5R6.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5R6.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5R6.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5R6.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5R6.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5R6.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_5R6.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_5R6.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_680R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_680R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_68R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_68R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6K8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6K8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6K8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6K8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6K8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6K8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6K8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6K8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6M8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6M8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6M8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6M8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6M8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6M8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6M8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6M8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6R8.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6R8.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6R8.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6R8.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6R8.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6R8.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_6R8.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_6R8.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_820R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_820R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82K.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82K.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82K.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82K.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82K.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82K.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82K.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82K.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82M.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82M.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82M.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82M.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82M.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82M.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82M.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82M.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82R.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82R.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82R.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82R.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82R.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82R.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_82R.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_82R.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8K2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8K2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8K2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8K2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8K2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8K2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8K2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8K2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8M2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8M2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8M2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8M2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8M2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8M2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8M2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8M2.wrl diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8R2.wings b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8R2.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8R2.wings rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8R2.wings diff --git a/modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8R2.wrl b/modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8R2.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.resistors.vertical.r_v_8R2.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.resistors.vertical.r_v_8R2.wrl diff --git a/modules/packages3d/unused_3d/discret.to220_vert.wings b/modules/packages3d/unused_3d.3dshapes/discret.to220_vert.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.to220_vert.wings rename to modules/packages3d/unused_3d.3dshapes/discret.to220_vert.wings diff --git a/modules/packages3d/unused_3d/discret.to220_vert.wrl b/modules/packages3d/unused_3d.3dshapes/discret.to220_vert.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.to220_vert.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.to220_vert.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49-smd.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49-smd.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49-smd.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49-smd.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49-smd.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49-smd.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49-smd.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49-smd.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49s.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49s.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49s.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49s.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49s.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49s.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49s.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49s.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u_horiz.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u_horiz.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u_horiz.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u_horiz.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u_horiz.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u_horiz.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc-49u_horiz.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc-49u_horiz.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_3pin.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_3pin.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_3pin.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_3pin.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_3pin.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_3pin.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_3pin.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_3pin.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_low_profile.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_low_profile.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_low_profile.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_low_profile.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_low_profile.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_low_profile.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.crystal_hc18u_low_profile.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.crystal_hc18u_low_profile.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.xtal_quadrado.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.xtal_quadrado.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.xtal_quadrado.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.xtal_quadrado.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wrl diff --git a/modules/packages3d/unused_3d/discret.xtal.xtal_ret.wings b/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wings similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.xtal_ret.wings rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wings diff --git a/modules/packages3d/unused_3d/discret.xtal.xtal_ret.wrl b/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wrl similarity index 100% rename from modules/packages3d/unused_3d/discret.xtal.xtal_ret.wrl rename to modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wrl diff --git a/modules/packages3d/unused_3d/pga.pga120.wings b/modules/packages3d/unused_3d.3dshapes/pga.pga120.wings similarity index 100% rename from modules/packages3d/unused_3d/pga.pga120.wings rename to modules/packages3d/unused_3d.3dshapes/pga.pga120.wings diff --git a/modules/packages3d/unused_3d/pga.pga120.wrl b/modules/packages3d/unused_3d.3dshapes/pga.pga120.wrl similarity index 100% rename from modules/packages3d/unused_3d/pga.pga120.wrl rename to modules/packages3d/unused_3d.3dshapes/pga.pga120.wrl diff --git a/modules/packages3d/unused_3d/smd.IDG-300.wings b/modules/packages3d/unused_3d.3dshapes/smd.IDG-300.wings similarity index 100% rename from modules/packages3d/unused_3d/smd.IDG-300.wings rename to modules/packages3d/unused_3d.3dshapes/smd.IDG-300.wings diff --git a/modules/packages3d/unused_3d/smd.IDG-300.wrl b/modules/packages3d/unused_3d.3dshapes/smd.IDG-300.wrl similarity index 100% rename from modules/packages3d/unused_3d/smd.IDG-300.wrl rename to modules/packages3d/unused_3d.3dshapes/smd.IDG-300.wrl diff --git a/modules/packages3d/unused_3d/smd.TSOC_6.wings b/modules/packages3d/unused_3d.3dshapes/smd.TSOC_6.wings similarity index 100% rename from modules/packages3d/unused_3d/smd.TSOC_6.wings rename to modules/packages3d/unused_3d.3dshapes/smd.TSOC_6.wings diff --git a/modules/packages3d/unused_3d/smd.TSOC_6.wrl b/modules/packages3d/unused_3d.3dshapes/smd.TSOC_6.wrl similarity index 100% rename from modules/packages3d/unused_3d/smd.TSOC_6.wrl rename to modules/packages3d/unused_3d.3dshapes/smd.TSOC_6.wrl diff --git a/modules/packages3d/unused_3d/smd.TSSOP_28.wings b/modules/packages3d/unused_3d.3dshapes/smd.TSSOP_28.wings similarity index 100% rename from modules/packages3d/unused_3d/smd.TSSOP_28.wings rename to modules/packages3d/unused_3d.3dshapes/smd.TSSOP_28.wings diff --git a/modules/packages3d/unused_3d/smd.TSSOP_28.wrl b/modules/packages3d/unused_3d.3dshapes/smd.TSSOP_28.wrl similarity index 100% rename from modules/packages3d/unused_3d/smd.TSSOP_28.wrl rename to modules/packages3d/unused_3d.3dshapes/smd.TSSOP_28.wrl diff --git a/modules/packages3d/unused_3d/smd.ipack_3.wings b/modules/packages3d/unused_3d.3dshapes/smd.ipack_3.wings similarity index 100% rename from modules/packages3d/unused_3d/smd.ipack_3.wings rename to modules/packages3d/unused_3d.3dshapes/smd.ipack_3.wings diff --git a/modules/packages3d/unused_3d/smd.ipack_3.wrl b/modules/packages3d/unused_3d.3dshapes/smd.ipack_3.wrl similarity index 100% rename from modules/packages3d/unused_3d/smd.ipack_3.wrl rename to modules/packages3d/unused_3d.3dshapes/smd.ipack_3.wrl diff --git a/modules/packages3d/unused_3d/smd.led_0805.wings b/modules/packages3d/unused_3d.3dshapes/smd.led_0805.wings similarity index 100% rename from modules/packages3d/unused_3d/smd.led_0805.wings rename to modules/packages3d/unused_3d.3dshapes/smd.led_0805.wings diff --git a/modules/packages3d/unused_3d/smd.led_0805.wrl b/modules/packages3d/unused_3d.3dshapes/smd.led_0805.wrl similarity index 100% rename from modules/packages3d/unused_3d/smd.led_0805.wrl rename to modules/packages3d/unused_3d.3dshapes/smd.led_0805.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.TO3P.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.TO3P.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.TO3P.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.TO3P.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.TO3P.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.TO3P.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.TO3P.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.TO3P.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.t03B.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.t03B.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.t03B.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.t03B.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.t03B.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.t03B.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.t03B.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.t03B.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to126.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to126.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to126.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to126.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to126v.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126v.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to126v.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126v.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to126v.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126v.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to126v.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to126v.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to127.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to127.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to127.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to127.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to127.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to127.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to127.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to127.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to202ch.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202ch.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to202ch.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202ch.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to202ch.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202ch.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to202ch.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202ch.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to202cv.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202cv.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to202cv.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202cv.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to202cv.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202cv.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to202cv.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to202cv.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to218ah.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218ah.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to218ah.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218ah.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to218ah.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218ah.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to218ah.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218ah.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to218av.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218av.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to218av.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218av.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to218av.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218av.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to218av.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to218av.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_05.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_05.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_05.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_05.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_05h.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05h.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_05h.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05h.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_05h.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05h.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_05h.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_05h.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_07.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_07.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_07.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_07.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_07.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_07.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_07.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_07.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_11.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_11.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_11.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_11.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_11.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_11.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_11.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_11.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_13.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_13.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_13.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_13.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_13.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_13.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_13.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_13.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_15.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_15.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_15.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_15.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_15.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_15.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_15.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_15.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_17.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_17.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_17.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_17.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220_17.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_17.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220_17.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220_17.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ab.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ab.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ab.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ab.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ab.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ab.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ab.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ab.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220abs.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220abs.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220abs.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220abs.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220abs.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220abs.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220abs.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220abs.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ac.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ac.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ac.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ac.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ac.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ac.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ac.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ac.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ack.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ack.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ack.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ack.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ack.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ack.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ack.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ack.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220acs.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220acs.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220acs.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220acs.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220acs.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220acs.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220acs.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220acs.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ch.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ch.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ch.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ch.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to220ch.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ch.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to220ch.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to220ch.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to225aa.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to225aa.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to225aa.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to225aa.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to225aa.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to225aa.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to225aa.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to225aa.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to247V.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247V.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to247V.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247V.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to247V.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247V.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to247V.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247V.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to247h.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247h.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to247h.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247h.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to247h.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247h.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to247h.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247h.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to247p.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247p.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to247p.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247p.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to247p.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247p.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to247p.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to247p.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to258aa.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to258aa.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to258aa.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to258aa.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to258aa.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to258aa.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to258aa.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to258aa.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to262-H.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to262-H.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to262-H.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to262-H.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.to262-H.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to262-H.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.to262-H.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.to262-H.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.top3h.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3h.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.top3h.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3h.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.top3h.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3h.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.top3h.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3h.wrl diff --git a/modules/packages3d/unused_3d/to-xxx-packages.top3v.wings b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3v.wings similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.top3v.wings rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3v.wings diff --git a/modules/packages3d/unused_3d/to-xxx-packages.top3v.wrl b/modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3v.wrl similarity index 100% rename from modules/packages3d/unused_3d/to-xxx-packages.top3v.wrl rename to modules/packages3d/unused_3d.3dshapes/to-xxx-packages.top3v.wrl