diff --git a/FemDesign.Grasshopper/FemDesign.Grasshopper.csproj b/FemDesign.Grasshopper/FemDesign.Grasshopper.csproj
index 020bfe30..1bea7935 100644
--- a/FemDesign.Grasshopper/FemDesign.Grasshopper.csproj
+++ b/FemDesign.Grasshopper/FemDesign.Grasshopper.csproj
@@ -871,28 +871,33 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="images\logo.png" />
+    <Content Include="Resources\icons\CombDefine2.png" />
+    <Content Include="Resources\icons\CombDefine3.png" />
+    <Content Include="Resources\icons\Diaphragm.bmp" />
+    <Content Include="Resources\icons\DiaphragmDeconstruct.bmp" />
+    <Content Include="Resources\icons\ExcitationForceSettings.png" />
+    <Content Include="Resources\icons\Fd_TabIcon_24_24.png" />
+    <Content Include="Resources\icons\FootfallDefine2.png" />
+    <Content Include="Resources\icons\FootfallDefine3.png" />
+    <Content Include="Resources\icons\FreqDefine2.png" />
+    <Content Include="Resources\icons\FreqDefine3.png" />
+    <Content Include="Resources\icons\GroundAccelerationDefine2.png" />
+    <Content Include="Resources\icons\GroundAccelerationDefine3.png" />
+    <Content Include="Resources\icons\ImperfectionDefine2.png" />
+    <Content Include="Resources\icons\ImperfectionDefine3.png" />
+    <Content Include="Resources\icons\LabelledSection.png" />
+    <Content Include="Resources\icons\LineConnection.bmp" />
+    <Content Include="Resources\icons\PeriodicExcitationDefine2.png" />
+    <Content Include="Resources\icons\PeriodicExcitationDefine3.png" />
+    <Content Include="Resources\icons\StabilityDefine2.png" />
+    <Content Include="Resources\icons\StabilityDefine3.png" />
+    <Content Include="Resources\icons\StageDefine2.png" />
+    <Content Include="Resources\icons\StageDefine3.png" />
+    <Content Include="Resources\icons\StiffnessMatrix4Type.bmp" />
     <None Include="Resources\icons\ExcitationForceDiagram.png" />
     <None Include="Resources\icons\ExcitationForceCombination.png" />
     <None Include="Resources\icons\ExcitationForce.png" />
     <None Include="Resources\icons\Mass.png" />
-    <None Include="Resources\StageDefine3.png" />
-    <None Include="Resources\StabilityDefine3.png" />
-    <None Include="Resources\PeriodicExcitationDefine3.png" />
-    <None Include="Resources\ImperfectionDefine3.png" />
-    <None Include="Resources\GroundAccelerationDefine3.png" />
-    <None Include="Resources\FreqDefine3.png" />
-    <None Include="Resources\FootfallDefine3.png" />
-    <None Include="Resources\ExcitationForceDefine3.png" />
-    <None Include="Resources\CombDefine3.png" />
-    <None Include="Resources\StageDefine2.png" />
-    <None Include="Resources\StabilityDefine2.png" />
-    <None Include="Resources\PeriodicExcitationDefine2.png" />
-    <None Include="Resources\ImperfectionDefine2.png" />
-    <None Include="Resources\GroundAccelerationDefine2.png" />
-    <None Include="Resources\FreqDefine2.png" />
-    <None Include="Resources\FootfallDefine2.png" />
-    <None Include="Resources\ExcitationForceDefine2.png" />
-    <None Include="Resources\CombDefine2.png" />
     <None Include="Resources\icons\MaterialSetSteelMaterialProperties.bmp" />
     <None Include="Resources\icons\PointMotion.bmp" />
     <None Include="Resources\icons\SurfaceMotion.bmp" />
@@ -943,7 +948,6 @@
     <EmbeddedResource Include="Resources\icons\BeamSetStiffness.bmp" />
     <EmbeddedResource Include="Resources\icons\StiffnessModifier.png" />
     <EmbeddedResource Include="Resources\icons\Options.png" />
-    <EmbeddedResource Include="Resources\icons\lineconnection.bmp" />
     <EmbeddedResource Include="Resources\icons\IsolatedFoundationDeconstruct.png" />
     <EmbeddedResource Include="Resources\icons\Insulation.png" />
     <EmbeddedResource Include="Resources\icons\ExtrudedSolid.png" />
@@ -968,7 +972,6 @@
     <EmbeddedResource Include="Resources\icons\LoadCategoryDatabaseDefault.bmp" />
     <EmbeddedResource Include="Resources\icons\LoadCategoryDatabaseListCategoryNames.bmp" />
     <EmbeddedResource Include="Resources\icons\LoadCategoryDatabaseGetCategoryByName.bmp" />
-    <EmbeddedResource Include="Resources\Fd_TabIcon_24_24.png" />
     <EmbeddedResource Include="Resources\icons\FeBar.png" />
     <EmbeddedResource Include="Resources\icons\FeNode.png" />
     <EmbeddedResource Include="Resources\icons\FeShell.png" />
