diff --git a/modules/packages3d/Divers.3dshapes/SELF26.wings b/modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_horizontal_Diameter26mm.wings
similarity index 100%
rename from modules/packages3d/Divers.3dshapes/SELF26.wings
rename to modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_horizontal_Diameter26mm.wings
diff --git a/modules/packages3d/Divers.3dshapes/SELF26.wrl b/modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_horizontal_Diameter26mm.wrl
similarity index 100%
rename from modules/packages3d/Divers.3dshapes/SELF26.wrl
rename to modules/packages3d/Choke_Toroid_ThroughHole.3dshapes/Choke_Toroid_horizontal_Diameter26mm.wrl
diff --git a/modules/packages3d/Discret.3dshapes/SUBCLICK.wings b/modules/packages3d/Connect.3dshapes/SUBCLICK.wings
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/SUBCLICK.wings
rename to modules/packages3d/Connect.3dshapes/SUBCLICK.wings
diff --git a/modules/packages3d/Discret.3dshapes/SUBCLICK.wrl b/modules/packages3d/Connect.3dshapes/SUBCLICK.wrl
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/SUBCLICK.wrl
rename to modules/packages3d/Connect.3dshapes/SUBCLICK.wrl
diff --git a/modules/packages3d/Discret.3dshapes/TEST_POINT_2PADS.wrl b/modules/packages3d/Measurement_Points.3dshapes/Test_Point.wrl
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/TEST_POINT_2PADS.wrl
rename to modules/packages3d/Measurement_Points.3dshapes/Test_Point.wrl
diff --git a/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wings b/modules/packages3d/Oscillators.3dshapes/KXO-200.wings
similarity index 100%
rename from modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wings
rename to modules/packages3d/Oscillators.3dshapes/KXO-200.wings
diff --git a/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wrl b/modules/packages3d/Oscillators.3dshapes/KXO-200.wrl
similarity index 100%
rename from modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_ret.wrl
rename to modules/packages3d/Oscillators.3dshapes/KXO-200.wrl
diff --git a/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wings b/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wings
new file mode 100644
index 00000000..f8c5684b
Binary files /dev/null and b/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wings differ
diff --git a/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wrl b/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wrl
new file mode 100644
index 00000000..affce6cd
--- /dev/null
+++ b/modules/packages3d/Oscillators.3dshapes/KXO-200_LargePads.wrl
@@ -0,0 +1,690 @@
+#VRML V2.0 utf8
+#Exported from Wings 3D 0.98.31
+DEF torus1_copy6 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF pins Material {
+          diffuseColor 0.826667 0.826667 0.826667
+          emissiveColor 0.00000e+0 0.00000e+0 0.00000e+0
+          specularColor 1.00000 1.00000 1.00000
+          ambientIntensity 1.00000
+          transparency 0.00000e+0
+          shininess 1.00000
+        }
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          3.18600 1.48969 0.799496,
+          3.17005 1.40955 0.799496,
+          3.12466 1.34161 0.799496,
+          3.05672 1.29621 0.799496,
+          2.97658 1.28027 0.799496,
+          2.89644 1.29621 0.799496,
+          2.82850 1.34161 0.799496,
+          2.78311 1.40955 0.799496,
+          2.76717 1.48969 0.799496,
+          2.78311 1.56983 0.799496,
+          2.82850 1.63776 0.799496,
+          2.89644 1.68316 0.799496,
+          2.97658 1.69910 0.799496,
+          3.05672 1.68316 0.799496,
+          3.12466 1.63776 0.799496,
+          3.17005 1.56983 0.799496,
+          3.18600 1.48969 -1.03430,
+          3.17005 1.40955 -1.03430,
+          3.12466 1.34161 -1.03430,
+          3.05672 1.29621 -1.03430,
+          2.97658 1.28027 -1.03430,
+          2.89644 1.29621 -1.03430,
+          2.82850 1.34161 -1.03430,
+          2.78311 1.40955 -1.03430,
+          2.76717 1.48969 -1.03430,
+          2.78311 1.56983 -1.03430,
+          2.82850 1.63776 -1.03430,
+          2.89644 1.68316 -1.03430,
+          2.97658 1.69910 -1.03430,
+          3.05672 1.68316 -1.03430,
+          3.12466 1.63776 -1.03430,
+          3.17005 1.56983 -1.03430 ] }
+        coordIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+        normal Normal { vector [
+          0.890909 4.15244e-7 0.454182,
+          0.823093 -0.340936 0.454182,
+          0.629968 -0.629968 0.454182,
+          0.340936 -0.823093 0.454182,
+          -5.04243e-17 -0.890909 0.454182,
+          -0.340936 -0.823093 0.454182,
+          -0.629968 -0.629968 0.454182,
+          -0.823093 -0.340936 0.454182,
+          -0.890909 4.15244e-7 0.454182,
+          -0.823093 0.340937 0.454181,
+          -0.629968 0.629968 0.454181,
+          -0.340936 0.823093 0.454181,
+          -5.04243e-17 0.890909 0.454181,
+          0.340936 0.823093 0.454181,
+          0.629968 0.629968 0.454181,
+          0.823093 0.340937 0.454181,
+          0.890909 -4.15244e-7 -0.454182,
+          0.823093 -0.340937 -0.454181,
+          0.629968 -0.629968 -0.454181,
+          0.340936 -0.823093 -0.454181,
+          5.04243e-17 -0.890909 -0.454181,
+          -0.340936 -0.823093 -0.454181,
+          -0.629968 -0.629968 -0.454181,
+          -0.823093 -0.340937 -0.454181,
+          -0.890909 -4.15244e-7 -0.454182,
+          -0.823093 0.340936 -0.454182,
+          -0.629968 0.629968 -0.454182,
+          -0.340936 0.823093 -0.454182,
+          5.04243e-17 0.890909 -0.454182,
+          0.340936 0.823093 -0.454182,
+          0.629968 0.629968 -0.454182,
+          0.823093 0.340936 -0.454182 ] }
+        normalIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+      }
+    }
+  ]
+}
+
+DEF torus1_copy5 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pins
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -2.79175 -1.50044 0.799496,
+          -2.80769 -1.58058 0.799496,
+          -2.85309 -1.64852 0.799496,
+          -2.92103 -1.69392 0.799496,
+          -3.00117 -1.70986 0.799496,
+          -3.08131 -1.69392 0.799496,
+          -3.14925 -1.64852 0.799496,
+          -3.19464 -1.58058 0.799496,
+          -3.21058 -1.50044 0.799496,
+          -3.19464 -1.42030 0.799496,
+          -3.14925 -1.35236 0.799496,
+          -3.08131 -1.30697 0.799496,
+          -3.00117 -1.29103 0.799496,
+          -2.92103 -1.30697 0.799496,
+          -2.85309 -1.35236 0.799496,
+          -2.80769 -1.42030 0.799496,
+          -2.79175 -1.50044 -1.03430,
+          -2.80769 -1.58058 -1.03430,
+          -2.85309 -1.64852 -1.03430,
+          -2.92103 -1.69392 -1.03430,
+          -3.00117 -1.70986 -1.03430,
+          -3.08131 -1.69392 -1.03430,
+          -3.14925 -1.64852 -1.03430,
+          -3.19464 -1.58058 -1.03430,
+          -3.21058 -1.50044 -1.03430,
+          -3.19464 -1.42030 -1.03430,
+          -3.14925 -1.35236 -1.03430,
+          -3.08131 -1.30697 -1.03430,
+          -3.00117 -1.29103 -1.03430,
+          -2.92103 -1.30697 -1.03430,
+          -2.85309 -1.35236 -1.03430,
+          -2.80769 -1.42030 -1.03430 ] }
+        coordIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+        normal Normal { vector [
+          0.890909 4.15244e-7 0.454182,
+          0.823093 -0.340936 0.454182,
+          0.629968 -0.629968 0.454182,
+          0.340936 -0.823093 0.454182,
+          -8.82425e-16 -0.890909 0.454182,
+          -0.340936 -0.823093 0.454182,
+          -0.629968 -0.629968 0.454182,
+          -0.823093 -0.340936 0.454182,
+          -0.890909 4.15244e-7 0.454182,
+          -0.823093 0.340937 0.454181,
+          -0.629968 0.629968 0.454181,
+          -0.340936 0.823093 0.454181,
+          -9.07637e-16 0.890909 0.454181,
+          0.340936 0.823093 0.454181,
+          0.629968 0.629968 0.454181,
+          0.823093 0.340937 0.454181,
+          0.890909 -4.15244e-7 -0.454182,
+          0.823093 -0.340937 -0.454181,
+          0.629968 -0.629968 -0.454181,
+          0.340936 -0.823093 -0.454181,
+          -1.02109e-15 -0.890909 -0.454181,
+          -0.340936 -0.823093 -0.454181,
+          -0.629968 -0.629968 -0.454181,
+          -0.823093 -0.340937 -0.454181,
+          -0.890909 -4.15244e-7 -0.454182,
+          -0.823093 0.340936 -0.454182,
+          -0.629968 0.629968 -0.454182,
+          -0.340936 0.823093 -0.454182,
+          -1.04630e-15 0.890909 -0.454182,
+          0.340936 0.823093 -0.454182,
+          0.629968 0.629968 -0.454182,
+          0.823093 0.340936 -0.454182 ] }
+        normalIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+      }
+    }
+  ]
+}
+
+DEF cube8_copy9 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material DEF corpo Material {
+          diffuseColor 0.913420 0.913420 0.913420
+          emissiveColor 0.840160 0.840160 0.840160
+          specularColor 0.866800 0.866800 0.866800
+          ambientIntensity 0.900100
+          transparency 0.00000e+0
+          shininess 1.00000
+        }
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -3.63059 -2.26600 0.336464,
+          -3.26742 -2.50000 0.336464,
+          -3.63059 2.26600 0.336464,
+          -3.26742 2.50000 0.336464,
+          3.76624 2.50000 0.336464,
+          4.12941 2.26600 0.336464,
+          4.12941 -2.26600 0.336464,
+          3.76624 -2.50000 0.336464,
+          -3.63059 -2.26600 1.77860,
+          -3.26742 -2.50000 1.77860,
+          -3.63059 2.26600 1.77860,
+          -3.26742 2.50000 1.77860,
+          3.76624 2.50000 1.77860,
+          4.12941 2.26600 1.77860,
+          4.12941 -2.26600 1.77860,
+          3.76624 -2.50000 1.77860,
+          -3.30964 -2.18034 1.98540,
+          -3.13448 -2.29320 1.98540,
+          3.63330 -2.29320 1.98540,
+          3.80846 -2.18034 1.98540,
+          3.80846 2.18034 1.98540,
+          3.63330 2.29320 1.98540,
+          -3.13448 2.29320 1.98540,
+          -3.30964 2.18034 1.98540 ] }
+        coordIndex [
+          0, 1, 9, 8, -1,
+          0, 2, 3, 4, 5, 6, 7, 1, -1,
+          0, 8, 10, 2, -1,
+          1, 7, 15, 9, -1,
+          2, 10, 11, 3, -1,
+          3, 11, 12, 4, -1,
+          4, 12, 13, 5, -1,
+          5, 13, 14, 6, -1,
+          6, 14, 15, 7, -1,
+          8, 9, 17, 16, -1,
+          8, 16, 23, 10, -1,
+          9, 15, 18, 17, -1,
+          10, 23, 22, 11, -1,
+          11, 22, 21, 12, -1,
+          12, 21, 20, 13, -1,
+          13, 20, 19, 14, -1,
+          14, 19, 18, 15, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
+        normal Normal { vector [
+          -0.762917 -0.416000 -0.494876,
+          -0.250337 -0.850713 -0.462189,
+          -0.762917 0.416000 -0.494876,
+          -0.250337 0.850713 -0.462189,
+          0.250337 0.850713 -0.462189,
+          0.762917 0.416000 -0.494876,
+          0.762917 -0.416000 -0.494876,
+          0.250337 -0.850713 -0.462189,
+          -0.754025 -0.428411 0.497906,
+          -0.251799 -0.873606 0.416424,
+          -0.754025 0.428411 0.497906,
+          -0.251799 0.873606 0.416424,
+          0.251799 0.873606 0.416424,
+          0.754025 0.428411 0.497906,
+          0.754025 -0.428411 0.497906,
+          0.251799 -0.873606 0.416424,
+          -0.317234 -0.192815 0.928539,
+          -0.124903 -0.447160 0.885690,
+          0.124903 -0.447160 0.885690,
+          0.317234 -0.192815 0.928539,
+          0.317234 0.192815 0.928539,
+          0.124903 0.447160 0.885690,
+          -0.124903 0.447160 0.885690,
+          -0.317234 0.192815 0.928539 ] }
+        normalIndex [
+          0, 1, 9, 8, -1,
+          0, 2, 3, 4, 5, 6, 7, 1, -1,
+          0, 8, 10, 2, -1,
+          1, 7, 15, 9, -1,
+          2, 10, 11, 3, -1,
+          3, 11, 12, 4, -1,
+          4, 12, 13, 5, -1,
+          5, 13, 14, 6, -1,
+          6, 14, 15, 7, -1,
+          8, 9, 17, 16, -1,
+          8, 16, 23, 10, -1,
+          9, 15, 18, 17, -1,
+          10, 23, 22, 11, -1,
+          11, 22, 21, 12, -1,
+          12, 21, 20, 13, -1,
+          13, 20, 19, 14, -1,
+          14, 19, 18, 15, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, -1 ]
+      }
+    }
+  ]
+}
+
+DEF cube8 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE corpo
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -3.99071 -2.37024 0.393596,
+          -3.96662 -2.61500 0.393596,
+          -3.99071 -2.37024 0.182602,
+          -3.96662 -2.61500 0.182602,
+          -3.99071 2.25305 0.393596,
+          -3.86211 2.45310 0.393596,
+          -3.73944 2.53214 0.393596,
+          -3.42897 2.61500 0.393596,
+          3.56451 2.61500 0.393596,
+          3.87497 2.53214 0.393596,
+          3.99765 2.45310 0.393596,
+          4.12625 2.25305 0.393596,
+          4.12625 -2.25305 0.393596,
+          3.99765 -2.45310 0.393596,
+          3.87497 -2.53214 0.393596,
+          3.56451 -2.61500 0.393596,
+          -3.99071 2.25305 0.182602,
+          -3.86211 2.45310 0.182602,
+          -3.42897 2.61500 0.182602,
+          -3.73944 2.53214 0.182602,
+          3.56451 2.61500 0.182602,
+          3.87497 2.53214 0.182602,
+          4.12625 2.25305 0.182602,
+          3.99765 2.45310 0.182602,
+          4.12625 -2.25305 0.182602,
+          3.99765 -2.45310 0.182602,
+          3.56451 -2.61500 0.182602,
+          3.87497 -2.53214 0.182602 ] }
+        coordIndex [
+          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
+          0, 2, 3, 1, -1,
+          0, 4, 16, 2, -1,
+          1, 3, 26, 15, -1,
+          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
+          4, 5, 17, 16, -1,
+          5, 6, 19, 17, -1,
+          6, 7, 18, 19, -1,
+          7, 8, 20, 18, -1,
+          8, 9, 21, 20, -1,
+          9, 10, 23, 21, -1,
+          10, 11, 22, 23, -1,
+          11, 12, 24, 22, -1,
+          12, 13, 25, 24, -1,
+          13, 14, 27, 25, -1,
+          14, 15, 26, 27, -1 ]
+        normal Normal { vector [
+          -0.893136 -4.38512e-2 0.447644,
+          -0.556683 -0.614170 0.559374,
+          -0.893136 -4.38512e-2 -0.447644,
+          -0.556683 -0.614170 -0.559374,
+          -0.850871 0.249903 0.462134,
+          -0.629830 0.629175 0.455471,
+          -0.361040 0.815919 0.451583,
+          -0.116108 0.885311 0.450269,
+          0.116108 0.885311 0.450269,
+          0.361040 0.815919 0.451583,
+          0.629830 0.629175 0.455471,
+          0.850871 0.249903 0.462134,
+          0.850871 -0.249903 0.462134,
+          0.629830 -0.629175 0.455471,
+          0.361040 -0.815919 0.451583,
+          0.116108 -0.885311 0.450269,
+          -0.850871 0.249903 -0.462134,
+          -0.629830 0.629175 -0.455471,
+          -0.116108 0.885311 -0.450269,
+          -0.361040 0.815919 -0.451583,
+          0.116108 0.885311 -0.450269,
+          0.361040 0.815919 -0.451583,
+          0.850871 0.249903 -0.462134,
+          0.629830 0.629175 -0.455471,
+          0.850871 -0.249903 -0.462134,
+          0.629830 -0.629175 -0.455471,
+          0.116108 -0.885311 -0.450269,
+          0.361040 -0.815919 -0.451583 ] }
+        normalIndex [
+          0, 1, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, -1,
+          0, 2, 3, 1, -1,
+          0, 4, 16, 2, -1,
+          1, 3, 26, 15, -1,
+          2, 16, 17, 19, 18, 20, 21, 23, 22, 24, 25, 27, 26, 3, -1,
+          4, 5, 17, 16, -1,
+          5, 6, 19, 17, -1,
+          6, 7, 18, 19, -1,
+          7, 8, 20, 18, -1,
+          8, 9, 21, 20, -1,
+          9, 10, 23, 21, -1,
+          10, 11, 22, 23, -1,
+          11, 12, 24, 22, -1,
+          12, 13, 25, 24, -1,
+          13, 14, 27, 25, -1,
+          14, 15, 26, 27, -1 ]
+      }
+    }
+  ]
+}
+
+DEF torus1_sep7 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pins
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          3.18174 -1.49841 0.799496,
+          3.16580 -1.57855 0.799496,
+          3.12041 -1.64649 0.799496,
+          3.05247 -1.69189 0.799496,
+          2.97233 -1.70783 0.799496,
+          2.89219 -1.69189 0.799496,
+          2.82425 -1.64649 0.799496,
+          2.77886 -1.57855 0.799496,
+          2.76292 -1.49841 0.799496,
+          2.77886 -1.41827 0.799496,
+          2.82425 -1.35033 0.799496,
+          2.89219 -1.30494 0.799496,
+          2.97233 -1.28900 0.799496,
+          3.05247 -1.30494 0.799496,
+          3.12041 -1.35033 0.799496,
+          3.16580 -1.41827 0.799496,
+          3.18174 -1.49841 -1.03430,
+          3.16580 -1.57855 -1.03430,
+          3.12041 -1.64649 -1.03430,
+          3.05247 -1.69189 -1.03430,
+          2.97233 -1.70783 -1.03430,
+          2.89219 -1.69189 -1.03430,
+          2.82425 -1.64649 -1.03430,
+          2.77886 -1.57855 -1.03430,
+          2.76292 -1.49841 -1.03430,
+          2.77886 -1.41827 -1.03430,
+          2.82425 -1.35033 -1.03430,
+          2.89219 -1.30494 -1.03430,
+          2.97233 -1.28900 -1.03430,
+          3.05247 -1.30494 -1.03430,
+          3.12041 -1.35033 -1.03430,
+          3.16580 -1.41827 -1.03430 ] }
+        coordIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+        normal Normal { vector [
+          0.890909 4.15244e-7 0.454182,
+          0.823093 -0.340936 0.454182,
+          0.629968 -0.629968 0.454182,
+          0.340936 -0.823093 0.454182,
+          -5.04243e-17 -0.890909 0.454182,
+          -0.340936 -0.823093 0.454182,
+          -0.629968 -0.629968 0.454182,
+          -0.823093 -0.340936 0.454182,
+          -0.890909 4.15244e-7 0.454182,
+          -0.823093 0.340937 0.454181,
+          -0.629968 0.629968 0.454181,
+          -0.340936 0.823093 0.454181,
+          -5.04243e-17 0.890909 0.454181,
+          0.340936 0.823093 0.454181,
+          0.629968 0.629968 0.454181,
+          0.823093 0.340937 0.454181,
+          0.890909 -4.15244e-7 -0.454182,
+          0.823093 -0.340937 -0.454181,
+          0.629968 -0.629968 -0.454181,
+          0.340936 -0.823093 -0.454181,
+          -8.82425e-17 -0.890909 -0.454181,
+          -0.340936 -0.823093 -0.454181,
+          -0.629968 -0.629968 -0.454181,
+          -0.823093 -0.340937 -0.454181,
+          -0.890909 -4.15244e-7 -0.454182,
+          -0.823093 0.340936 -0.454182,
+          -0.629968 0.629968 -0.454182,
+          -0.340936 0.823093 -0.454182,
+          -8.82425e-17 0.890909 -0.454182,
+          0.340936 0.823093 -0.454182,
+          0.629968 0.629968 -0.454182,
+          0.823093 0.340936 -0.454182 ] }
+        normalIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+      }
+    }
+  ]
+}
+
+DEF torus1_sep6 Transform {
+  children [
+    Shape {
+      appearance Appearance {
+        material USE pins
+      }
+      geometry IndexedFaceSet {
+        normalPerVertex TRUE
+        coord Coordinate { point [
+          -2.80374 1.48360 0.799496,
+          -2.81968 1.40346 0.799496,
+          -2.86507 1.33552 0.799496,
+          -2.93301 1.29012 0.799496,
+          -3.01315 1.27418 0.799496,
+          -3.09329 1.29012 0.799496,
+          -3.16123 1.33552 0.799496,
+          -3.20662 1.40346 0.799496,
+          -3.22257 1.48360 0.799496,
+          -3.20662 1.56374 0.799496,
+          -3.16123 1.63168 0.799496,
+          -3.09329 1.67707 0.799496,
+          -3.01315 1.69301 0.799496,
+          -2.93301 1.67707 0.799496,
+          -2.86507 1.63168 0.799496,
+          -2.81968 1.56374 0.799496,
+          -2.80374 1.48360 -1.03430,
+          -2.81968 1.40346 -1.03430,
+          -2.86507 1.33552 -1.03430,
+          -2.93301 1.29012 -1.03430,
+          -3.01315 1.27418 -1.03430,
+          -3.09329 1.29012 -1.03430,
+          -3.16123 1.33552 -1.03430,
+          -3.20662 1.40346 -1.03430,
+          -3.22257 1.48360 -1.03430,
+          -3.20662 1.56374 -1.03430,
+          -3.16123 1.63168 -1.03430,
+          -3.09329 1.67707 -1.03430,
+          -3.01315 1.69301 -1.03430,
+          -2.93301 1.67707 -1.03430,
+          -2.86507 1.63168 -1.03430,
+          -2.81968 1.56374 -1.03430 ] }
+        coordIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+        normal Normal { vector [
+          0.890909 4.15244e-7 0.454182,
+          0.823093 -0.340936 0.454182,
+          0.629968 -0.629968 0.454182,
+          0.340936 -0.823093 0.454182,
+          5.92485e-16 -0.890909 0.454182,
+          -0.340936 -0.823093 0.454182,
+          -0.629968 -0.629968 0.454182,
+          -0.823093 -0.340936 0.454182,
+          -0.890909 4.15244e-7 0.454182,
+          -0.823093 0.340937 0.454181,
+          -0.629968 0.629968 0.454181,
+          -0.340936 0.823093 0.454181,
+          5.92485e-16 0.890909 0.454181,
+          0.340936 0.823093 0.454181,
+          0.629968 0.629968 0.454181,
+          0.823093 0.340937 0.454181,
+          0.890909 -4.15244e-7 -0.454182,
+          0.823093 -0.340937 -0.454181,
+          0.629968 -0.629968 -0.454181,
+          0.340936 -0.823093 -0.454181,
+          5.42061e-16 -0.890909 -0.454181,
+          -0.340936 -0.823093 -0.454181,
+          -0.629968 -0.629968 -0.454181,
+          -0.823093 -0.340937 -0.454181,
+          -0.890909 -4.15244e-7 -0.454182,
+          -0.823093 0.340936 -0.454182,
+          -0.629968 0.629968 -0.454182,
+          -0.340936 0.823093 -0.454182,
+          5.42061e-16 0.890909 -0.454182,
+          0.340936 0.823093 -0.454182,
+          0.629968 0.629968 -0.454182,
+          0.823093 0.340936 -0.454182 ] }
+        normalIndex [
+          0, 1, 17, 16, -1,
+          0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, -1,
+          0, 16, 31, 15, -1,
+          1, 2, 18, 17, -1,
+          2, 3, 19, 18, -1,
+          3, 4, 20, 19, -1,
+          4, 5, 21, 20, -1,
+          5, 6, 22, 21, -1,
+          6, 7, 23, 22, -1,
+          7, 8, 24, 23, -1,
+          8, 9, 25, 24, -1,
+          9, 10, 26, 25, -1,
+          10, 11, 27, 26, -1,
+          11, 12, 28, 27, -1,
+          12, 13, 29, 28, -1,
+          13, 14, 30, 29, -1,
+          14, 15, 31, 30, -1,
+          16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, -1 ]
+      }
+    }
+  ]
+}
+
diff --git a/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wings b/modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wings
similarity index 100%
rename from modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wings
rename to modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wings
diff --git a/modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wrl b/modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wrl
similarity index 100%
rename from modules/packages3d/unused_3d.3dshapes/discret.xtal.xtal_quadrado.wrl
rename to modules/packages3d/Oscillators.3dshapes/OSC_DIP8.wrl
diff --git a/modules/packages3d/Discret.3dshapes/r_pack8.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP8.wings
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/r_pack8.wings
rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP8.wings
diff --git a/modules/packages3d/Discret.3dshapes/r_pack8.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP8.wrl
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/r_pack8.wrl
rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP8.wrl
diff --git a/modules/packages3d/Discret.3dshapes/r_pack9.wings b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP9.wings
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/r_pack9.wings
rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP9.wings
diff --git a/modules/packages3d/Discret.3dshapes/r_pack9.wrl b/modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP9.wrl
similarity index 100%
rename from modules/packages3d/Discret.3dshapes/r_pack9.wrl
rename to modules/packages3d/Resistors_ThroughHole.3dshapes/Resistor_Array_SIP9.wrl