diff --git a/ETABS_Engine/Compute/UpgradeVersion.cs b/ETABS_Engine/Compute/UpgradeVersion.cs
index 2675838d..18a3929a 100644
--- a/ETABS_Engine/Compute/UpgradeVersion.cs
+++ b/ETABS_Engine/Compute/UpgradeVersion.cs
@@ -29,7 +29,7 @@
 using BH.oM.Geometry.SettingOut;
 using BH.oM.Reflection.Attributes;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Compute
     {
diff --git a/ETABS_Engine/Convert/ToBHoM.cs b/ETABS_Engine/Convert/ToBHoM.cs
index 359ad97a..63c623e4 100644
--- a/ETABS_Engine/Convert/ToBHoM.cs
+++ b/ETABS_Engine/Convert/ToBHoM.cs
@@ -29,7 +29,7 @@
 using BH.oM.Structure.Constraints;
 using BH.oM.Geometry;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Convert
     {
diff --git a/ETABS_Engine/Convert/ToCSI.cs b/ETABS_Engine/Convert/ToCSI.cs
index 0b39d6b7..72f89f31 100644
--- a/ETABS_Engine/Convert/ToCSI.cs
+++ b/ETABS_Engine/Convert/ToCSI.cs
@@ -26,7 +26,7 @@
 using BH.oM.Geometry;
 using System.Linq;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Convert
     {
diff --git a/ETABS_Engine/Create/Diaphragm.cs b/ETABS_Engine/Create/Diaphragm.cs
index 13d434ff..31731743 100644
--- a/ETABS_Engine/Create/Diaphragm.cs
+++ b/ETABS_Engine/Create/Diaphragm.cs
@@ -31,7 +31,7 @@
 using BH.Engine.Structure;
 using BH.Engine.Geometry;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Create
     {
diff --git a/ETABS_Engine/Create/MassSource.cs b/ETABS_Engine/Create/MassSource.cs
index 542db3e5..0583da2e 100644
--- a/ETABS_Engine/Create/MassSource.cs
+++ b/ETABS_Engine/Create/MassSource.cs
@@ -28,7 +28,7 @@
 using BH.oM.Structure.Loads;
 
 
-namespace BH.Engine.ETABS.Structure
+namespace BH.Engine.Adapters.ETABS.Structure
 {
     public static partial class Create
     {
diff --git a/ETABS_Engine/Create/Pier.cs b/ETABS_Engine/Create/Pier.cs
index 01af8fd5..c0a72a0a 100644
--- a/ETABS_Engine/Create/Pier.cs
+++ b/ETABS_Engine/Create/Pier.cs
@@ -32,7 +32,7 @@
 using BH.Engine.Structure;
 using BH.Engine.Geometry;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Create
     {
diff --git a/ETABS_Engine/Create/Spandrel.cs b/ETABS_Engine/Create/Spandrel.cs
index 3a8f5ff4..9676d711 100644
--- a/ETABS_Engine/Create/Spandrel.cs
+++ b/ETABS_Engine/Create/Spandrel.cs
@@ -32,7 +32,7 @@
 using BH.Engine.Structure;
 using BH.Engine.Geometry;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Create
     {
diff --git a/ETABS_Engine/ETABS_Engine.csproj b/ETABS_Engine/ETABS_Engine.csproj
index e4f02d40..e328ef3b 100644
--- a/ETABS_Engine/ETABS_Engine.csproj
+++ b/ETABS_Engine/ETABS_Engine.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{9552D636-D903-4492-944E-0CD392D7BFE3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BH.Engine.ETABS</RootNamespace>
+    <RootNamespace>BH.Engine.Adapters.ETABS</RootNamespace>
     <AssemblyName>Etabs_Engine</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -138,6 +138,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="Versioning_32.json" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ETABS_Engine/Modify/SetAutoLengthOffset.cs b/ETABS_Engine/Modify/SetAutoLengthOffset.cs
index 01e5d6a3..09f4f06e 100644
--- a/ETABS_Engine/Modify/SetAutoLengthOffset.cs
+++ b/ETABS_Engine/Modify/SetAutoLengthOffset.cs
@@ -29,7 +29,7 @@
 using BH.oM.Adapters.ETABS.Elements;
 using BH.Engine.Base;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Modify
     {
diff --git a/ETABS_Engine/Modify/SetDiaphragm.cs b/ETABS_Engine/Modify/SetDiaphragm.cs
index 48bf3810..70ea722f 100644
--- a/ETABS_Engine/Modify/SetDiaphragm.cs
+++ b/ETABS_Engine/Modify/SetDiaphragm.cs
@@ -29,7 +29,7 @@
 using BH.oM.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Modify
     {
diff --git a/ETABS_Engine/Modify/SetInsertionPoint.cs b/ETABS_Engine/Modify/SetInsertionPoint.cs
index abb6dd5b..d566bc3f 100644
--- a/ETABS_Engine/Modify/SetInsertionPoint.cs
+++ b/ETABS_Engine/Modify/SetInsertionPoint.cs
@@ -30,7 +30,7 @@
 using BH.oM.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Modify
     {
diff --git a/ETABS_Engine/Modify/SetPier.cs b/ETABS_Engine/Modify/SetPier.cs
index 12bec1da..b01bfc0c 100644
--- a/ETABS_Engine/Modify/SetPier.cs
+++ b/ETABS_Engine/Modify/SetPier.cs
@@ -30,7 +30,7 @@
 using BH.oM.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Modify
     {
diff --git a/ETABS_Engine/Modify/SetShellType.cs b/ETABS_Engine/Modify/SetShellType.cs
index fe6af343..99716a7b 100644
--- a/ETABS_Engine/Modify/SetShellType.cs
+++ b/ETABS_Engine/Modify/SetShellType.cs
@@ -23,7 +23,7 @@
 using BH.oM.Structure.SurfaceProperties;
 using BH.oM.Adapters.ETABS;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Modify
     {
diff --git a/ETABS_Engine/Modify/SetSpandrel.cs b/ETABS_Engine/Modify/SetSpandrel.cs
index b0f247e5..45d8e1d4 100644
--- a/ETABS_Engine/Modify/SetSpandrel.cs
+++ b/ETABS_Engine/Modify/SetSpandrel.cs
@@ -30,7 +30,7 @@
 using BH.oM.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Modify
     {
diff --git a/ETABS_Engine/Query/AutoLengthOffset.cs b/ETABS_Engine/Query/AutoLengthOffset.cs
index 8720d35f..aa44b012 100644
--- a/ETABS_Engine/Query/AutoLengthOffset.cs
+++ b/ETABS_Engine/Query/AutoLengthOffset.cs
@@ -29,7 +29,7 @@
 using BH.oM.Adapters.ETABS.Elements;
 using BH.Engine.Base;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Query/CheckFlipBar.cs b/ETABS_Engine/Query/CheckFlipBar.cs
index a3515ca4..90b33f93 100644
--- a/ETABS_Engine/Query/CheckFlipBar.cs
+++ b/ETABS_Engine/Query/CheckFlipBar.cs
@@ -30,7 +30,7 @@
 using BH.oM.Geometry;
 using System.ComponentModel;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Query/Diaphragm.cs b/ETABS_Engine/Query/Diaphragm.cs
index 5af3298d..3c26a785 100644
--- a/ETABS_Engine/Query/Diaphragm.cs
+++ b/ETABS_Engine/Query/Diaphragm.cs
@@ -28,7 +28,7 @@
 using BH.oM.Structure.Elements;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Query/InsertionPoint.cs b/ETABS_Engine/Query/InsertionPoint.cs
index 2963ce07..949c0d0f 100644
--- a/ETABS_Engine/Query/InsertionPoint.cs
+++ b/ETABS_Engine/Query/InsertionPoint.cs
@@ -30,7 +30,7 @@
 using BH.oM.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Query/ModifyStiffnessInsertionPoint.cs b/ETABS_Engine/Query/ModifyStiffnessInsertionPoint.cs
index 86935e2e..a6af1794 100644
--- a/ETABS_Engine/Query/ModifyStiffnessInsertionPoint.cs
+++ b/ETABS_Engine/Query/ModifyStiffnessInsertionPoint.cs
@@ -30,7 +30,7 @@
 using BH.oM.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Query/Pier.cs b/ETABS_Engine/Query/Pier.cs
index 7b3022af..addf9725 100644
--- a/ETABS_Engine/Query/Pier.cs
+++ b/ETABS_Engine/Query/Pier.cs
@@ -29,7 +29,7 @@
 using BH.oM.Structure.Elements;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Query/Spandrel.cs b/ETABS_Engine/Query/Spandrel.cs
index 2a80ca6a..24174fa4 100644
--- a/ETABS_Engine/Query/Spandrel.cs
+++ b/ETABS_Engine/Query/Spandrel.cs
@@ -29,7 +29,7 @@
 using BH.oM.Structure.Elements;
 using BH.oM.Adapters.ETABS.Elements;
 
-namespace BH.Engine.ETABS
+namespace BH.Engine.Adapters.ETABS
 {
     public static partial class Query
     {
diff --git a/ETABS_Engine/Versioning_32.json b/ETABS_Engine/Versioning_32.json
new file mode 100644
index 00000000..21f5c01c
--- /dev/null
+++ b/ETABS_Engine/Versioning_32.json
@@ -0,0 +1,18 @@
+{
+  "Namespace": {
+    "ToNew": {
+	"BH.Engine.ETABS" : "BH.Engine.Adapters.ETABS"
+    },
+    "ToOld": {
+	"BH.Engine.Adapters.ETABS" : "BH.Engine.ETABS"
+    }
+  },
+  "Type": {
+    "ToNew": {
+
+    },
+    "ToOld": {
+
+    }
+  }
+} 
\ No newline at end of file
diff --git a/Etabs_Adapter/CRUD/Create/Bar.cs b/Etabs_Adapter/CRUD/Create/Bar.cs
index 167ea0a5..131545a1 100644
--- a/Etabs_Adapter/CRUD/Create/Bar.cs
+++ b/Etabs_Adapter/CRUD/Create/Bar.cs
@@ -22,24 +22,17 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Geometry.SettingOut;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.Offsets;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Geometry.ShapeProfiles;
-using BH.oM.Geometry;
 using System.ComponentModel;
+using System;
+using BH.Engine.Structure;
+using BH.oM.Geometry;
+using BH.oM.Structure.Constraints;
 using BH.oM.Adapters.ETABS;
 using BH.Engine.Base;
-using System;
 #if Debug17 || Release17
     using ETABSv17;
 #elif Debug18 || Release18
diff --git a/Etabs_Adapter/CRUD/Create/Diaphragm.cs b/Etabs_Adapter/CRUD/Create/Diaphragm.cs
index d459b492..8f28db3b 100644
--- a/Etabs_Adapter/CRUD/Create/Diaphragm.cs
+++ b/Etabs_Adapter/CRUD/Create/Diaphragm.cs
@@ -22,19 +22,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.Offsets;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapters.ETABS;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Create/Error.cs b/Etabs_Adapter/CRUD/Create/Error.cs
index 3d125f16..8fa359cd 100644
--- a/Etabs_Adapter/CRUD/Create/Error.cs
+++ b/Etabs_Adapter/CRUD/Create/Error.cs
@@ -22,18 +22,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.Offsets;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Adapters.ETABS.Elements;
 #if Debug17 || Release17
 using ETABSv17;
 #elif Debug18 || Release18
diff --git a/Etabs_Adapter/CRUD/Create/Level.cs b/Etabs_Adapter/CRUD/Create/Level.cs
index 4916ae91..a54bdad9 100644
--- a/Etabs_Adapter/CRUD/Create/Level.cs
+++ b/Etabs_Adapter/CRUD/Create/Level.cs
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using BH.oM.Geometry.SettingOut;
-using BH.Engine.ETABS;
 #if Debug17 || Release17
 using ETABSv17;
 #elif Debug18 || Release18
diff --git a/Etabs_Adapter/CRUD/Create/Load.cs b/Etabs_Adapter/CRUD/Create/Load.cs
index f7f4cb05..9bde85f0 100644
--- a/Etabs_Adapter/CRUD/Create/Load.cs
+++ b/Etabs_Adapter/CRUD/Create/Load.cs
@@ -25,8 +25,8 @@
 using System;
 using BH.oM.Structure.Elements;
 using BH.oM.Structure.Loads;
-using BH.Engine.ETABS;
 using BH.Engine.Spatial;
+using BH.Engine.Adapters.ETABS;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Create/Loadcase.cs b/Etabs_Adapter/CRUD/Create/Loadcase.cs
index 96a1ee3d..3cf47688 100644
--- a/Etabs_Adapter/CRUD/Create/Loadcase.cs
+++ b/Etabs_Adapter/CRUD/Create/Loadcase.cs
@@ -23,9 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System;
-using BH.oM.Structure.Elements;
 using BH.oM.Structure.Loads;
-using BH.Engine.ETABS;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Create/Material.cs b/Etabs_Adapter/CRUD/Create/Material.cs
index 7d1fbffc..cf1dd348 100644
--- a/Etabs_Adapter/CRUD/Create/Material.cs
+++ b/Etabs_Adapter/CRUD/Create/Material.cs
@@ -24,7 +24,7 @@
 using System.Linq;
 using BH.Engine.Structure;
 using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using System.ComponentModel;
 
 #if Debug17 || Release17
diff --git a/Etabs_Adapter/CRUD/Create/Node.cs b/Etabs_Adapter/CRUD/Create/Node.cs
index 429ca083..0fe352bb 100644
--- a/Etabs_Adapter/CRUD/Create/Node.cs
+++ b/Etabs_Adapter/CRUD/Create/Node.cs
@@ -22,18 +22,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Geometry.SettingOut;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.Offsets;
 using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Adapters.ETABS.Elements;
+using BH.Engine.Adapters.ETABS;
 
 
 namespace BH.Adapter.ETABS
diff --git a/Etabs_Adapter/CRUD/Create/Panel.cs b/Etabs_Adapter/CRUD/Create/Panel.cs
index 3f533cb5..8a401552 100644
--- a/Etabs_Adapter/CRUD/Create/Panel.cs
+++ b/Etabs_Adapter/CRUD/Create/Panel.cs
@@ -22,19 +22,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Geometry.SettingOut;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.Offsets;
 using BH.Engine.Structure;
 using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapters.ETABS;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Create/_Create.cs b/Etabs_Adapter/CRUD/Create/_Create.cs
index d9561095..3868c7af 100644
--- a/Etabs_Adapter/CRUD/Create/_Create.cs
+++ b/Etabs_Adapter/CRUD/Create/_Create.cs
@@ -22,18 +22,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Architecture.Elements;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.Offsets;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 using BH.oM.Adapter;
 
diff --git a/Etabs_Adapter/CRUD/Read/Bar.cs b/Etabs_Adapter/CRUD/Read/Bar.cs
index 97653a3a..6be375a2 100644
--- a/Etabs_Adapter/CRUD/Read/Bar.cs
+++ b/Etabs_Adapter/CRUD/Read/Bar.cs
@@ -29,10 +29,8 @@
 using BH.oM.Structure.Elements;
 using BH.oM.Structure.SectionProperties;
 using BH.oM.Structure.Constraints;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Geometry;
-using BH.oM.Geometry.ShapeProfiles;
 using BH.oM.Adapters.ETABS.Fragments;
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Read/Load.cs b/Etabs_Adapter/CRUD/Read/Load.cs
index e884d780..6f611f46 100644
--- a/Etabs_Adapter/CRUD/Read/Load.cs
+++ b/Etabs_Adapter/CRUD/Read/Load.cs
@@ -29,7 +29,6 @@
 using BH.oM.Base;
 using BH.oM.Structure.Elements;
 using BH.oM.Structure.Loads;
-using BH.Engine.ETABS;
 using BH.oM.Geometry;
 using BH.Engine.Structure;
 #if Debug17 || Release17
diff --git a/Etabs_Adapter/CRUD/Read/Loadcase.cs b/Etabs_Adapter/CRUD/Read/Loadcase.cs
index 66d6f632..c9eeba16 100644
--- a/Etabs_Adapter/CRUD/Read/Loadcase.cs
+++ b/Etabs_Adapter/CRUD/Read/Loadcase.cs
@@ -26,11 +26,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BH.oM.Base;
-using BH.oM.Structure.Elements;
 using BH.oM.Structure.Loads;
-using BH.Engine.ETABS;
-using BH.oM.Geometry;
 #if Debug17 || Release17
 using ETABSv17;
 #elif Debug18 || Release18
diff --git a/Etabs_Adapter/CRUD/Read/Material.cs b/Etabs_Adapter/CRUD/Read/Material.cs
index 2e7f10a1..7dd965c7 100644
--- a/Etabs_Adapter/CRUD/Read/Material.cs
+++ b/Etabs_Adapter/CRUD/Read/Material.cs
@@ -26,12 +26,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BH.oM.Base;
-using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.MaterialFragments;
 #if Debug17 || Release17
 using ETABSv17;
@@ -40,12 +34,7 @@
 #else
 using ETABS2016;
 #endif
-using BH.Engine.ETABS;
-using BH.oM.Geometry;
-using BH.Engine.Geometry;
-using BH.Engine.Reflection;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Adapters.ETABS.Elements;
+using BH.Engine.Adapters.ETABS;
 
 namespace BH.Adapter.ETABS
 {
diff --git a/Etabs_Adapter/CRUD/Read/Mesh.cs b/Etabs_Adapter/CRUD/Read/Mesh.cs
index c63faff6..d0740cd8 100644
--- a/Etabs_Adapter/CRUD/Read/Mesh.cs
+++ b/Etabs_Adapter/CRUD/Read/Mesh.cs
@@ -26,13 +26,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BH.oM.Base;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
 using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.MaterialFragments;
 #if Debug17 || Release17
 using ETABSv17;
 #elif Debug18 || Release18
@@ -40,12 +35,7 @@
 #else
 using ETABS2016;
 #endif
-using BH.Engine.ETABS;
 using BH.oM.Geometry;
-using BH.Engine.Geometry;
-using BH.Engine.Reflection;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Adapters.ETABS.Elements;
 
 namespace BH.Adapter.ETABS
 {
diff --git a/Etabs_Adapter/CRUD/Read/Node.cs b/Etabs_Adapter/CRUD/Read/Node.cs
index a62a05b3..f30e1056 100644
--- a/Etabs_Adapter/CRUD/Read/Node.cs
+++ b/Etabs_Adapter/CRUD/Read/Node.cs
@@ -28,11 +28,7 @@
 using System.Threading.Tasks;
 using BH.oM.Base;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.SurfaceProperties;
 using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.MaterialFragments;
 #if Debug17 || Release17
 using ETABSv17;
 #elif Debug18 || Release18
@@ -40,12 +36,6 @@
 #else
 using ETABS2016;
 #endif
-using BH.Engine.ETABS;
-using BH.oM.Geometry;
-using BH.Engine.Geometry;
-using BH.Engine.Reflection;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Adapters.ETABS.Elements;
 using BH.oM.Adapters.ETABS.Fragments;
 
 namespace BH.Adapter.ETABS
diff --git a/Etabs_Adapter/CRUD/Read/Panel.cs b/Etabs_Adapter/CRUD/Read/Panel.cs
index a8ae4b3c..3c51a843 100644
--- a/Etabs_Adapter/CRUD/Read/Panel.cs
+++ b/Etabs_Adapter/CRUD/Read/Panel.cs
@@ -26,21 +26,13 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BH.oM.Base;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
 using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Geometry;
 using BH.Engine.Geometry;
-using BH.Engine.Reflection;
-using BH.oM.Geometry.SettingOut;
 using BH.oM.Adapters.ETABS.Elements;
 using BH.oM.Adapters.ETABS.Fragments;
-using BH.oM.Structure.Fragments;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Read/Results/BarResults.cs b/Etabs_Adapter/CRUD/Read/Results/BarResults.cs
index e455c9ff..6d5e1eee 100644
--- a/Etabs_Adapter/CRUD/Read/Results/BarResults.cs
+++ b/Etabs_Adapter/CRUD/Read/Results/BarResults.cs
@@ -35,10 +35,6 @@
 #else
 using ETABS2016;
 #endif
-using BH.oM.Structure.Elements;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.Engine.ETABS;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.Requests;
 using BH.oM.Geometry;
 using BH.Engine.Geometry;
diff --git a/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs b/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs
index b90992a2..55faa829 100644
--- a/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs
+++ b/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs
@@ -35,13 +35,7 @@
 #else
 using ETABS2016;
 #endif
-using BH.oM.Structure.Elements;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.Engine.ETABS;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.Requests;
-using BH.oM.Geometry;
-using BH.Engine.Geometry;
 using BH.oM.Adapter;
 
 namespace BH.Adapter.ETABS
diff --git a/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs b/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs
index d40744f3..6d7755a0 100644
--- a/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs
+++ b/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs
@@ -35,10 +35,6 @@
 #else
 using ETABS2016;
 #endif
-using BH.oM.Structure.Elements;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.Engine.ETABS;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.Requests;
 using BH.oM.Geometry;
 using BH.Engine.Geometry;
diff --git a/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs b/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs
index 66d3b560..a995d355 100644
--- a/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs
+++ b/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs
@@ -35,13 +35,7 @@
 #else
 using ETABS2016;
 #endif
-using BH.oM.Structure.Elements;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.Engine.ETABS;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.Requests;
-using BH.oM.Geometry;
-using BH.Engine.Geometry;
 using BH.oM.Adapter;
 
 namespace BH.Adapter.ETABS
diff --git a/Etabs_Adapter/CRUD/Read/Results/Result.cs b/Etabs_Adapter/CRUD/Read/Results/Result.cs
index f7620ce1..070793e5 100644
--- a/Etabs_Adapter/CRUD/Read/Results/Result.cs
+++ b/Etabs_Adapter/CRUD/Read/Results/Result.cs
@@ -35,9 +35,7 @@
 #else
 using ETABS2016;
 #endif
-using BH.oM.Structure.Elements;
 using BH.oM.Adapters.ETABS.Elements;
-using BH.Engine.ETABS;
 using BH.oM.Structure.Loads;
 using BH.oM.Data.Requests;
 using BH.oM.Adapter;
diff --git a/Etabs_Adapter/CRUD/Read/SectionProperty.cs b/Etabs_Adapter/CRUD/Read/SectionProperty.cs
index a348a2f6..2c378825 100644
--- a/Etabs_Adapter/CRUD/Read/SectionProperty.cs
+++ b/Etabs_Adapter/CRUD/Read/SectionProperty.cs
@@ -26,15 +26,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BH.oM.Structure.Elements;
 using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
 using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
 using BH.oM.Geometry;
 using BH.oM.Geometry.ShapeProfiles;
-using BH.oM.Adapters.ETABS.Fragments;
-using BH.oM.Adapters.ETABS;
 using BH.Engine.Structure;
 using BH.oM.Structure.Fragments;
 #if Debug17 || Release17
diff --git a/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs b/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs
index 6ec26fa0..4ed928de 100644
--- a/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs
+++ b/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs
@@ -26,20 +26,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BH.oM.Base;
-using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
 using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
 using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Geometry;
-using BH.Engine.Geometry;
-using BH.Engine.Reflection;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapters.ETABS.Fragments;
 using BH.oM.Structure.Fragments;
 
 #if Debug17 || Release17
diff --git a/Etabs_Adapter/CRUD/Read/_Read.cs b/Etabs_Adapter/CRUD/Read/_Read.cs
index ed224dc6..1b9f6870 100644
--- a/Etabs_Adapter/CRUD/Read/_Read.cs
+++ b/Etabs_Adapter/CRUD/Read/_Read.cs
@@ -40,13 +40,6 @@
 #else
 using ETABS2016;
 #endif
-using BH.Engine.ETABS;
-using BH.oM.Geometry;
-using BH.Engine.Geometry;
-using BH.Engine.Reflection;
-using BH.oM.Geometry.SettingOut;
-using BH.oM.Architecture.Elements;
-using BH.oM.Adapters.ETABS.Elements;
 using BH.oM.Adapter;
 using System.ComponentModel;
 
diff --git a/Etabs_Adapter/CRUD/Update/Bar.cs b/Etabs_Adapter/CRUD/Update/Bar.cs
index 93971886..ca4df4c0 100644
--- a/Etabs_Adapter/CRUD/Update/Bar.cs
+++ b/Etabs_Adapter/CRUD/Update/Bar.cs
@@ -23,18 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapter;
-using BH.oM.Geometry;
-using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.Offsets;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Update/Material.cs b/Etabs_Adapter/CRUD/Update/Material.cs
index 7a5ea7b2..c87aacf8 100644
--- a/Etabs_Adapter/CRUD/Update/Material.cs
+++ b/Etabs_Adapter/CRUD/Update/Material.cs
@@ -22,17 +22,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
 using BH.Engine.Structure;
-using BH.Engine.Geometry;
 using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapter;
-using BH.oM.Geometry;
 
 #if Debug17 || Release17
 using ETABSv17;
diff --git a/Etabs_Adapter/CRUD/Update/Node.cs b/Etabs_Adapter/CRUD/Update/Node.cs
index 86615148..3763eb6a 100644
--- a/Etabs_Adapter/CRUD/Update/Node.cs
+++ b/Etabs_Adapter/CRUD/Update/Node.cs
@@ -23,15 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
 using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapter;
 
 namespace BH.Adapter.ETABS
 {
diff --git a/Etabs_Adapter/CRUD/Update/Panel.cs b/Etabs_Adapter/CRUD/Update/Panel.cs
index 8721b5cc..a3972455 100644
--- a/Etabs_Adapter/CRUD/Update/Panel.cs
+++ b/Etabs_Adapter/CRUD/Update/Panel.cs
@@ -23,16 +23,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapter;
-using BH.oM.Geometry;
 
 namespace BH.Adapter.ETABS
 {
diff --git a/Etabs_Adapter/CRUD/Update/SectionProperty.cs b/Etabs_Adapter/CRUD/Update/SectionProperty.cs
index 0485894a..f66e2d09 100644
--- a/Etabs_Adapter/CRUD/Update/SectionProperty.cs
+++ b/Etabs_Adapter/CRUD/Update/SectionProperty.cs
@@ -24,7 +24,6 @@
 using System.Linq;
 using BH.oM.Structure.SectionProperties;
 using BH.Engine.Structure;
-using BH.Engine.Geometry;
 using BH.oM.Structure.Fragments;
 using BH.Engine.Base;
 
diff --git a/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs b/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs
index 4f999672..7c8efdc1 100644
--- a/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs
+++ b/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs
@@ -22,17 +22,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using BH.oM.Structure.Elements;
-using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
 using BH.Engine.Structure;
-using BH.Engine.Geometry;
-using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
-using BH.oM.Adapters.ETABS.Elements;
-using BH.oM.Adapter;
-using BH.oM.Geometry;
 using BH.oM.Structure.SurfaceProperties;
 
 #if Debug17 || Release17
diff --git a/Etabs_Adapter/CRUD/Update/_Update.cs b/Etabs_Adapter/CRUD/Update/_Update.cs
index 242a5336..eb5d6aa5 100644
--- a/Etabs_Adapter/CRUD/Update/_Update.cs
+++ b/Etabs_Adapter/CRUD/Update/_Update.cs
@@ -24,12 +24,8 @@
 using System.Linq;
 using BH.oM.Structure.Elements;
 using BH.oM.Structure.SectionProperties;
-using BH.oM.Structure.Constraints;
-using BH.oM.Structure.Loads;
-using BH.Engine.Structure;
-using BH.Engine.Geometry;
 using BH.oM.Structure.MaterialFragments;
-using BH.Engine.ETABS;
+using BH.Engine.Adapters.ETABS;
 using BH.oM.Adapters.ETABS.Elements;
 using BH.oM.Adapter;
 using BH.oM.Structure.SurfaceProperties;
diff --git a/Etabs_Adapter/ETABSAdapter.cs b/Etabs_Adapter/ETABSAdapter.cs
index 26cf7024..64742140 100644
--- a/Etabs_Adapter/ETABSAdapter.cs
+++ b/Etabs_Adapter/ETABSAdapter.cs
@@ -27,7 +27,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using BH.oM.Base;
-using BH.oM.Structure.Elements;
 using BH.oM.Adapters.ETABS;
 #if Debug17 || Release17
 using ETABSv17;