diff --git a/FemDesign.Grasshopper/Properties/Resources.resx b/FemDesign.Grasshopper/Properties/Resources.resx
index a8c39591..b43b6dbf 100644
--- a/FemDesign.Grasshopper/Properties/Resources.resx
+++ b/FemDesign.Grasshopper/Properties/Resources.resx
@@ -7320,64 +7320,64 @@
   <data name="Mass" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icons\Mass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ExcitationForce" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons\ExcitationForce.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ExcitationForceCombination" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons\ExcitationForceCombination.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ExcitationForceDiagram" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons\ExcitationForceDiagram.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="CombDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CombDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\CombDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CombDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CombDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\CombDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ExcitationForceSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ExcitationForceDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\ExcitationForceSettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FootfallDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\FootfallDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\FootfallDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FootfallDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\FootfallDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\FootfallDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FreqDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\FreqDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\FreqDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FreqDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\FreqDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\FreqDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="GroundAccelerationDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GroundAccelerationDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\GroundAccelerationDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="GroundAccelerationDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GroundAccelerationDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\GroundAccelerationDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ImperfectionDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ImperfectionDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\ImperfectionDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ImperfectionDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ImperfectionDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\ImperfectionDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PeriodicExcitationDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\PeriodicExcitationDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\PeriodicExcitationDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PeriodicExcitationDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\PeriodicExcitationDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\PeriodicExcitationDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="StabilityDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StabilityDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\StabilityDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="StabilityDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StabilityDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\StabilityDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="StageDefine2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StageDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\StageDefine2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="StageDefine3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StageDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ExcitationForce" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons\ExcitationForce.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ExcitationForceCombination" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons\ExcitationForceCombination.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ExcitationForceDiagram" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icons\ExcitationForceDiagram.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\icons\StageDefine3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FemDesign.Grasshopper/Resources/ExcitationForceDefine2.png b/FemDesign.Grasshopper/Resources/ExcitationForceDefine2.png
deleted file mode 100644
index 8c3540d6..00000000
Binary files a/FemDesign.Grasshopper/Resources/ExcitationForceDefine2.png and /dev/null differ
diff --git a/FemDesign.Grasshopper/Resources/CombDefine2.png b/FemDesign.Grasshopper/Resources/icons/CombDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/CombDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/CombDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/CombDefine3.png b/FemDesign.Grasshopper/Resources/icons/CombDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/CombDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/CombDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/ExcitationForceDefine3.png b/FemDesign.Grasshopper/Resources/icons/ExcitationForceSettings.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/ExcitationForceDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/ExcitationForceSettings.png
diff --git a/FemDesign.Grasshopper/Resources/Fd_TabIcon_24_24.png b/FemDesign.Grasshopper/Resources/icons/Fd_TabIcon_24_24.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/Fd_TabIcon_24_24.png
rename to FemDesign.Grasshopper/Resources/icons/Fd_TabIcon_24_24.png
diff --git a/FemDesign.Grasshopper/Resources/FootfallDefine2.png b/FemDesign.Grasshopper/Resources/icons/FootfallDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/FootfallDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/FootfallDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/FootfallDefine3.png b/FemDesign.Grasshopper/Resources/icons/FootfallDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/FootfallDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/FootfallDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/FreqDefine2.png b/FemDesign.Grasshopper/Resources/icons/FreqDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/FreqDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/FreqDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/FreqDefine3.png b/FemDesign.Grasshopper/Resources/icons/FreqDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/FreqDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/FreqDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/GroundAccelerationDefine2.png b/FemDesign.Grasshopper/Resources/icons/GroundAccelerationDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/GroundAccelerationDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/GroundAccelerationDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/GroundAccelerationDefine3.png b/FemDesign.Grasshopper/Resources/icons/GroundAccelerationDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/GroundAccelerationDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/GroundAccelerationDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/ImperfectionDefine2.png b/FemDesign.Grasshopper/Resources/icons/ImperfectionDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/ImperfectionDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/ImperfectionDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/ImperfectionDefine3.png b/FemDesign.Grasshopper/Resources/icons/ImperfectionDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/ImperfectionDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/ImperfectionDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/PeriodicExcitationDefine2.png b/FemDesign.Grasshopper/Resources/icons/PeriodicExcitationDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/PeriodicExcitationDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/PeriodicExcitationDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/PeriodicExcitationDefine3.png b/FemDesign.Grasshopper/Resources/icons/PeriodicExcitationDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/PeriodicExcitationDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/PeriodicExcitationDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/StabilityDefine2.png b/FemDesign.Grasshopper/Resources/icons/StabilityDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/StabilityDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/StabilityDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/StabilityDefine3.png b/FemDesign.Grasshopper/Resources/icons/StabilityDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/StabilityDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/StabilityDefine3.png
diff --git a/FemDesign.Grasshopper/Resources/StageDefine2.png b/FemDesign.Grasshopper/Resources/icons/StageDefine2.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/StageDefine2.png
rename to FemDesign.Grasshopper/Resources/icons/StageDefine2.png
diff --git a/FemDesign.Grasshopper/Resources/StageDefine3.png b/FemDesign.Grasshopper/Resources/icons/StageDefine3.png
similarity index 100%
rename from FemDesign.Grasshopper/Resources/StageDefine3.png
rename to FemDesign.Grasshopper/Resources/icons/StageDefine3.png