diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
new file mode 100644
index 000000000..0573a5024
--- /dev/null
+++ b/SRC/CMakeLists.txt
@@ -0,0 +1,22 @@
+
+add_subdirectory(domain)
+add_subdirectory(damage)
+add_subdirectory(actor)
+add_subdirectory(analysis)
+add_subdirectory(convergenceTest)
+add_subdirectory(coordTransformation)
+add_subdirectory(graph)
+add_subdirectory(handler)
+add_subdirectory(element)
+add_subdirectory(material)
+add_subdirectory(matrix)
+add_subdirectory(recorder)
+add_subdirectory(tagged)
+add_subdirectory(utility)
+
+
+#
+#add_subdirectory(utility)
+
+
+
diff --git a/SRC/actor/CMakeLists.txt b/SRC/actor/CMakeLists.txt
new file mode 100644
index 000000000..6ee55aa5b
--- /dev/null
+++ b/SRC/actor/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library(actor "")
+
+add_subdirectory(address)
+add_subdirectory(channel)
+add_subdirectory(machineBroker)
+add_subdirectory(message)
+add_subdirectory(objectBroker)
+add_subdirectory(shadow)
+add_subdirectory(actor)
+
+
+
+
diff --git a/SRC/actor/actor/CMakeLists.txt b/SRC/actor/actor/CMakeLists.txt
new file mode 100644
index 000000000..8ec7af2b0
--- /dev/null
+++ b/SRC/actor/actor/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(actor
+    PRIVATE
+      Actor.cpp
+      MovableObject.cpp
+    PUBLIC
+      Actor.h
+      MovableObject.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/actor/address/CMakeLists.txt b/SRC/actor/address/CMakeLists.txt
new file mode 100644
index 000000000..1d2681cec
--- /dev/null
+++ b/SRC/actor/address/CMakeLists.txt
@@ -0,0 +1,27 @@
+target_sources(actor
+    PRIVATE
+      ChannelAddress.cpp
+    PUBLIC
+      ChannelAddress.h
+)
+
+
+if(PARALLEL_INTERPRETERS)
+target_sources(actor
+    PRIVATE
+      MPI_Address.cpp
+    PUBLIC
+      MPI_Address.h
+)
+elseif(PARALLEL)
+target_sources(actor
+    PRIVATE
+      MPI_Address.cpp
+    PUBLIC
+      MPI_Address.h
+)
+endif()
+
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
diff --git a/SRC/actor/channel/CMakeLists.txt b/SRC/actor/channel/CMakeLists.txt
new file mode 100644
index 000000000..2a92477d3
--- /dev/null
+++ b/SRC/actor/channel/CMakeLists.txt
@@ -0,0 +1,33 @@
+target_sources(actor
+    PRIVATE
+      Channel.cpp
+      HTTP.cpp
+      Socket.cpp
+      TCP_Socket.cpp
+      UDP_Socket.cpp      
+    PUBLIC
+      Channel.h
+      Socket.h
+      TCP_Socket.h
+      UDP_Socket.h      
+)
+
+
+if(PARALLEL_INTERPRETERS)
+target_sources(actor
+    PRIVATE
+      MPI_Channel.cpp
+    PUBLIC
+      MPI_Channel.h
+)
+elseif(PARALLEL)
+target_sources(actor
+    PRIVATE
+      MPI_Channel.cpp
+    PUBLIC
+      MPI_Channel.h
+)
+endif()
+
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/actor/machineBroker/CMakeLists.txt b/SRC/actor/machineBroker/CMakeLists.txt
new file mode 100644
index 000000000..a764e2dec
--- /dev/null
+++ b/SRC/actor/machineBroker/CMakeLists.txt
@@ -0,0 +1,26 @@
+target_sources(actor
+    PRIVATE
+      MachineBroker.cpp
+    PUBLIC
+      MachineBroker.h
+)
+
+
+if(PARALLEL_INTERPRETERS)
+  target_sources(actor
+    PRIVATE
+      MPI_Machine.cpp
+    PUBLIC
+      MPI_MachineBroker.h
+)
+elseif(PARALLEL)
+   target_sources(actor
+     PRIVATE
+       MPI_Machine.cpp
+     PUBLIC
+       MPI_MachineBroker.h
+)
+endif()
+
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/actor/message/CMakeLists.txt b/SRC/actor/message/CMakeLists.txt
new file mode 100644
index 000000000..f74776755
--- /dev/null
+++ b/SRC/actor/message/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(actor
+    PRIVATE
+      Message.cpp      
+    PUBLIC
+      Message.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/actor/objectBroker/CMakeLists.txt b/SRC/actor/objectBroker/CMakeLists.txt
new file mode 100644
index 000000000..bc752e24a
--- /dev/null
+++ b/SRC/actor/objectBroker/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(actor
+    PRIVATE
+      FEM_ObjectBroker.cpp
+      FEM_ObjectBrokerAllClasses.cpp
+    PUBLIC
+      FEM_ObjectBroker.h
+      FEM_ObjectBrokerAllClasses.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
index de4b7ef96..a048df2bf 100644
--- a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
+++ b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
@@ -191,9 +191,7 @@
 #include "UWmaterials/PM4Sand.h"
 #include "UWmaterials/PM4Silt.h"
 #include "UWmaterials/InitialStateAnalysisWrapper.h"
-#if !_DLL
 #include "stressDensityModel/stressDensity.h"
-#endif
 #include "InitStressNDMaterial.h"
 
 // Fibers
@@ -343,7 +341,7 @@
 #include "EnvelopeNodeRecorder.h"
 #include "EnvelopeElementRecorder.h"
 #include "DriftRecorder.h"
-#include "MPCORecorder.h"
+//#include "MPCORecorder.h"
 #include "VTK_Recorder.h"
 #include "GmshRecorder.h"
 
@@ -1512,10 +1510,9 @@ FEM_ObjectBrokerAllClasses::getNewNDMaterial(int classTag)
   case ND_TAG_InitialStateAnalysisWrapper:
       return new InitialStateAnalysisWrapper(); 
 
-#if !_DLL
   case ND_TAG_stressDensity:
       return new stressDensity();
-#endif
+
   case ND_TAG_CycLiqCP3D:
       return new CycLiqCP3D(); 
 
@@ -1849,8 +1846,8 @@ FEM_ObjectBrokerAllClasses::getPtrNewRecorder(int classTag)
         case RECORDER_TAGS_GmshRecorder:
            return new GmshRecorder();
 
-        case RECORDER_TAGS_MPCORecorder:
-          return new MPCORecorder();
+	   //        case RECORDER_TAGS_MPCORecorder:
+	   //          return new MPCORecorder();
 	     
 	default:
 	     opserr << "FEM_ObjectBrokerAllClasses::getNewRecordr - ";
diff --git a/SRC/actor/shadow/CMakeLists.txt b/SRC/actor/shadow/CMakeLists.txt
new file mode 100644
index 000000000..1b0de1631
--- /dev/null
+++ b/SRC/actor/shadow/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(actor
+    PRIVATE
+      Shadow.cpp      
+    PUBLIC
+      Shadow.h
+)
+
+target_include_directories(actor PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/CMakeLists.txt b/SRC/analysis/CMakeLists.txt
new file mode 100644
index 000000000..4b186c0ba
--- /dev/null
+++ b/SRC/analysis/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(analysis "")
+
+add_subdirectory(algorithm)
+add_subdirectory(numberer)
+add_subdirectory(dof_grp)
+add_subdirectory(fe_ele)
+add_subdirectory(handler)
+add_subdirectory(model)
+add_subdirectory(integrator)
+add_subdirectory(analysis)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/analysis/algorithm/CMakeLists.txt b/SRC/analysis/algorithm/CMakeLists.txt
new file mode 100644
index 000000000..0f1956838
--- /dev/null
+++ b/SRC/analysis/algorithm/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+target_sources(analysis
+    PRIVATE
+      SolutionAlgorithm.cpp
+    PUBLIC
+      SolutionAlgorithm.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(domainDecompAlgo)
+add_subdirectory(equiSolnAlgo)
+add_subdirectory(eigenAlgo)
diff --git a/SRC/analysis/algorithm/domainDecompAlgo/CMakeLists.txt b/SRC/analysis/algorithm/domainDecompAlgo/CMakeLists.txt
new file mode 100644
index 000000000..709c87b30
--- /dev/null
+++ b/SRC/analysis/algorithm/domainDecompAlgo/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(analysis
+    PRIVATE
+      DomainDecompAlgo.cpp
+    PUBLIC
+      DomainDecompAlgo.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/algorithm/eigenAlgo/CMakeLists.txt b/SRC/analysis/algorithm/eigenAlgo/CMakeLists.txt
new file mode 100644
index 000000000..be9177a22
--- /dev/null
+++ b/SRC/analysis/algorithm/eigenAlgo/CMakeLists.txt
@@ -0,0 +1,9 @@
+#target_sources(analysis
+#    PRIVATE
+#
+#    PUBLIC
+#
+#)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
diff --git a/SRC/analysis/algorithm/equiSolnAlgo/CMakeLists.txt b/SRC/analysis/algorithm/equiSolnAlgo/CMakeLists.txt
new file mode 100644
index 000000000..10887aa38
--- /dev/null
+++ b/SRC/analysis/algorithm/equiSolnAlgo/CMakeLists.txt
@@ -0,0 +1,40 @@
+target_sources(analysis
+    PRIVATE
+      EquiSolnAlgo.cpp 
+      Linear.cpp 
+      NewtonRaphson.cpp
+      ModifiedNewton.cpp 
+      NewtonLineSearch.cpp 
+      Broyden.cpp 
+      BFGS.cpp
+      KrylovNewton.cpp 
+      PeriodicNewton.cpp 
+      AcceleratedNewton.cpp
+      LineSearch.cpp 
+      InitialInterpolatedLineSearch.cpp 
+      NewtonHallM.cpp
+      SecantLineSearch.cpp 
+      RegulaFalsiLineSearch.cpp 
+      BisectionLineSearch.cpp
+    PUBLIC
+      EquiSolnAlgo.h 
+      Linear.h 
+      NewtonRaphson.h
+      ModifiedNewton.h 
+      NewtonLineSearch.h 
+      Broyden.h 
+      BFGS.h
+      KrylovNewton.h 
+      PeriodicNewton.h 
+      AcceleratedNewton.h
+      LineSearch.h 
+      InitialInterpolatedLineSearch.h 
+      NewtonHallM.h
+      SecantLineSearch.h 
+      RegulaFalsiLineSearch.h 
+      BisectionLineSearch.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(accelerator)
diff --git a/SRC/analysis/algorithm/equiSolnAlgo/accelerator/CMakeLists.txt b/SRC/analysis/algorithm/equiSolnAlgo/accelerator/CMakeLists.txt
new file mode 100644
index 000000000..5be98e43b
--- /dev/null
+++ b/SRC/analysis/algorithm/equiSolnAlgo/accelerator/CMakeLists.txt
@@ -0,0 +1,29 @@
+target_sources(analysis
+    PRIVATE
+      Accelerator.cpp
+      MillerAccelerator.cpp 
+      naccel.f
+      RaphsonAccelerator.cpp 
+      PeriodicAccelerator.cpp 
+      KrylovAccelerator.cpp 
+      KrylovAccelerator2.cpp 
+      DifferenceAccelerator.cpp 
+      DifferenceAccelerator2.cpp
+      SecantAccelerator1.cpp 
+      SecantAccelerator2.cpp 
+      SecantAccelerator3.cpp
+    PUBLIC
+      Accelerator.h
+      MillerAccelerator.h 
+      RaphsonAccelerator.h 
+      PeriodicAccelerator.h 
+      KrylovAccelerator.h 
+      KrylovAccelerator2.h 
+      DifferenceAccelerator.h 
+      DifferenceAccelerator2.h
+      SecantAccelerator1.h 
+      SecantAccelerator2.h 
+      SecantAccelerator3.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/analysis/CMakeLists.txt b/SRC/analysis/analysis/CMakeLists.txt
new file mode 100644
index 000000000..60f9fcd2f
--- /dev/null
+++ b/SRC/analysis/analysis/CMakeLists.txt
@@ -0,0 +1,33 @@
+
+target_sources(analysis
+    PRIVATE
+      DomainUser.cpp 
+      Analysis.cpp 
+      StaticAnalysis.cpp 
+      TransientAnalysis.cpp
+      DirectIntegrationAnalysis.cpp 
+      DomainDecompositionAnalysis.cpp
+      SubstructuringAnalysis.cpp	
+      EigenAnalysis.cpp
+      VariableTimeStepDirectIntegrationAnalysis.cpp
+      StaticDomainDecompositionAnalysis.cpp 
+      TransientDomainDecompositionAnalysis.cpp 
+      PFEMAnalysis.cpp 
+    PUBLIC
+      DomainUser.h 
+      Analysis.h 
+      StaticAnalysis.h 
+      TransientAnalysis.h
+      DirectIntegrationAnalysis.h 
+      DomainDecompositionAnalysis.h
+      SubstructuringAnalysis.h	
+      EigenAnalysis.h
+      VariableTimeStepDirectIntegrationAnalysis.h
+      StaticDomainDecompositionAnalysis.h 
+      TransientDomainDecompositionAnalysis.h 
+      PFEMAnalysis.h 
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+#add_subdirectory(analysis)
diff --git a/SRC/analysis/dof_grp/CMakeLists.txt b/SRC/analysis/dof_grp/CMakeLists.txt
new file mode 100644
index 000000000..1a224815c
--- /dev/null
+++ b/SRC/analysis/dof_grp/CMakeLists.txt
@@ -0,0 +1,12 @@
+target_sources(analysis
+    PRIVATE
+      DOF_Group.cpp
+      LagrangeDOF_Group.cpp
+      TransformationDOF_Group.cpp
+    PUBLIC
+      DOF_Group.h
+      LagrangeDOF_Group.h
+      TransformationDOF_Group.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/fe_ele/CMakeLists.txt b/SRC/analysis/fe_ele/CMakeLists.txt
new file mode 100644
index 000000000..ada917713
--- /dev/null
+++ b/SRC/analysis/fe_ele/CMakeLists.txt
@@ -0,0 +1,12 @@
+target_sources(analysis
+    PRIVATE
+      FE_Element.cpp
+    PUBLIC
+      FE_Element.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(penalty)
+add_subdirectory(lagrange)
+add_subdirectory(transformation)
diff --git a/SRC/analysis/fe_ele/lagrange/CMakeLists.txt b/SRC/analysis/fe_ele/lagrange/CMakeLists.txt
new file mode 100644
index 000000000..3997c1749
--- /dev/null
+++ b/SRC/analysis/fe_ele/lagrange/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(analysis
+    PRIVATE
+      LagrangeSP_FE.cpp
+      LagrangeMP_FE.cpp
+    PUBLIC
+      LagrangeSP_FE.h
+      LagrangeMP_FE.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/fe_ele/penalty/CMakeLists.txt b/SRC/analysis/fe_ele/penalty/CMakeLists.txt
new file mode 100644
index 000000000..569e25b86
--- /dev/null
+++ b/SRC/analysis/fe_ele/penalty/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(analysis
+    PRIVATE
+      PenaltySP_FE.cpp
+      PenaltyMP_FE.cpp
+    PUBLIC
+      PenaltySP_FE.h
+      PenaltyMP_FE.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/fe_ele/transformation/CMakeLists.txt b/SRC/analysis/fe_ele/transformation/CMakeLists.txt
new file mode 100644
index 000000000..de49fad65
--- /dev/null
+++ b/SRC/analysis/fe_ele/transformation/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(analysis
+    PRIVATE
+      TransformationFE.cpp
+    PUBLIC
+      TransformationFE.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/handler/CMakeLists.txt b/SRC/analysis/handler/CMakeLists.txt
new file mode 100644
index 000000000..471637e4b
--- /dev/null
+++ b/SRC/analysis/handler/CMakeLists.txt
@@ -0,0 +1,16 @@
+target_sources(analysis
+    PRIVATE
+      ConstraintHandler.cpp 
+      PlainHandler.cpp
+      PenaltyConstraintHandler.cpp 
+      LagrangeConstraintHandler.cpp
+      TransformationConstraintHandler.cpp 
+    PUBLIC
+      ConstraintHandler.h 
+      PlainHandler.h
+      PenaltyConstraintHandler.h 
+      LagrangeConstraintHandler.h
+      TransformationConstraintHandler.h 
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/integrator/CMakeLists.txt b/SRC/analysis/integrator/CMakeLists.txt
new file mode 100644
index 000000000..288fcae5f
--- /dev/null
+++ b/SRC/analysis/integrator/CMakeLists.txt
@@ -0,0 +1,120 @@
+target_sources(analysis
+    PRIVATE
+       AlphaOS.cpp
+       AlphaOS_TP.cpp
+       EQPath.cpp
+       AlphaOSGeneralized.cpp
+       ExplicitDifference.cpp
+       AlphaOSGeneralized_TP.cpp
+       ArcLength.cpp
+       ArcLength1.cpp
+       BackwardEuler.cpp
+       CentralDifference.cpp
+       CentralDifferenceAlternative.cpp
+       CentralDifferenceNoDamping.cpp
+       Collocation.cpp
+       CollocationHSFixedNumIter.cpp
+       CollocationHSIncrLimit.cpp
+       CollocationHSIncrReduct.cpp
+       DisplacementControl.cpp
+       DistributedDisplacementControl.cpp
+       EigenIntegrator.cpp
+       GeneralizedAlpha.cpp
+       HHT.cpp
+       HHT_TP.cpp
+       HHTExplicit.cpp
+       HHTExplicit_TP.cpp
+       HHTGeneralized.cpp
+       HHTGeneralized_TP.cpp
+       HHTGeneralizedExplicit.cpp
+       HHTGeneralizedExplicit_TP.cpp
+       HHTHSFixedNumIter.cpp
+       HHTHSFixedNumIter_TP.cpp
+       HHTHSIncrLimit.cpp
+       HHTHSIncrLimit_TP.cpp
+       HHTHSIncrReduct.cpp
+       HHTHSIncrReduct_TP.cpp
+       Houbolt.cpp
+       HSConstraint.cpp
+       IncrementalIntegrator.cpp
+       Integrator.cpp
+       KRAlphaExplicit.cpp
+       KRAlphaExplicit_TP.cpp
+       LoadControl.cpp
+       LoadPath.cpp
+       MinUnbalDispNorm.cpp
+       Newmark.cpp
+       Newmark1.cpp
+       NewmarkExplicit.cpp
+       NewmarkHSFixedNumIter.cpp
+       NewmarkHSIncrLimit.cpp
+       NewmarkHSIncrReduct.cpp
+       ParkLMS3.cpp
+       PFEMIntegrator.cpp
+       StaticIntegrator.cpp
+       TransientIntegrator.cpp
+       TRBDF2.cpp
+       TRBDF3.cpp
+       WilsonTheta.cpp
+       GimmeMCK.cpp
+    PUBLIC
+       AlphaOS.h
+       AlphaOS_TP.h
+       EQPath.h
+       AlphaOSGeneralized.h
+       ExplicitDifference.h
+       AlphaOSGeneralized_TP.h
+       ArcLength.h
+       ArcLength1.h
+       BackwardEuler.h
+       CentralDifference.h
+       CentralDifferenceAlternative.h
+       CentralDifferenceNoDamping.h
+       Collocation.h
+       CollocationHSFixedNumIter.h
+       CollocationHSIncrLimit.h
+       CollocationHSIncrReduct.h
+       DisplacementControl.h
+       DistributedDisplacementControl.h
+       EigenIntegrator.h
+       GeneralizedAlpha.h
+       HHT.h
+       HHT_TP.h
+       HHTExplicit.h
+       HHTExplicit_TP.h
+       HHTGeneralized.h
+       HHTGeneralized_TP.h
+       HHTGeneralizedExplicit.h
+       HHTGeneralizedExplicit_TP.h
+       HHTHSFixedNumIter.h
+       HHTHSFixedNumIter_TP.h
+       HHTHSIncrLimit.h
+       HHTHSIncrLimit_TP.h
+       HHTHSIncrReduct.h
+       HHTHSIncrReduct_TP.h
+       Houbolt.h
+       HSConstraint.h
+       IncrementalIntegrator.h
+       Integrator.h
+       KRAlphaExplicit.h
+       KRAlphaExplicit_TP.h
+       LoadControl.h
+       LoadPath.h
+       MinUnbalDispNorm.h
+       Newmark.h
+       Newmark1.h
+       NewmarkExplicit.h
+       NewmarkHSFixedNumIter.h
+       NewmarkHSIncrLimit.h
+       NewmarkHSIncrReduct.h
+       ParkLMS3.h
+       PFEMIntegrator.h
+       StaticIntegrator.h
+       TransientIntegrator.h
+       TRBDF2.h
+       TRBDF3.h
+       WilsonTheta.h
+       GimmeMCK.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/model/CMakeLists.txt b/SRC/analysis/model/CMakeLists.txt
new file mode 100644
index 000000000..7e51dfd83
--- /dev/null
+++ b/SRC/analysis/model/CMakeLists.txt
@@ -0,0 +1,12 @@
+target_sources(analysis
+    PRIVATE
+      AnalysisModel.cpp
+      FE_EleIter.cpp
+      DOF_GrpIter.cpp
+    PUBLIC
+      AnalysisModel.h
+      FE_EleIter.h
+      DOF_GrpIter.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/analysis/numberer/CMakeLists.txt b/SRC/analysis/numberer/CMakeLists.txt
new file mode 100644
index 000000000..34135f5ba
--- /dev/null
+++ b/SRC/analysis/numberer/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+target_sources(analysis
+    PRIVATE
+      DOF_Numberer.cpp
+      PlainNumberer.cpp
+      ParallelNumberer.cpp
+    PUBLIC
+      DOF_Numberer.h
+      PlainNumberer.h
+      ParallelNumberer.h
+)
+
+target_include_directories(analysis PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/api/elementAPI.h b/SRC/api/elementAPI.h
index 52e4850ac..ef7485fb2 100644
--- a/SRC/api/elementAPI.h
+++ b/SRC/api/elementAPI.h
@@ -167,7 +167,7 @@ class ConvergenceTest;
 #define OPS_GetDomain ops_getdomain_
 
 #include <OPS_Globals.h>
-#include <tcl.h>
+// #include <tcl.h>
 //#include "TclModelBuilder.h"
 
 #ifdef __cplusplus
@@ -177,7 +177,7 @@ extern "C" int         OPS_Error(char* errorMessage, int length);
 extern "C" int         OPS_GetNumRemainingInputArgs();
 extern "C" int         OPS_ResetCurrentInputArg(int cArg);
 //extern "C" int       OPS_ResetInput(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain, TclModelBuilder * builder);
-extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+// extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
 extern "C" int         OPS_GetIntInput(int* numData, int* data);
 extern "C" int         OPS_SetIntOutput(int* numData, int* data, bool scalar);
 extern "C" int         OPS_GetDoubleInput(int* numData, double* data);
diff --git a/SRC/api/packages.cpp b/SRC/api/packages.cpp
index 0482c5306..6c680ec46 100644
--- a/SRC/api/packages.cpp
+++ b/SRC/api/packages.cpp
@@ -112,7 +112,7 @@ getLibraryFunction(const char* libName, const char* funcName, void** libHandle,
         typedef int(_cdecl* OPS_GetNumRemainingInputArgsType)();
         typedef int(_cdecl* OPS_ResetCurrentInputArgType)(int);
         //typedef int(_cdecl* OPS_ResetInputType)(ClientData, Tcl_Interp*, int, int, TCL_Char**, Domain*, TclModelBuilder*);
-        typedef int(_cdecl* OPS_ResetInputNoBuilderType)(ClientData, Tcl_Interp*, int, int, TCL_Char**, Domain*);
+        //typedef int(_cdecl* OPS_ResetInputNoBuilderType)(ClientData, Tcl_Interp*, int, int, TCL_Char**, Domain*);
         typedef int(_cdecl* OPS_GetIntInputPtrType)(int*, int*);
         typedef int(_cdecl* OPS_GetDoubleInputPtrType)(int*, double*);
         typedef const char* (_cdecl* OPS_GetStringType)();
@@ -171,7 +171,7 @@ getLibraryFunction(const char* libName, const char* funcName, void** libHandle,
             OPS_GetNumRemainingInputArgsType,
             OPS_ResetCurrentInputArgType,
             //OPS_ResetInputType,
-            OPS_ResetInputNoBuilderType,
+            //OPS_ResetInputNoBuilderType,
             OPS_GetStringType,
             OPS_GetStringCopyType,
             OPS_GetIntPtrType,
@@ -227,7 +227,7 @@ getLibraryFunction(const char* libName, const char* funcName, void** libHandle,
             OPS_GetNumRemainingInputArgs,
             OPS_ResetCurrentInputArg,
             //OPS_ResetInput,
-            OPS_ResetInputNoBuilder,
+            //OPS_ResetInputNoBuilder,
             OPS_GetString,
             OPS_GetStringCopy,
             OPS_GetNDM,
diff --git a/SRC/api/win32Functions.cpp b/SRC/api/win32Functions.cpp
index 3d5f53323..731ebe0a6 100644
--- a/SRC/api/win32Functions.cpp
+++ b/SRC/api/win32Functions.cpp
@@ -45,7 +45,7 @@ typedef int(*OPS_ErrorPtrType)(char*, int);
 typedef int(*OPS_GetNumRemainingInputArgsType)();
 typedef int(*OPS_ResetCurrentInputArgType)(int);
 //typedef int (*OPS_ResetInputType)(ClientData, Tcl_Interp*, int, int, TCL_Char**, Domain*, TclModelBuilder*);
-typedef int(*OPS_ResetInputNoBuilderType)(ClientData, Tcl_Interp*, int, int, TCL_Char**, Domain*);
+//typedef int(*OPS_ResetInputNoBuilderType)(ClientData, Tcl_Interp*, int, int, TCL_Char**, Domain*);
 typedef int(*OPS_GetIntInputPtrType)(int*, int*);
 typedef int(*OPS_GetDoubleInputPtrType)(int*, double*);
 typedef const char* (*OPS_GetStringType)();
@@ -100,7 +100,7 @@ OPS_InvokeMaterialDirectlyPtrType OPS_InvokeMaterialDirectlyPtr = 0;
 OPS_GetNumRemainingInputArgsType OPS_GetNumRemainingInputArgsPtr = 0;
 OPS_ResetCurrentInputArgType OPS_ResetCurrentInputArgPtr = 0;
 //OPS_ResetInputType OPS_ResetInputPtr = 0;
-OPS_ResetInputNoBuilderType OPS_ResetInputNoBuilderPtr = 0;
+//OPS_ResetInputNoBuilderType OPS_ResetInputNoBuilderPtr = 0;
 OPS_GetStringType OPS_GetStringPtr = 0;
 OPS_GetStringCopyType OPS_GetStringCopyPtr = 0;
 OPS_GetIntPtrType OPS_GetNDM_Ptr = 0;
@@ -149,7 +149,7 @@ void setGlobalPointers(
     OPS_GetNumRemainingInputArgsType OPS_GetNumRemainingArgsFunct,
     OPS_ResetCurrentInputArgType OPS_ResetCurrentInputArgFunct,
     //OPS_ResetInputType OPS_ResetInputFunct,
-    OPS_ResetInputNoBuilderType OPS_ResetInputNoBuilderFunct,
+    //OPS_ResetInputNoBuilderType OPS_ResetInputNoBuilderFunct,
     OPS_GetStringType OPS_GetStringFunct,
     OPS_GetStringCopyType OPS_GetStringCopyFunct,
     OPS_GetIntPtrType OPS_GetNDM_Funct,
@@ -195,7 +195,7 @@ void setGlobalPointers(
     OPS_GetNumRemainingInputArgsPtr = OPS_GetNumRemainingArgsFunct;
     OPS_ResetCurrentInputArgPtr = OPS_ResetCurrentInputArgFunct;
     //OPS_ResetInputPtr = OPS_ResetInputFunct;
-    OPS_ResetInputNoBuilderPtr = OPS_ResetInputNoBuilderFunct;
+    //OPS_ResetInputNoBuilderPtr = OPS_ResetInputNoBuilderFunct;
     OPS_GetStringPtr = OPS_GetStringFunct;
     OPS_GetStringCopyPtr = OPS_GetStringCopyFunct;
     OPS_GetNDM_Ptr = OPS_GetNDM_Funct;
@@ -353,12 +353,12 @@ int OPS_ResetInput(ClientData clientData, Tcl_Interp* interp,
     return (*OPS_ResetInputPtr)(clientData, interp, cArg, mArg, argv, domain, builder);
 }*/
 
-extern "C"
+/*extern "C"
 int OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp,
     int cArg, int mArg, TCL_Char * *argv, Domain * domain)
 {
     return (*OPS_ResetInputNoBuilderPtr)(clientData, interp, cArg, mArg, argv, domain);
-}
+}*/
 
 extern "C"
 int OPS_GetNDM()
diff --git a/SRC/convergenceTest/CMakeLists.txt b/SRC/convergenceTest/CMakeLists.txt
new file mode 100644
index 000000000..d12994bbf
--- /dev/null
+++ b/SRC/convergenceTest/CMakeLists.txt
@@ -0,0 +1,32 @@
+add_library(convergenceTest "")
+
+target_sources(convergenceTest
+    PRIVATE
+        ConvergenceTest.cpp
+	CTestNormUnbalance.cpp
+	CTestNormDispIncr.cpp
+	CTestEnergyIncr.cpp
+	CTestRelativeNormUnbalance.cpp
+	CTestRelativeNormDispIncr.cpp
+	CTestRelativeEnergyIncr.cpp
+	CTestFixedNumIter.cpp
+	CTestRelativeTotalNormDispIncr.cpp
+	NormDispAndUnbalance.cpp
+	NormDispOrUnbalance.cpp
+	CTestPFEM.cpp
+    PUBLIC
+        ConvergenceTest.h
+	CTestNormUnbalance.h
+	CTestNormDispIncr.h
+	CTestEnergyIncr.h
+	CTestRelativeNormUnbalance.h
+	CTestRelativeNormDispIncr.h
+	CTestRelativeEnergyIncr.h
+	CTestFixedNumIter.h
+	CTestRelativeTotalNormDispIncr.h
+	NormDispAndUnbalance.h
+	NormDispOrUnbalance.h
+	CTestPFEM.h
+)
+
+target_include_directories(convergenceTest PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/coordTransformation/CMakeLists.txt b/SRC/coordTransformation/CMakeLists.txt
new file mode 100644
index 000000000..bdeb49f99
--- /dev/null
+++ b/SRC/coordTransformation/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_library(coordTransformation "")
+
+target_sources(coordTransformation
+    PRIVATE
+	CrdTransf.cpp
+	LinearCrdTransf2d.cpp
+	LinearCrdTransf3d.cpp
+	PDeltaCrdTransf2d.cpp
+	PDeltaCrdTransf3d.cpp
+	CorotCrdTransf2d.cpp
+	CorotCrdTransf3d.cpp
+	CorotCrdTransfWarping2d.cpp
+    PUBLIC
+	CrdTransf.cpp
+	LinearCrdTransf2d.cpp
+	LinearCrdTransf3d.cpp
+	PDeltaCrdTransf2d.cpp
+	PDeltaCrdTransf3d.cpp
+	CorotCrdTransf2d.cpp
+	CorotCrdTransf3d.cpp
+	CorotCrdTransfWarping2d.cpp
+)
+
+target_include_directories(coordTransformation PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/damage/CMakeLists.txt b/SRC/damage/CMakeLists.txt
new file mode 100644
index 000000000..7d87e9c91
--- /dev/null
+++ b/SRC/damage/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_library(damage "")
+
+target_sources(damage
+    PRIVATE
+	DamageModel.cpp
+	HystereticEnergy.cpp
+	Kratzig.cpp
+	Mehanny.cpp
+	ParkAng.cpp
+	NormalizedPeak.cpp
+	DamageResponse.cpp
+    PUBLIC
+	DamageModel.h
+	HystereticEnergy.h
+	Kratzig.h
+	Mehanny.h
+	ParkAng.h
+	NormalizedPeak.h
+	DamageResponse.h
+)
+
+target_include_directories(damage PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/domain/domain/Domain.cpp b/SRC/domain/domain/Domain.cpp
index 21e4fd386..46caad022 100644
--- a/SRC/domain/domain/Domain.cpp
+++ b/SRC/domain/domain/Domain.cpp
@@ -98,7 +98,7 @@ Domain::Domain()
  dbEle(0), dbNod(0), dbSPs(0), dbPCs(0), dbMPs(0), dbLPs(0), dbParam(0),
  eleGraphBuiltFlag(false),  nodeGraphBuiltFlag(false), theNodeGraph(0), 
  theElementGraph(0), 
- theRegions(0), numRegions(0), commitTag(0),
+ theRegions(0), numRegions(0), commitTag(0), initBounds(true), resetBounds(false),
  theBounds(6), theEigenvalues(0), theEigenvalueSetTime(0), 
  theModalProperties(0),
  theModalDampingFactors(0), inclModalMatrix(false),
@@ -154,7 +154,7 @@ Domain::Domain(int numNodes, int numElements, int numSPs, int numMPs,
  dbEle(0), dbNod(0), dbSPs(0), dbPCs(0), dbMPs(0), dbLPs(0), dbParam(0),
  eleGraphBuiltFlag(false), nodeGraphBuiltFlag(false), theNodeGraph(0), 
  theElementGraph(0),
- theRegions(0), numRegions(0), commitTag(0),
+ theRegions(0), numRegions(0), commitTag(0), initBounds(true), resetBounds(false),
  theBounds(6), theEigenvalues(0), theEigenvalueSetTime(0), 
  theModalProperties(0),
  theModalDampingFactors(0), inclModalMatrix(false),
@@ -215,7 +215,7 @@ Domain::Domain(TaggedObjectStorage &theNodesStorage,
  theSPs(&theSPsStorage),
  theMPs(&theMPsStorage), 
  theLoadPatterns(&theLoadPatternsStorage),
- theRegions(0), numRegions(0), commitTag(0),
+ theRegions(0), numRegions(0), commitTag(0), initBounds(true), resetBounds(false),
  theBounds(6), theEigenvalues(0), theEigenvalueSetTime(0), 
  theModalProperties(0),
  theModalDampingFactors(0), inclModalMatrix(false),
@@ -274,7 +274,7 @@ Domain::Domain(TaggedObjectStorage &theStorage)
  dbEle(0), dbNod(0), dbSPs(0), dbPCs(0), dbMPs(0), dbLPs(0), dbParam(0),
  eleGraphBuiltFlag(false), nodeGraphBuiltFlag(false), theNodeGraph(0), 
  theElementGraph(0), 
- theRegions(0), numRegions(0), commitTag(0),
+ theRegions(0), numRegions(0), commitTag(0),initBounds(true), resetBounds(false),
  theBounds(6), theEigenvalues(0), theEigenvalueSetTime(0), 
  theModalProperties(0),
  theModalDampingFactors(0), inclModalMatrix(false),
@@ -488,27 +488,46 @@ Domain::addNode(Node * node)
   if (result == true) {
       node->setDomain(this);
       this->domainChange();
-      
+
       // see if the physical bounds are changed
       // note this assumes 0,0,0,0,0,0 as startup min,max values
-      const Vector &crds = node->getCrds();
+      const Vector& crds = node->getCrds();
       int dim = crds.Size();
-      if (dim >= 1) {
-	  double x = crds(0);
-	  if (x < theBounds(0)) theBounds(0) = x;
-	  if (x > theBounds(3)) theBounds(3) = x;
-      } 
-      if (dim >= 2) {
-	  double y = crds(1);
-	  if (y < theBounds(1)) theBounds(1) = y;
-	  if (y > theBounds(4)) theBounds(4) = y;	  
-      } 
-      if (dim == 3) {
-	  double z = crds(2);
-	  if (z < theBounds(2)) theBounds(2) = z;
-	  if (z > theBounds(5)) theBounds(5) = z;	  
+      if (initBounds) {
+          if (dim >= 1) {
+              double x = crds(0);
+              theBounds(0) = x;
+              theBounds(3) = x;
+          }
+          if (dim >= 2) {
+              double y = crds(1);
+              theBounds(1) = y;
+              theBounds(4) = y;
+          }
+          if (dim == 3) {
+              double z = crds(2);
+              theBounds(2) = z;
+              theBounds(5) = z;
+          }
+          initBounds = false;
+      }
+      else {
+          if (dim >= 1) {
+              double x = crds(0);
+              if (x < theBounds(0)) theBounds(0) = x;
+              if (x > theBounds(3)) theBounds(3) = x;
+          }
+          if (dim >= 2) {
+              double y = crds(1);
+              if (y < theBounds(1)) theBounds(1) = y;
+              if (y > theBounds(4)) theBounds(4) = y;
+          }
+          if (dim == 3) {
+              double z = crds(2);
+              if (z < theBounds(2)) theBounds(2) = z;
+              if (z > theBounds(5)) theBounds(5) = z;
+          }
       }
-      
   } else
     opserr << "Domain::addNode - node with tag " << nodTag << "could not be added to container\n";
 
@@ -987,12 +1006,13 @@ Domain::clearAll(void) {
   this->setModalDampingFactors(0);
 
   // set the bounds around the origin
+  initBounds = true;
   theBounds(0) = 0;
   theBounds(1) = 0;
   theBounds(2) = 0;
   theBounds(3) = 0;
-  theBounds(4) = 0;    
-  theBounds(5) = 0;        
+  theBounds(4) = 0;
+  theBounds(5) = 0;
   
   currentGeoTag = 0;
   lastGeoSendTag = -1;
@@ -1057,11 +1077,16 @@ Domain::removeNode(int tag)
 
   // mark the domain has having changed 
   this->domainChange();
+
+  // adjust node bounds 
+  resetBounds = true;
   
   // perform a downward cast to a Node (safe as only Node added to
   // this container and return the result of the cast
   Node *result = (Node *)mc;
   // result->setDomain(0);
+  
+
   return result;
 }
 
@@ -1596,6 +1621,63 @@ Domain::getNumParameters(void) const
 const Vector &
 Domain::getPhysicalBounds(void)
 {
+    // reset bounds if nodes were deleted
+    if (resetBounds) {
+        initBounds = true;
+        theBounds(0) = 0;
+        theBounds(1) = 0;
+        theBounds(2) = 0;
+        theBounds(3) = 0;
+        theBounds(4) = 0;
+        theBounds(5) = 0;
+        if (theNodes->getNumComponents() != 0) {
+            initBounds = false;
+            Node* nodePtr;
+            NodeIter& theNodeIter = this->getNodes();
+            // initialize with first node
+            nodePtr = theNodeIter();
+            const Vector& crds = nodePtr->getCrds();
+            int dim = crds.Size();
+            double x, y, z;
+            if (dim >= 1) {
+                x = crds(0);
+                theBounds(0) = x;
+                theBounds(3) = x;
+            }
+            if (dim >= 2) {
+                y = crds(1);
+                theBounds(1) = y;
+                theBounds(4) = y;
+            }
+            if (dim == 3) {
+                z = crds(2);
+                theBounds(2) = z;
+                theBounds(5) = z;
+            }
+            // adjust for other nodes
+            while ((nodePtr = theNodeIter()) != 0) {
+                const Vector& crds = nodePtr->getCrds();
+                dim = crds.Size();
+                if (dim >= 1) {
+                    x = crds(0);
+                    if (x < theBounds(0)) theBounds(0) = x;
+                    if (x > theBounds(3)) theBounds(3) = x;
+                }
+                if (dim >= 2) {
+                    y = crds(1);
+                    if (y < theBounds(1)) theBounds(1) = y;
+                    if (y > theBounds(4)) theBounds(4) = y;
+                }
+                if (dim == 3) {
+                    z = crds(2);
+                    if (z < theBounds(2)) theBounds(2) = z;
+                    if (z > theBounds(5)) theBounds(5) = z;
+                }
+            }
+        }
+        resetBounds = false;
+    }
+    
     return theBounds;
 }
 
@@ -3575,7 +3657,7 @@ int Domain::activateElements(const ID& elementList)
     for (int i = 0; i < elementList.Size(); ++i)
     {
         int eleTag = elementList(i);
-        Element* theElement = this->getElement(eleTag);
+        theElement = this->getElement(eleTag);
         if (theElement != 0)
         {
             theElement->activate();
@@ -3593,7 +3675,7 @@ int Domain::deactivateElements(const ID& elementList)
     for (int i = 0; i < elementList.Size(); ++i)
     {
         int eleTag = elementList(i);
-        Element* theElement = this->getElement(eleTag);
+        theElement = this->getElement(eleTag);
         if (theElement != 0)
         {
             theElement->deactivate();
diff --git a/SRC/domain/domain/Domain.h b/SRC/domain/domain/Domain.h
index 1a1378e8d..c8e53c66b 100644
--- a/SRC/domain/domain/Domain.h
+++ b/SRC/domain/domain/Domain.h
@@ -289,6 +289,8 @@ class Domain
     int commitTag;
     
     Vector theBounds;
+    bool initBounds; // added to fix bug when all nodes are positive or negative - ambaker1
+    bool resetBounds; // added to optimize bound resetting for when nodes are removed.
     
     Vector *theEigenvalues;
     double theEigenvalueSetTime;
diff --git a/SRC/domain/pattern/TclSeriesCommand.cpp b/SRC/domain/pattern/TclSeriesCommand.cpp
index c5b14f5fd..d3591a2ba 100644
--- a/SRC/domain/pattern/TclSeriesCommand.cpp
+++ b/SRC/domain/pattern/TclSeriesCommand.cpp
@@ -78,6 +78,8 @@ extern void *OPS_PeerMotion(void);
 extern void *OPS_PeerNGAMotion(void);
 
 #include <elementAPI.h>
+extern "C" int OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+
 #include <TclModelBuilder.h>
 
 TimeSeries *
diff --git a/SRC/domain/pattern/TimeSeries.h b/SRC/domain/pattern/TimeSeries.h
index bf777f618..f29997a15 100644
--- a/SRC/domain/pattern/TimeSeries.h
+++ b/SRC/domain/pattern/TimeSeries.h
@@ -68,9 +68,7 @@ class TimeSeries : public TaggedObject, public MovableObject
     // AddingSensitivity:BEGIN //////////////////////////////////////////
     virtual double getFactorSensitivity(double pseudoTime) {return 0.0;}
     virtual int setParameter(const char **argv, int argc, Parameter &param) {return 0;}
-#if !_DLL
     virtual int updateParameter(int parameterID, Information &info) {return 0;}
-#endif
     virtual int activateParameter(int parameterID) {return 0;}
     // AddingSensitivity:BEGIN //////////////////////////////////////////
 
diff --git a/SRC/element/CMakeLists.txt b/SRC/element/CMakeLists.txt
new file mode 100644
index 000000000..529c6386a
--- /dev/null
+++ b/SRC/element/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_library(element "")
+
+target_sources(element
+    PRIVATE
+      Element.cpp
+      ElementalLoad.cpp
+      Information.cpp
+    PUBLIC
+      Element.h
+      ElementalLoad.h
+      Information.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(elasticBeamColumn)
diff --git a/SRC/element/Element.h b/SRC/element/Element.h
index 6cd3648ba..88c5e66e9 100644
--- a/SRC/element/Element.h
+++ b/SRC/element/Element.h
@@ -123,9 +123,8 @@ class Element : public DomainComponent
 
 
 protected:
-#if !_DLL
 	const Vector& getRayleighDampingForces(void);
-#endif
+
     double alphaM, betaK, betaK0, betaKc;
     Matrix *Kc; // pointer to hold last committed matrix if needed for rayleigh damping
 
diff --git a/SRC/element/HUelements/CMakeLists.txt b/SRC/element/HUelements/CMakeLists.txt
new file mode 100644
index 000000000..a650c0322
--- /dev/null
+++ b/SRC/element/HUelements/CMakeLists.txt
@@ -0,0 +1,18 @@
+target_sources(element
+    PRIVATE
+	MultipleShearSpring.cpp
+	MultipleNormalSpring.cpp
+	DBESI0.cpp
+	DBESI1.cpp
+	YamamotoBiaxialHDR.cpp
+	KikuchiBearing.cpp
+    PUBLIC
+	MultipleShearSpring.h
+	MultipleNormalSpring.h
+	DBESI0.h
+	DBESI1.h
+	YamamotoBiaxialHDR.h
+	KikuchiBearing.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/LHMYS/CMakeLists.txt b/SRC/element/LHMYS/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/LHMYS/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/PFEMElement/CMakeLists.txt b/SRC/element/PFEMElement/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/PFEMElement/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/TclElementCommands.cpp b/SRC/element/TclElementCommands.cpp
index e04041658..e18f20db0 100644
--- a/SRC/element/TclElementCommands.cpp
+++ b/SRC/element/TclElementCommands.cpp
@@ -129,10 +129,8 @@ extern void *OPS_Brick8FiberOverlay(void);
 extern void *OPS_QuadBeamEmbedContact(void);
 extern void *OPS_TripleFrictionPendulum(void);
 extern void *OPS_Truss2(void);
-#ifdef _HAVE_PML
 extern void *OPS_PML3D(void);
 extern void *OPS_PML2D(void);
-#endif
 extern void *OPS_CorotTruss2(void);
 extern void *OPS_ZeroLengthImpact3D(void);
 extern void *OPS_HDR(void);
@@ -505,7 +503,6 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
       return TCL_ERROR;
     }
 
-#ifdef _HAVE_PML
   } else if ((strcmp(argv[1],"PML") == 0) || (strcmp(argv[1],"pml")) == 0) {
     Element *theEle = 0;
     ID info;
@@ -520,8 +517,6 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
       return TCL_ERROR;
     }
 
-#endif
-
   /* } else if (strcmp(argv[1], "gradientInelasticBeamColumn") == 0) {
 
     Element *theEle = 0;
diff --git a/SRC/element/UP-ucsd/CMakeLists.txt b/SRC/element/UP-ucsd/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/UP-ucsd/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/UWelements/CMakeLists.txt b/SRC/element/UWelements/CMakeLists.txt
new file mode 100644
index 000000000..8db625e92
--- /dev/null
+++ b/SRC/element/UWelements/CMakeLists.txt
@@ -0,0 +1,45 @@
+
+target_sources(element
+    PRIVATE
+	SimpleContact2D.cpp
+	SimpleContact3D.cpp
+	BeamContact2D.cpp
+	BeamContact2Dp.cpp
+	BeamContact3D.cpp
+	BeamContact3Dp.cpp
+	BeamEndContact3D.cpp
+	BeamEndContact3Dp.cpp
+	SSPquad.cpp
+	SSPquadUP.cpp
+	SSPbrick.cpp
+	SSPbrickUP.cpp
+	Quad4FiberOverlay.cpp
+	Brick8FiberOverlay.cpp
+	QuadBeamEmbedContact.cpp
+	PileToe3D.cpp
+	EmbeddedBeamInterfaceL.cpp
+	EmbeddedBeamInterfaceP.cpp
+	EmbeddedEPBeamInterface.cpp
+    PUBLIC
+	SimpleContact2D.h
+	SimpleContact3D.h
+	BeamContact2D.h
+	BeamContact2Dp.h
+	BeamContact3D.h
+	BeamContact3Dp.h
+	BeamEndContact3D.h
+	BeamEndContact3Dp.h
+	SSPquad.h
+	SSPquadUP.h
+	SSPbrick.h
+	SSPbrickUP.h
+	Quad4FiberOverlay.h
+	Brick8FiberOverlay.h
+	QuadBeamEmbedContact.h
+	PileToe3D.h
+	EmbeddedBeamInterfaceL.h
+	EmbeddedBeamInterfaceP.h
+	EmbeddedEPBeamInterface.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/XMUelements/CMakeLists.txt b/SRC/element/XMUelements/CMakeLists.txt
new file mode 100644
index 000000000..a554889ee
--- /dev/null
+++ b/SRC/element/XMUelements/CMakeLists.txt
@@ -0,0 +1,15 @@
+target_sources(element
+    PRIVATE
+	AC3D8HexWithSensitivity.cpp
+	ASI3D8QuadWithSensitivity.cpp
+	AV3D4QuadWithSensitivity.cpp
+	VS3D4QuadWithSensitivity.cpp
+    PUBLIC
+	AC3D8HexWithSensitivity.h
+	ASI3D8QuadWithSensitivity.h
+	AV3D4QuadWithSensitivity.h
+	VS3D4QuadWithSensitivity.h
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/absorbentBoundaries/CMakeLists.txt b/SRC/element/absorbentBoundaries/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/absorbentBoundaries/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/adapter/CMakeLists.txt b/SRC/element/adapter/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/adapter/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/beamWithHinges/CMakeLists.txt b/SRC/element/beamWithHinges/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/beamWithHinges/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/brick/CMakeLists.txt b/SRC/element/brick/CMakeLists.txt
new file mode 100644
index 000000000..5fcf90651
--- /dev/null
+++ b/SRC/element/brick/CMakeLists.txt
@@ -0,0 +1,16 @@
+target_sources(element
+    PRIVATE
+	Brick.cpp
+	Twenty_Node_Brick.cpp
+	shp3d.cpp
+	BbarBrick.cpp
+	BbarBrickWithSensitivity.cpp
+    PUBLIC
+	Brick.h
+	Twenty_Node_Brick.h
+	shp3d.h
+	BbarBrick.h
+	BbarBrickWithSensitivity.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/catenaryCable/CMakeLists.txt b/SRC/element/catenaryCable/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/catenaryCable/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/componentElement/CMakeLists.txt b/SRC/element/componentElement/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/componentElement/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/dispBeamColumn/CMakeLists.txt b/SRC/element/dispBeamColumn/CMakeLists.txt
new file mode 100644
index 000000000..58869c128
--- /dev/null
+++ b/SRC/element/dispBeamColumn/CMakeLists.txt
@@ -0,0 +1,26 @@
+target_sources(element
+    PRIVATE
+	DispBeamColumn2d.cpp
+	DispBeamColumn3d.cpp
+	DispBeamColumn2dThermal.cpp
+	DispBeamColumn3dThermal.cpp
+	DispBeamColumnNL2d.cpp
+	DispBeamColumn2dWithSensitivity.cpp
+	DispBeamColumn3dWithSensitivity.cpp
+	AxEqDispBeamColumn2d.cpp
+	TimoshenkoBeamColumn2d.cpp
+	DispBeamColumn3dID.cpp
+    PUBLIC
+	DispBeamColumn2d.h
+	DispBeamColumn3d.h
+	DispBeamColumn2dThermal.h
+	DispBeamColumn3dThermal.h
+	DispBeamColumnNL2d.h
+	DispBeamColumn2dWithSensitivity.h
+	DispBeamColumn3dWithSensitivity.h
+	AxEqDispBeamColumn2d.h
+	TimoshenkoBeamColumn2d.h
+	DispBeamColumn3dID.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/dispBeamColumn/DispBeamColumn2d.h b/SRC/element/dispBeamColumn/DispBeamColumn2d.h
index 055dc104d..2de13bb5e 100644
--- a/SRC/element/dispBeamColumn/DispBeamColumn2d.h
+++ b/SRC/element/dispBeamColumn/DispBeamColumn2d.h
@@ -105,12 +105,6 @@ class DispBeamColumn2d : public Element
     const Matrix & getMassSensitivity(int gradNumber);
     int            commitSensitivity(int gradNumber, int numGrads);
     // AddingSensitivity:END ///////////////////////////////////////////
-#if _DLL
-	int numSections;
-	SectionForceDeformation** theSections; // pointer to the ND material objects
-	BeamIntegration* beamInt;
-	CrdTransf* crdTransf;        // pointer to coordinate tranformation object
-#endif
 
   protected:
     
@@ -118,12 +112,10 @@ class DispBeamColumn2d : public Element
     const Matrix &getInitialBasicStiff(void);
     void getBasicStiff(Matrix &kb, int initial = 0);
 
-#if !_DLL
 	int numSections;
 	SectionForceDeformation** theSections; // pointer to the ND material objects
 	BeamIntegration* beamInt;
 	CrdTransf* crdTransf;        // pointer to coordinate tranformation object
-#endif
 
     ID connectedExternalNodes; // Tags of quad nodes
 
diff --git a/SRC/element/dispBeamColumn/DispBeamColumn3d.cpp b/SRC/element/dispBeamColumn/DispBeamColumn3d.cpp
index dd7a53d64..565ef8a31 100644
--- a/SRC/element/dispBeamColumn/DispBeamColumn3d.cpp
+++ b/SRC/element/dispBeamColumn/DispBeamColumn3d.cpp
@@ -1691,7 +1691,7 @@ DispBeamColumn3d::activateParameter(int passedParameterID)
 }
 
 const Matrix &
-DispBeamColumn3d::getKiSensitivity(int gradNumber)
+DispBeamColumn3d::getInitialStiffSensitivity(int gradNumber)
 {
 	K.Zero();
 	return K;
diff --git a/SRC/element/dispBeamColumn/DispBeamColumn3d.h b/SRC/element/dispBeamColumn/DispBeamColumn3d.h
index b3d802cc0..54ead6740 100644
--- a/SRC/element/dispBeamColumn/DispBeamColumn3d.h
+++ b/SRC/element/dispBeamColumn/DispBeamColumn3d.h
@@ -99,27 +99,20 @@ class DispBeamColumn3d : public Element
     int            updateParameter(int parameterID, Information &info);
     int            activateParameter(int parameterID);
     const Vector & getResistingForceSensitivity(int gradNumber);
-    const Matrix & getKiSensitivity(int gradNumber);
+    const Matrix & getInitialStiffSensitivity(int gradNumber);
     const Matrix & getMassSensitivity(int gradNumber);
     int            commitSensitivity(int gradNumber, int numGrads);
     // AddingSensitivity:END ///////////////////////////////////////////
-#if _DLL
-	int numSections;
-	SectionForceDeformation** theSections; // pointer to the ND material objects
-	CrdTransf* crdTransf;        // pointer to coordinate tranformation object 
-	BeamIntegration* beamInt;
-#endif
+
   protected:
     
   private:
     const Matrix &getInitialBasicStiff(void);
 
-#if !_DLL
 	int numSections;
 	SectionForceDeformation** theSections; // pointer to the ND material objects
 	CrdTransf* crdTransf;        // pointer to coordinate tranformation object 
 	BeamIntegration* beamInt;
-#endif
 
     ID connectedExternalNodes; // Tags of quad nodes
 
diff --git a/SRC/element/dispBeamColumnInt/CMakeLists.txt b/SRC/element/dispBeamColumnInt/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/dispBeamColumnInt/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/elasticBeamColumn/CMakeLists.txt b/SRC/element/elasticBeamColumn/CMakeLists.txt
new file mode 100644
index 000000000..e8a1f5f4f
--- /dev/null
+++ b/SRC/element/elasticBeamColumn/CMakeLists.txt
@@ -0,0 +1,18 @@
+target_sources(element
+    PRIVATE
+      ElasticBeam2d.cpp
+      ElasticBeam3d.cpp
+      ElasticTimoshenkoBeam2d.cpp
+      ElasticTimoshenkoBeam3d.cpp
+      ModElasticBeam2d.cpp
+      WheelRail.cpp
+    PUBLIC
+      ElasticBeam2d.h
+      ElasticBeam3d.h
+      ElasticTimoshenkoBeam2d.h
+      ElasticTimoshenkoBeam3d.h
+      ModElasticBeam2d.h
+      WheelRail.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/elastomericBearing/CMakeLists.txt b/SRC/element/elastomericBearing/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/elastomericBearing/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/feap/CMakeLists.txt b/SRC/element/feap/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/feap/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/forceBeamColumn/CMakeLists.txt b/SRC/element/forceBeamColumn/CMakeLists.txt
new file mode 100644
index 000000000..c5af45d03
--- /dev/null
+++ b/SRC/element/forceBeamColumn/CMakeLists.txt
@@ -0,0 +1,63 @@
+target_sources(element
+    PRIVATE
+	ForceBeamColumn2d.cpp
+	ForceBeamColumn3d.cpp
+	ForceBeamColumn2dThermal.cpp
+	ElasticForceBeamColumn2d.cpp
+	ElasticForceBeamColumn3d.cpp
+	ElasticForceBeamColumnWarping2d.cpp
+	ForceBeamColumnCBDI2d.cpp
+	ForceBeamColumnWarping2d.cpp
+	BeamIntegration.cpp
+	LobattoBeamIntegration.cpp
+	LegendreBeamIntegration.cpp
+	RadauBeamIntegration.cpp
+	NewtonCotesBeamIntegration.cpp
+	HingeMidpointBeamIntegration.cpp
+	HingeEndpointBeamIntegration.cpp
+	HingeRadauBeamIntegration.cpp
+	HingeRadauTwoBeamIntegration.cpp
+	UserDefinedBeamIntegration.cpp
+	SimpsonBeamIntegration.cpp
+	UserDefinedHingeIntegration.cpp
+	DistHingeIntegration.cpp
+	RegularizedHingeIntegration.cpp
+	TrapezoidalBeamIntegration.cpp
+	CompositeSimpsonBeamIntegration.cpp
+	FixedLocationBeamIntegration.cpp
+	LowOrderBeamIntegration.cpp
+	MidDistanceBeamIntegration.cpp
+	GaussQBeamIntegration.cpp
+	gaussq.f
+    PUBLIC
+	ForceBeamColumn2d.h
+	ForceBeamColumn3d.h
+	ForceBeamColumn2dThermal.h
+	ElasticForceBeamColumn2d.h
+	ElasticForceBeamColumn3d.h
+	ElasticForceBeamColumnWarping2d.h
+	ForceBeamColumnCBDI2d.h
+	ForceBeamColumnWarping2d.h
+	BeamIntegration.h
+	LobattoBeamIntegration.h
+	LegendreBeamIntegration.h
+	RadauBeamIntegration.h
+	NewtonCotesBeamIntegration.h
+	HingeMidpointBeamIntegration.h
+	HingeEndpointBeamIntegration.h
+	HingeRadauBeamIntegration.h
+	HingeRadauTwoBeamIntegration.h
+	UserDefinedBeamIntegration.h
+	SimpsonBeamIntegration.h
+	UserDefinedHingeIntegration.h
+	DistHingeIntegration.h
+	RegularizedHingeIntegration.h
+	TrapezoidalBeamIntegration.h
+	CompositeSimpsonBeamIntegration.h
+	FixedLocationBeamIntegration.h
+	LowOrderBeamIntegration.h
+	MidDistanceBeamIntegration.h
+	GaussQBeamIntegration.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn2d.h b/SRC/element/forceBeamColumn/ForceBeamColumn2d.h
index 6b276c110..01e97fc56 100644
--- a/SRC/element/forceBeamColumn/ForceBeamColumn2d.h
+++ b/SRC/element/forceBeamColumn/ForceBeamColumn2d.h
@@ -131,12 +131,7 @@ class ForceBeamColumn2d: public Element
   int getResponseSensitivity(int responseID, int gradNumber,
 			     Information &eleInformation);
   // AddingSensitivity:END ///////////////////////////////////////////
-#if _DLL
-  BeamIntegration* beamIntegr;
-  int numSections;
-  SectionForceDeformation** sections;          // array of pointers to sections
-  CrdTransf* crdTransf;        // pointer to coordinate tranformation object 
-#endif
+
  protected:
   void setSectionPointers(int numSections, SectionForceDeformation **secPtrs);
   int getInitialFlexibility(Matrix &fe);
@@ -157,12 +152,11 @@ class ForceBeamColumn2d: public Element
   // internal data
   ID     connectedExternalNodes; // tags of the end nodes
 
-#if !_DLL
   BeamIntegration* beamIntegr;
   int numSections;
   SectionForceDeformation** sections;          // array of pointers to sections
   CrdTransf* crdTransf;        // pointer to coordinate tranformation object 
-#endif
+
   // (performs the transformation between the global and basic system)
   double rho;                    // mass density per unit length
   int    maxIters;               // maximum number of local iterations
diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn3d.h b/SRC/element/forceBeamColumn/ForceBeamColumn3d.h
index e02a637a3..8313d5949 100644
--- a/SRC/element/forceBeamColumn/ForceBeamColumn3d.h
+++ b/SRC/element/forceBeamColumn/ForceBeamColumn3d.h
@@ -131,12 +131,7 @@ class ForceBeamColumn3d: public Element
   int getResponseSensitivity(int responseID, int gradNumber,
 			     Information &eleInformation);
   // AddingSensitivity:END ///////////////////////////////////////////
-#if _DLL
-  BeamIntegration* beamIntegr;
-  int numSections;
-  SectionForceDeformation** sections;          // array of pointers to sections
-  CrdTransf* crdTransf;        // pointer to coordinate tranformation object 
-#endif
+
  protected:
   void setSectionPointers(int numSections, SectionForceDeformation **secPtrs);
   int getInitialFlexibility(Matrix &fe);
@@ -157,12 +152,11 @@ class ForceBeamColumn3d: public Element
   // internal data
   ID     connectedExternalNodes; // tags of the end nodes
 
-#if !_DLL
   BeamIntegration* beamIntegr;
   int numSections;
   SectionForceDeformation** sections;          // array of pointers to sections
   CrdTransf* crdTransf;        // pointer to coordinate tranformation object 
-#endif
+
   // (performs the transformation between the global and basic system)
   double rho;                    // mass density per unit length
   int    maxIters;               // maximum number of local iterations
diff --git a/SRC/element/fourNodeQuad/CMakeLists.txt b/SRC/element/fourNodeQuad/CMakeLists.txt
new file mode 100644
index 000000000..26fc6f90b
--- /dev/null
+++ b/SRC/element/fourNodeQuad/CMakeLists.txt
@@ -0,0 +1,18 @@
+target_sources(element
+    PRIVATE
+	FourNodeQuad.cpp
+	ConstantPressureVolumeQuad.cpp
+	EnhancedQuad.cpp
+	FourNodeQuad3d.cpp
+	NineNodeMixedQuad.cpp
+	FourNodeQuadWithSensitivity.cpp
+    PUBLIC
+	FourNodeQuad.h
+	ConstantPressureVolumeQuad.h
+	EnhancedQuad.h
+	FourNodeQuad3d.h
+	NineNodeMixedQuad.h
+	FourNodeQuadWithSensitivity.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/frictionBearing/frictionModel/TclModelBuilderFrictionModelCommand.cpp b/SRC/element/frictionBearing/frictionModel/TclModelBuilderFrictionModelCommand.cpp
index a3120e8e9..df44e8bc9 100755
--- a/SRC/element/frictionBearing/frictionModel/TclModelBuilderFrictionModelCommand.cpp
+++ b/SRC/element/frictionBearing/frictionModel/TclModelBuilderFrictionModelCommand.cpp
@@ -32,6 +32,7 @@
 #include <FrictionModel.h>
 #include <tcl.h>
 #include <elementAPI.h>
+extern "C" int OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
 
 extern void *OPS_Coulomb();
 extern void *OPS_VelDependent();
diff --git a/SRC/element/gradientInelasticBeamColumn/GradientInelasticBeamColumn3d.cpp b/SRC/element/gradientInelasticBeamColumn/GradientInelasticBeamColumn3d.cpp
index b94bdef0a..8c11c86eb 100644
--- a/SRC/element/gradientInelasticBeamColumn/GradientInelasticBeamColumn3d.cpp
+++ b/SRC/element/gradientInelasticBeamColumn/GradientInelasticBeamColumn3d.cpp
@@ -807,8 +807,8 @@ GradientInelasticBeamColumn3d::revertToLastCommit(void)
 		sections[i]->setTrialSectionDeformation(d_sec[i]);
 	}
 
-	d_tot = d_tot_commit;
-	d_nl_tot = d_nl_tot_commit;
+	*d_tot = *d_tot_commit;
+	*d_nl_tot = *d_nl_tot_commit;
 
 	// Revert Coordinate Transformation Object to Last Committed State
 	if ((err = crdTransf->revertToLastCommit()))
diff --git a/SRC/element/joint/CMakeLists.txt b/SRC/element/joint/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/joint/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/mixedBeamColumn/CMakeLists.txt b/SRC/element/mixedBeamColumn/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/mixedBeamColumn/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/mvlem/CMakeLists.txt b/SRC/element/mvlem/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/mvlem/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/nonlinearBeamColumn/CMakeLists.txt b/SRC/element/nonlinearBeamColumn/CMakeLists.txt
new file mode 100644
index 000000000..8fb539bce
--- /dev/null
+++ b/SRC/element/nonlinearBeamColumn/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(matrixutil)
diff --git a/SRC/element/nonlinearBeamColumn/matrixutil/CMakeLists.txt b/SRC/element/nonlinearBeamColumn/matrixutil/CMakeLists.txt
new file mode 100644
index 000000000..2e3fa0f3d
--- /dev/null
+++ b/SRC/element/nonlinearBeamColumn/matrixutil/CMakeLists.txt
@@ -0,0 +1,10 @@
+target_sources(element
+    PRIVATE
+	MatrixUtil.cpp
+    PUBLIC
+	MatrixUtil.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/element/pyMacro/CMakeLists.txt b/SRC/element/pyMacro/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/pyMacro/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/shell/CMakeLists.txt b/SRC/element/shell/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/shell/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/surfaceLoad/CMakeLists.txt b/SRC/element/surfaceLoad/CMakeLists.txt
new file mode 100644
index 000000000..a113192c4
--- /dev/null
+++ b/SRC/element/surfaceLoad/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/tetrahedron/CMakeLists.txt b/SRC/element/tetrahedron/CMakeLists.txt
new file mode 100644
index 000000000..6033f9fbc
--- /dev/null
+++ b/SRC/element/tetrahedron/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+	FourNodeTetrahedron.cpp
+    PUBLIC
+	FourNodeTetrahedron.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/triangle/CMakeLists.txt b/SRC/element/triangle/CMakeLists.txt
new file mode 100644
index 000000000..e27ca2805
--- /dev/null
+++ b/SRC/element/triangle/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(element
+    PRIVATE
+	Tri31.cpp
+    PUBLIC
+	Tri31.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/truss/CMakeLists.txt b/SRC/element/truss/CMakeLists.txt
new file mode 100644
index 000000000..e17e178e1
--- /dev/null
+++ b/SRC/element/truss/CMakeLists.txt
@@ -0,0 +1,20 @@
+target_sources(element
+    PRIVATE
+	Truss.cpp
+	TrussSection.cpp
+	CorotTruss.cpp
+	CorotTrussSection.cpp
+	Truss2.cpp
+	N4BiaxialTruss.cpp
+	CorotTruss2.cpp
+    PUBLIC
+	Truss.h
+	TrussSection.h
+	CorotTruss.h
+	CorotTrussSection.h
+	Truss2.h
+	N4BiaxialTruss.h
+	CorotTruss2.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/twoNodeLink/CMakeLists.txt b/SRC/element/twoNodeLink/CMakeLists.txt
new file mode 100644
index 000000000..74e7adecd
--- /dev/null
+++ b/SRC/element/twoNodeLink/CMakeLists.txt
@@ -0,0 +1,12 @@
+target_sources(element
+    PRIVATE
+	Inerter.cpp
+	LinearElasticSpring.cpp
+	TwoNodeLink.cpp
+    PUBLIC
+	Inerter.h
+	LinearElasticSpring.h
+	TwoNodeLink.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/element/zeroLength/CMakeLists.txt b/SRC/element/zeroLength/CMakeLists.txt
new file mode 100644
index 000000000..97bbabd48
--- /dev/null
+++ b/SRC/element/zeroLength/CMakeLists.txt
@@ -0,0 +1,28 @@
+target_sources(element
+    PRIVATE
+	ZeroLength.cpp
+	ZeroLengthSection.cpp
+	ZeroLengthContact2D.cpp
+	ZeroLengthContact3D.cpp
+	ZeroLengthND.cpp
+	ZeroLengthContactNTS2D.cpp
+	ZeroLengthInterface2D.cpp
+	ZeroLengthRocking.cpp
+	CoupledZeroLength.cpp
+	ZeroLengthImpact3D.cpp
+	ZeroLengthVG_HG.cpp
+    PUBLIC
+	ZeroLength.h
+	ZeroLengthSection.h
+	ZeroLengthContact2D.h
+	ZeroLengthContact3D.h
+	ZeroLengthND.h
+	ZeroLengthContactNTS2D.h
+	ZeroLengthInterface2D.h
+	ZeroLengthRocking.h
+	CoupledZeroLength.h
+	ZeroLengthImpact3D.h
+	ZeroLengthVG_HG.h
+)
+
+target_include_directories(element PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/graph/CMakeLists.txt b/SRC/graph/CMakeLists.txt
new file mode 100644
index 000000000..c09201083
--- /dev/null
+++ b/SRC/graph/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(graph "")
+
+add_subdirectory(graph)
+add_subdirectory(numberer)
+add_subdirectory(partitioner)
diff --git a/SRC/graph/graph/CMakeLists.txt b/SRC/graph/graph/CMakeLists.txt
new file mode 100644
index 000000000..9c295a55b
--- /dev/null
+++ b/SRC/graph/graph/CMakeLists.txt
@@ -0,0 +1,17 @@
+target_sources(graph
+    PRIVATE
+      DOF_Graph.cpp 
+      Vertex.cpp 
+      Graph.cpp
+      DOF_GroupGraph.cpp  
+      VertexIter.cpp
+    PUBLIC
+      DOF_Graph.h 
+      Vertex.h 
+      Graph.h
+      DOF_GroupGraph.h  
+      VertexIter.h
+)
+
+
+target_include_directories(graph PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/graph/numberer/CMakeLists.txt b/SRC/graph/numberer/CMakeLists.txt
new file mode 100644
index 000000000..376c9d6c3
--- /dev/null
+++ b/SRC/graph/numberer/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+target_sources(graph
+    PRIVATE
+      RCM.cpp
+      AMDNumberer.cpp
+      SimpleNumberer.cpp
+      GraphNumberer.cpp
+    PUBLIC
+      RCM.h
+      AMDNumberer.h
+      SimpleNumberer.h
+      GraphNumberer.h
+)
+
+
+target_include_directories(graph PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/graph/partitioner/CMakeLists.txt b/SRC/graph/partitioner/CMakeLists.txt
new file mode 100644
index 000000000..0c2cd48b0
--- /dev/null
+++ b/SRC/graph/partitioner/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(graph
+    PRIVATE
+      Metis.cpp
+    PUBLIC
+      Metis.h
+      GraphPartitioner.h
+)
diff --git a/SRC/handler/CMakeLists.txt b/SRC/handler/CMakeLists.txt
new file mode 100644
index 000000000..e0b763821
--- /dev/null
+++ b/SRC/handler/CMakeLists.txt
@@ -0,0 +1,30 @@
+add_library(handler "")
+
+target_sources(handler
+    PRIVATE
+	OPS_Stream.cpp
+        StandardStream.cpp
+        FileStream.cpp
+        XmlFileStream.cpp
+        DataFileStream.cpp
+        DataFileStreamAdd.cpp
+        BinaryFileStream.cpp
+        DatabaseStream.cpp
+        DummyStream.cpp
+        TCP_Stream.cpp
+        ChannelStream.cpp
+    PUBLIC
+	OPS_Stream.h
+        StandardStream.h
+        FileStream.h
+        XmlFileStream.h
+        DataFileStream.h
+        DataFileStreamAdd.h
+        BinaryFileStream.h
+        DatabaseStream.h
+        DummyStream.h
+        TCP_Stream.h
+        ChannelStream.h
+)
+
+target_include_directories(handler PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/interpreter/OpenSeesSectionCommands.cpp b/SRC/interpreter/OpenSeesSectionCommands.cpp
index 9f1dc5d8b..03ca3e873 100644
--- a/SRC/interpreter/OpenSeesSectionCommands.cpp
+++ b/SRC/interpreter/OpenSeesSectionCommands.cpp
@@ -197,18 +197,29 @@ namespace {
 	    theSec = OPS_FiberSection2d();
 	    theActiveFiberSection2d = (FiberSection2d*)theSec;
 	} else if(ndm == 3) {
-	  if (ndf == 7) {
-	    theSec = OPS_FiberSectionWarping3d();
-	    theActiveFiberSectionWarping3d = (FiberSectionWarping3d*)theSec;
-	  } else {
 	    theSec = OPS_FiberSection3d();
 	    theActiveFiberSection3d = (FiberSection3d*)theSec;
-	  }
 	}
 
 	return theSec;
     }
 
+    static void* OPS_FiberSectionWarping()
+    {
+	void* theSec = 0;
+	int ndm = OPS_GetNDM();
+	int ndf = OPS_GetNDF();	
+	if(ndm == 2) {
+	  //theSec = OPS_FiberSectionWarping2d();
+	  //theActiveFiberSectionWarping2d = (FiberSectionWarping2d*)theSec;
+	} else if(ndm == 3) {
+	  theSec = OPS_FiberSectionWarping3d();
+	  theActiveFiberSectionWarping3d = (FiberSectionWarping3d*)theSec;
+	}
+
+	return theSec;
+    }
+  
     static void* OPS_FiberSectionThermal()
     {
 	void* theSec = 0;
@@ -1042,8 +1053,9 @@ namespace {
     {
 	functionMap.insert(std::make_pair("Elastic", &OPS_ElasticSection));
 	functionMap.insert(std::make_pair("Fiber", &OPS_FiberSection));
-	functionMap.insert(std::make_pair("FiberThermal", &OPS_FiberSectionThermal));
 	functionMap.insert(std::make_pair("fiberSec", &OPS_FiberSection));
+	functionMap.insert(std::make_pair("FiberWarping", &OPS_FiberSectionWarping));
+	functionMap.insert(std::make_pair("FiberThermal", &OPS_FiberSectionThermal));	
 	functionMap.insert(std::make_pair("NDFiber", &OPS_NDFiberSection));
 	functionMap.insert(std::make_pair("Uniaxial", &OPS_UniaxialSection));
 	functionMap.insert(std::make_pair("Generic1D", &OPS_UniaxialSection));
diff --git a/SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp b/SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp
index d466bc214..034febede 100644
--- a/SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp
+++ b/SRC/interpreter/OpenSeesUniaxialMaterialCommands.cpp
@@ -76,6 +76,7 @@ void* OPS_EPPGapMaterial();
 void* OPS_ENTMaterial();
 void* OPS_Steel01();
 void* OPS_Steel02();
+void* OPS_Steel02Fatigue();
 void* OPS_Steel03();
 void* OPS_Concrete01();
 void* OPS_Steel4();
@@ -130,6 +131,7 @@ void* OPS_BWBN();
 void* OPS_PySimple1();
 void* OPS_TzSimple1();
 void* OPS_QzSimple1();
+void* OPS_QzSimple2();
 void* OPS_PyLiq1();
 void* OPS_TzLiq1();
 void* OPS_KikuchiAikenHDR();
@@ -224,6 +226,7 @@ namespace {
 	uniaxialMaterialsMap.insert(std::make_pair("ENT", &OPS_ENTMaterial));
 	uniaxialMaterialsMap.insert(std::make_pair("Steel01", &OPS_Steel01));
 	uniaxialMaterialsMap.insert(std::make_pair("Steel02", &OPS_Steel02));
+	uniaxialMaterialsMap.insert(std::make_pair("Steel02Fatigue", &OPS_Steel02Fatigue));
 	uniaxialMaterialsMap.insert(std::make_pair("Steel03", &OPS_Steel03));
 	uniaxialMaterialsMap.insert(std::make_pair("Concrete01", &OPS_Concrete01));
 	uniaxialMaterialsMap.insert(std::make_pair("Steel4", &OPS_Steel4));
@@ -292,6 +295,7 @@ namespace {
 	uniaxialMaterialsMap.insert(std::make_pair("PySimple1", &OPS_PySimple1));
 	uniaxialMaterialsMap.insert(std::make_pair("TzSimple1", &OPS_TzSimple1));
 	uniaxialMaterialsMap.insert(std::make_pair("QzSimple1", &OPS_QzSimple1));
+	uniaxialMaterialsMap.insert(std::make_pair("QzSimple2", &OPS_QzSimple2));
 	uniaxialMaterialsMap.insert(std::make_pair("PyLiq1", &OPS_PyLiq1));
 	uniaxialMaterialsMap.insert(std::make_pair("TzLiq1", &OPS_TzLiq1));
 	uniaxialMaterialsMap.insert(std::make_pair("KikuchiAikenHDR", &OPS_KikuchiAikenHDR));
diff --git a/SRC/material/CMakeLists.txt b/SRC/material/CMakeLists.txt
new file mode 100644
index 000000000..6b6e43075
--- /dev/null
+++ b/SRC/material/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(material "")
+
+target_sources(material
+    PRIVATE
+      Material.cpp
+    PUBLIC
+      Material.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(uniaxial)
+add_subdirectory(nD)
+add_subdirectory(section)
diff --git a/SRC/material/nD/CMakeLists.txt b/SRC/material/nD/CMakeLists.txt
new file mode 100644
index 000000000..b3dbdac0e
--- /dev/null
+++ b/SRC/material/nD/CMakeLists.txt
@@ -0,0 +1,185 @@
+
+target_sources(material
+    PRIVATE
+        NDMaterial.cpp
+	BeamFiberMaterial.cpp
+	PlasticDamageConcretePlaneStress.cpp
+	BeamFiberMaterial2d.cpp
+	BeamFiberMaterial2dPS.cpp
+	PlasticDamageConcrete3d.cpp
+	LinearCap.cpp
+	eig3.cpp
+	FSAM.cpp
+	AcousticMedium.cpp
+	ElasticIsotropicAxiSymm.cpp
+	ElasticIsotropicBeamFiber2d.cpp
+	ElasticIsotropicBeamFiber.cpp
+	ElasticIsotropicMaterial.cpp
+	ElasticIsotropicPlaneStrain2D.cpp
+	ElasticIsotropicPlaneStress2D.cpp
+	ElasticIsotropicPlateFiber.cpp
+	ElasticIsotropicThreeDimensional.cpp
+	ElasticOrthotropicMaterial.cpp
+	ElasticOrthotropicThreeDimensional.cpp
+	PressureDependentElastic3D.cpp
+	FeapMaterial.cpp
+	J2AxiSymm.cpp
+	J2PlaneStrain.cpp
+	J2PlaneStress.cpp
+	J2Plasticity.cpp
+	J2PlateFiber.cpp
+	J2PlateFibre.cpp
+	J2BeamFiber2d.cpp
+	J2BeamFiber3d.cpp
+	J2ThreeDimensional.cpp
+	PlaneStrainMaterial.cpp
+	PlaneStressMaterial.cpp
+	PlaneStressUserMaterial.cpp
+	PlateFiberMaterial.cpp
+	PlateFromPlaneStressMaterial.cpp
+	PlaneStressLayeredMaterial.cpp
+	PlateRebarMaterial.cpp
+	PlaneStressRebarMaterial.cpp
+	CycLiqCP.cpp
+	CycLiqCP3D.cpp
+	CycLiqCPPlaneStrain.cpp
+	CycLiqCPSP.cpp
+	CycLiqCPSP3D.cpp
+	CycLiqCPSPPlaneStrain.cpp
+	WrapperNDMaterial.cpp
+	InitStressNDMaterial.cpp
+	ConcreteMcftNonLinear5.cpp
+	ConcreteMcftNonLinear7.cpp
+	CapPlasticity.cpp
+	ConcreteS.cpp
+	SimplifiedJ2.cpp
+	LinearCap.cpp
+	AcousticMedium.cpp
+	PlaneStressSimplifiedJ2.cpp
+	DruckerPrager3DThermal.cpp
+	DruckerPragerThermal.cpp
+	ElasticIsotropic3DThermal.cpp
+	ElasticIsotropicMaterialThermal.cpp
+	J2PlasticityThermal.cpp
+	J2ThreeDimensionalThermal.cpp
+	PlateFiberMaterialThermal.cpp
+	PlateFromPlaneStressMaterialThermal.cpp
+	UVCmultiaxial.cpp
+	UVCplanestress.cpp
+	PlateRebarMaterialThermal.cpp
+    PUBLIC
+        NDMaterial.h
+	BeamFiberMaterial.h
+	PlasticDamageConcretePlaneStress.h
+	BeamFiberMaterial2d.h
+	BeamFiberMaterial2dPS.h
+	PlasticDamageConcrete3d.h
+	LinearCap.h
+	eig3.h
+	FSAM.h
+	AcousticMedium.h
+	ElasticIsotropicAxiSymm.h
+	ElasticIsotropicBeamFiber2d.h
+	ElasticIsotropicBeamFiber.h
+	ElasticIsotropicMaterial.h
+	ElasticIsotropicPlaneStrain2D.h
+	ElasticIsotropicPlaneStress2D.h
+	ElasticIsotropicPlateFiber.h
+	ElasticIsotropicThreeDimensional.h
+	ElasticOrthotropicMaterial.h
+	ElasticOrthotropicThreeDimensional.h
+	PressureDependentElastic3D.h
+	FeapMaterial.h
+	J2AxiSymm.h
+	J2PlaneStrain.h
+	J2PlaneStress.h
+	J2Plasticity.h
+	J2PlateFiber.h
+	J2PlateFibre.h
+	J2BeamFiber2d.h
+	J2BeamFiber3d.h
+	J2ThreeDimensional.h
+	PlaneStrainMaterial.h
+	PlaneStressMaterial.h
+	PlaneStressUserMaterial.h
+	PlateFiberMaterial.h
+	PlateFromPlaneStressMaterial.h
+	PlaneStressLayeredMaterial.h
+	PlateRebarMaterial.h
+	PlaneStressRebarMaterial.h
+	CycLiqCP.h
+	CycLiqCP3D.h
+	CycLiqCPPlaneStrain.h
+	CycLiqCPSP.h
+	CycLiqCPSP3D.h
+	CycLiqCPSPPlaneStrain.h
+	WrapperNDMaterial.h
+	InitStressNDMaterial.h
+	ConcreteMcftNonLinear5.h
+	ConcreteMcftNonLinear7.h
+	CapPlasticity.h
+	ConcreteS.h
+	SimplifiedJ2.h
+	LinearCap.h
+	AcousticMedium.h
+	PlaneStressSimplifiedJ2.h
+	DruckerPrager3DThermal.h
+	DruckerPragerThermal.h
+	ElasticIsotropic3DThermal.h
+	ElasticIsotropicMaterialThermal.h
+	J2PlasticityThermal.h
+	J2ThreeDimensionalThermal.h
+	PlateFiberMaterialThermal.h
+	PlateFromPlaneStressMaterialThermal.h
+	UVCmultiaxial.h
+	UVCplanestress.h
+	PlateRebarMaterialThermal.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+if(FMK)
+   target_sources(material
+      PRIVATE
+        forumat.f
+	PlainConcrete.f
+	Damage2p.cpp
+	Damage2p3D.cpp 
+	Damage2ppstress.cpp
+	Concrete.cpp 
+	CPlaneStress.cpp 
+	CPlaneStrain.cpp 
+	CPlaneStress2d.cpp
+	CThreeDimensional.cpp
+	Faria1998.cpp
+	Faria1998PlaneStrain.cpp
+	Faria1998PlaneStress.cpp
+	Faria1998PlaneStress2d.cpp
+	Faria1998ThreeDimensional.cpp
+      PUBLIC
+	Damage2p.h 
+	Damage2p3D.h 
+	Damage2ppstress.h
+	Concrete.h 
+	CPlaneStress.h 
+	CPlaneStrain.h 
+	CPlaneStress2d.h
+	CThreeDimensional.h
+	Faria1998.h
+	Faria1998PlaneStrain.h
+	Faria1998PlaneStress.h
+	Faria1998PlaneStress2d.h
+	Faria1998ThreeDimensional.h
+   )
+endif()
+
+
+add_subdirectory(soil)
+add_subdirectory(feap)
+add_subdirectory(cyclicSoil)
+add_subdirectory(reinforcedConcretePlaneStress)
+add_subdirectory(UWmaterials)
+add_subdirectory(matCMM)
+add_subdirectory(stressDensityModel)
+
+
diff --git a/SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp b/SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp
index fa54b73b9..3c6d4a0c2 100644
--- a/SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp
+++ b/SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp
@@ -528,7 +528,6 @@ TclModelBuilderNDMaterialCommand (ClientData clientData, Tcl_Interp *interp, int
 	return TCL_ERROR;
     }
 
-#if !_DLL
     else if ((strcmp(argv[1],"stressDensity") == 0) || (strcmp(argv[1],"StressDensity") == 0)) {
       
       void *theMat = OPS_StressDensityMaterial();
@@ -537,7 +536,7 @@ TclModelBuilderNDMaterialCommand (ClientData clientData, Tcl_Interp *interp, int
       else
 	return TCL_ERROR;
     }
-#endif
+
     else if ((strcmp(argv[1],"ElasticIsotropic3D") == 0)) {
 
       void *theMat = OPS_ElasticIsotropic3D();
diff --git a/SRC/material/nD/UWmaterials/CMakeLists.txt b/SRC/material/nD/UWmaterials/CMakeLists.txt
new file mode 100644
index 000000000..b450f62b8
--- /dev/null
+++ b/SRC/material/nD/UWmaterials/CMakeLists.txt
@@ -0,0 +1,42 @@
+target_sources(material
+    PRIVATE
+      BoundingCamClay.cpp
+      BoundingCamClay3D.cpp
+      BoundingCamClayPlaneStrain.cpp
+      ContactMaterial2D.cpp
+      ContactMaterial3D.cpp
+      DruckerPrager.cpp
+      DruckerPrager3D.cpp
+      DruckerPragerPlaneStrain.cpp
+      InitialStateAnalysisWrapper.cpp
+      ManzariDafalias.cpp
+      ManzariDafalias3D.cpp
+      ManzariDafaliasPlaneStrain.cpp
+      ManzariDafaliasRO.cpp
+      ManzariDafalias3DRO.cpp
+      ManzariDafaliasPlaneStrainRO.cpp
+      PM4Sand.cpp
+      PM4Silt.cpp
+      J2CyclicBoundingSurface.cpp
+    PUBLIC
+      BoundingCamClay.h
+      BoundingCamClay3D.h
+      BoundingCamClayPlaneStrain.h
+      ContactMaterial2D.h
+      ContactMaterial3D.h
+      DruckerPrager.h
+      DruckerPrager3D.h
+      DruckerPragerPlaneStrain.h
+      InitialStateAnalysisWrapper.h
+      ManzariDafalias.h
+      ManzariDafalias3D.h
+      ManzariDafaliasPlaneStrain.h
+      ManzariDafaliasRO.h
+      ManzariDafalias3DRO.h
+      ManzariDafaliasPlaneStrainRO.h
+      PM4Sand.h
+      PM4Silt.h
+      J2CyclicBoundingSurface.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/nD/cyclicSoil/CMakeLists.txt b/SRC/material/nD/cyclicSoil/CMakeLists.txt
new file mode 100644
index 000000000..48a99532e
--- /dev/null
+++ b/SRC/material/nD/cyclicSoil/CMakeLists.txt
@@ -0,0 +1,14 @@
+target_sources(material
+    PRIVATE
+	MultiaxialCyclicPlasticity.cpp
+	MultiaxialCyclicPlasticityPlaneStrain.cpp
+	MultiaxialCyclicPlasticity3D.cpp
+	MultiaxialCyclicPlasticityAxiSymm.cpp
+    PUBLIC
+	MultiaxialCyclicPlasticity.h
+	MultiaxialCyclicPlasticityPlaneStrain.h
+	MultiaxialCyclicPlasticity3D.h
+	MultiaxialCyclicPlasticityAxiSymm.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/nD/feap/CMakeLists.txt b/SRC/material/nD/feap/CMakeLists.txt
new file mode 100644
index 000000000..bbebf7c3b
--- /dev/null
+++ b/SRC/material/nD/feap/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+target_sources(material
+    PRIVATE
+	feapCommon.f
+	FeapMaterial01.cpp
+	matl01.f
+	FeapMaterial02.cpp
+	matl02.f
+	FeapMaterial03.cpp
+	matl03.f
+    PUBLIC
+	FeapMaterial01.h
+	FeapMaterial02.h
+	FeapMaterial03.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/nD/matCMM/CMakeLists.txt b/SRC/material/nD/matCMM/CMakeLists.txt
new file mode 100644
index 000000000..8347f4436
--- /dev/null
+++ b/SRC/material/nD/matCMM/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(material
+    PRIVATE
+	MaterialCMM.cpp
+    PUBLIC
+	MaterialCMM.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/nD/reinforcedConcretePlaneStress/CMakeLists.txt b/SRC/material/nD/reinforcedConcretePlaneStress/CMakeLists.txt
new file mode 100644
index 000000000..1711ec1d7
--- /dev/null
+++ b/SRC/material/nD/reinforcedConcretePlaneStress/CMakeLists.txt
@@ -0,0 +1,30 @@
+target_sources(material
+    PRIVATE
+	ConcreteL01.cpp
+	ConcreteZ01.cpp
+	TendonL01.cpp
+	SteelZ01.cpp
+	ReinforcedConcretePlaneStress.cpp
+	FAReinforcedConcretePlaneStress.cpp
+	FAFourSteelRCPlaneStress.cpp
+	RAFourSteelRCPlaneStress.cpp
+	PrestressedConcretePlaneStress.cpp
+	FAPrestressedConcretePlaneStress.cpp
+	FAFourSteelPCPlaneStress.cpp
+	RAFourSteelPCPlaneStress.cpp
+    PUBLIC
+	ConcreteL01.h
+	ConcreteZ01.h
+	TendonL01.h
+	SteelZ01.h
+	ReinforcedConcretePlaneStress.h
+	FAReinforcedConcretePlaneStress.h
+	FAFourSteelRCPlaneStress.h
+	RAFourSteelRCPlaneStress.h
+	PrestressedConcretePlaneStress.h
+	FAPrestressedConcretePlaneStress.h
+	FAFourSteelPCPlaneStress.h
+	RAFourSteelPCPlaneStress.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/nD/soil/CMakeLists.txt b/SRC/material/nD/soil/CMakeLists.txt
new file mode 100644
index 000000000..182001c34
--- /dev/null
+++ b/SRC/material/nD/soil/CMakeLists.txt
@@ -0,0 +1,22 @@
+target_sources(material
+    PRIVATE
+	FluidSolidPorousMaterial.cpp
+	MultiYieldSurface.cpp
+	MultiYieldSurfaceClay.cpp
+	PressureDependMultiYield.cpp
+	PressureIndependMultiYield.cpp
+	T2Vector.cpp
+	PressureDependMultiYield02.cpp
+	PressureDependMultiYield03.cpp
+    PUBLIC
+	FluidSolidPorousMaterial.h
+	MultiYieldSurface.h
+	MultiYieldSurfaceClay.h
+	PressureDependMultiYield.h
+	PressureIndependMultiYield.h
+	T2Vector.h
+	PressureDependMultiYield02.h
+	PressureDependMultiYield03.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/nD/soil/MultiYieldSurfaceClay.cpp b/SRC/material/nD/soil/MultiYieldSurfaceClay.cpp
index 2a678dd73..7af61be2f 100644
--- a/SRC/material/nD/soil/MultiYieldSurfaceClay.cpp
+++ b/SRC/material/nD/soil/MultiYieldSurfaceClay.cpp
@@ -1278,18 +1278,10 @@ void MultiYieldSurfaceClay::setUpSurfaces (double * gredu)
 	
 	  double stressInc = peakShear / numOfSurfaces;
 
-#if !_DLL
-	  ofstream out("init_surface.out");
-	  out << "strain             stress" << endln;
-#endif
 	  for (int ii=1; ii<=numOfSurfaces; ii++){
         stress1 = ii * stressInc; 
 				stress2 = stress1 + stressInc;
         strain1 = stress1 * refStrain / (refShearModulus * refStrain - stress1);
-#if !_DLL
-		out << strain1 << "      " << stress1 << endln;
-#endif
-
 		strain2 = stress2 * refStrain / (refShearModulus * refStrain - stress2);
         if (frictionAngle > 0.) size = 3. * stress1 / sqrt(2.) / coneHeight;
         else if (frictionAngle == 0.) size = 3. * stress1 / sqrt(2.);
@@ -1309,9 +1301,6 @@ void MultiYieldSurfaceClay::setUpSurfaces (double * gredu)
 			temp.Zero();
         committedSurfaces[ii] = MultiYieldSurface(temp,size,plast_modul);
 		}  // ii
-#if !_DLL
-	  out.close();
-#endif
 	} 
 		else {  //user defined surfaces
 			if (frictionAngle > 0) {   // ignore user defined frictionAngle 
diff --git a/SRC/material/nD/stressDensityModel/CMakeLists.txt b/SRC/material/nD/stressDensityModel/CMakeLists.txt
new file mode 100644
index 000000000..d8ac42f0d
--- /dev/null
+++ b/SRC/material/nD/stressDensityModel/CMakeLists.txt
@@ -0,0 +1,19 @@
+target_sources(material
+    PRIVATE
+	stressDensity.cpp
+	SDM-UC.f
+	sdm3d.f90
+	sdm2d.f90
+	MODULE_ALL_INTERFACES_3D.f90
+	MODULE_ALL_INTERFACES_2D.f90
+	StressDensityModel.cpp
+	StressDensityModel2D.cpp 
+	StressDensityModel3D.cpp
+    PUBLIC
+	stressDensity.h
+	StressDensityModel.h
+	StressDensityModel2D.h
+	StressDensityModel3D.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/section/CMakeLists.txt b/SRC/material/section/CMakeLists.txt
new file mode 100644
index 000000000..874e1d379
--- /dev/null
+++ b/SRC/material/section/CMakeLists.txt
@@ -0,0 +1,71 @@
+target_sources(material
+    PRIVATE
+	SectionForceDeformation.cpp
+	FiberSection.cpp
+	ElasticSection2d.cpp
+	ElasticSection3d.cpp
+	ElasticShearSection2d.cpp 
+	ElasticShearSection3d.cpp
+	ElasticBDShearSection2d.cpp
+	ElasticWarpingShearSection2d.cpp
+	ElasticTubeSection3d.cpp
+	GenericSection1d.cpp
+	SectionAggregator.cpp
+	ParallelSection.cpp
+	ElasticPlateSection.cpp
+	ElasticMembranePlateSection.cpp
+	MembranePlateFiberSection.cpp
+	FiberSection2d.cpp
+	NDFiberSection2d.cpp
+	NDFiberSection3d.cpp
+	NDFiberSectionWarping2d.cpp
+	FiberSection2dThermal.cpp
+	FiberSection3d.cpp
+	FiberSectionGJ.cpp
+	Bidirectional.cpp
+	TimoshenkoSection3d.cpp
+	Isolator2spring.cpp
+	BiaxialHysteretic.cpp
+	LayeredShellFiberSection.cpp
+	LayeredShellFiberSectionThermal.cpp
+	FiberSection3dThermal.cpp
+	MembranePlateFiberSectionThermal.cpp
+	FiberSectionGJThermal.cpp
+    PUBLIC
+	SectionForceDeformation.h
+	FiberSection.h
+	ElasticSection2d.h 
+	ElasticSection3d.h
+	ElasticShearSection2d.h 
+	ElasticShearSection3d.h
+	ElasticBDShearSection2d.h
+	ElasticWarpingShearSection2d.h
+	ElasticTubeSection3d.h
+	GenericSection1d.h
+	SectionAggregator.h
+	ParallelSection.h
+	ElasticPlateSection.h
+	ElasticMembranePlateSection.h
+	MembranePlateFiberSection.h
+	FiberSection2d.h
+	NDFiberSection2d.h
+	NDFiberSection3d.h
+	NDFiberSectionWarping2d.h
+	FiberSection2dThermal.h
+	FiberSection3d.h
+	FiberSectionGJ.h
+	Bidirectional.h
+	TimoshenkoSection3d.h
+	Isolator2spring.h
+	BiaxialHysteretic.h
+	LayeredShellFiberSection.h
+	LayeredShellFiberSectionThermal.h
+	FiberSection3dThermal.h
+	MembranePlateFiberSectionThermal.h
+	FiberSectionGJThermal.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(fiber)
+add_subdirectory(integration)
diff --git a/SRC/material/section/LayeredShellFiberSection.cpp b/SRC/material/section/LayeredShellFiberSection.cpp
index 9f83e9168..6b09e2d05 100644
--- a/SRC/material/section/LayeredShellFiberSection.cpp
+++ b/SRC/material/section/LayeredShellFiberSection.cpp
@@ -106,7 +106,7 @@ void* OPS_LayeredShellFiberSection()
     }
       
     SectionForceDeformation* theSection = new LayeredShellFiberSection(tag, nLayers, thickness, theMats);
-    if (thickness != 0) delete thickness;
+    if (thickness != 0) delete [] thickness;
     if (theMats != 0) delete [] theMats;
 
     return theSection;
@@ -195,7 +195,7 @@ SectionForceDeformation  *LayeredShellFiberSection::getCopy( )
 					 nLayers,
 					 thickness,
 					 theFibers ) ; //make the copy
-    delete thickness;
+    delete [] thickness;
   }
   
   return clone ;
diff --git a/SRC/material/section/LayeredShellFiberSectionThermal.cpp b/SRC/material/section/LayeredShellFiberSectionThermal.cpp
index 9490863c7..49403911f 100644
--- a/SRC/material/section/LayeredShellFiberSectionThermal.cpp
+++ b/SRC/material/section/LayeredShellFiberSectionThermal.cpp
@@ -123,7 +123,7 @@ SectionForceDeformation  *LayeredShellFiberSectionThermal::getCopy( )
 					  nLayers,
 					  thickness,
 					  theFibers ) ; //make the copy
-    delete thickness;
+    delete [] thickness;
   }
   return clone ;
 }
diff --git a/SRC/material/section/TclModelBuilderSectionCommand.cpp b/SRC/material/section/TclModelBuilderSectionCommand.cpp
index 34ef9d45e..5788000c7 100755
--- a/SRC/material/section/TclModelBuilderSectionCommand.cpp
+++ b/SRC/material/section/TclModelBuilderSectionCommand.cpp
@@ -35,6 +35,7 @@
 
 #include <tcl.h>
 #include <elementAPI.h>
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
 
 #include <ElasticMaterial.h>
 
@@ -723,7 +724,7 @@ TclModelBuilderSectionCommand (ClientData clientData, Tcl_Interp *interp, int ar
       }
       
       theSection = new LayeredShellFiberSection(tag, nLayers, thickness, theMats);
-      if (thickness != 0) delete thickness;
+      if (thickness != 0) delete [] thickness;
       if (theMats != 0) delete [] theMats;
     }
     //end Yuli Huang & Xinzheng Lu LayeredShellFiberSection
@@ -831,7 +832,7 @@ TclModelBuilderSectionCommand (ClientData clientData, Tcl_Interp *interp, int ar
 		}
 
 		theSection = new LayeredShellFiberSectionThermal(tag, nLayers, thickness, theMats);
-		if (thickness != 0) delete thickness;
+		if (thickness != 0) delete [] thickness;
 		if (theMats != 0) delete[] theMats;
 	}
 	//end L.Jiang [SIF] added based on LayeredShellFiberSectionThermal section created by Yuli Huang & Xinzheng Lu ----
diff --git a/SRC/material/section/fiber/CMakeLists.txt b/SRC/material/section/fiber/CMakeLists.txt
new file mode 100644
index 000000000..02ae3e63a
--- /dev/null
+++ b/SRC/material/section/fiber/CMakeLists.txt
@@ -0,0 +1,17 @@
+target_sources(material
+    PRIVATE
+	Fiber.cpp
+	UniaxialFiber2d.cpp
+	UniaxialFiber3d.cpp
+	NDFiber2d.cpp
+	NDFiber3d.cpp
+    PUBLIC
+	Fiber.h
+	UniaxialFiber2d.h
+	UniaxialFiber3d.h
+	NDFiber2d.h
+	NDFiber3d.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
diff --git a/SRC/material/section/integration/CMakeLists.txt b/SRC/material/section/integration/CMakeLists.txt
new file mode 100644
index 000000000..cd62b2394
--- /dev/null
+++ b/SRC/material/section/integration/CMakeLists.txt
@@ -0,0 +1,20 @@
+target_sources(material
+    PRIVATE
+	SectionIntegration.cpp 
+	WideFlangeSectionIntegration.cpp 
+	RCSectionIntegration.cpp
+	RCTBeamSectionIntegration.cpp 
+	RCCircularSectionIntegration.cpp
+	TubeSectionIntegration.cpp 
+	RCTunnelSectionIntegration.cpp
+    PUBLIC
+	SectionIntegration.h 
+	WideFlangeSectionIntegration.h 
+	RCSectionIntegration.h
+	RCTBeamSectionIntegration.h 
+	RCCircularSectionIntegration.h
+	TubeSectionIntegration.h 
+	RCTunnelSectionIntegration.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/uniaxial/CMakeLists.txt b/SRC/material/uniaxial/CMakeLists.txt
new file mode 100644
index 000000000..57505d36f
--- /dev/null
+++ b/SRC/material/uniaxial/CMakeLists.txt
@@ -0,0 +1,261 @@
+
+target_sources(material
+    PRIVATE
+      UniaxialMaterial.cpp
+      ElasticMaterial.cpp
+      Elastic2Material.cpp
+      ElasticPowerFunc.cpp
+      UVCuniaxial.cpp
+      Bilin.cpp
+      Bilin02.cpp
+      IMKBilin.cpp
+      IMKPeakOriented.cpp
+      IMKPinching.cpp
+      Steel2.cpp
+      OriginCentered.cpp
+      ConcretewBeta.cpp
+      ConcreteD.cpp
+      ConcreteSakaiKawashima.cpp
+      ConcreteCM.cpp
+      SteelMPF.cpp
+      c14-SK-M.f
+      ElasticMultiLinear.cpp
+      ElasticPPMaterial.cpp
+      ElasticBilin.cpp
+      ParallelMaterial.cpp
+      ResilienceLow.cpp
+      AxialSp.cpp
+      BWBN.cpp
+      AxialSpHD.cpp
+      AxialSp.cpp
+      Neoprene.cpp
+      Maxwell.cpp
+      ViscousDamper.cpp
+      BilinearOilDamper.cpp
+      Cast.cpp
+      HardeningMaterial.cpp
+      HardeningMaterial2.cpp
+      Concrete01.cpp
+      Concrete02Thermal.cpp
+      Steel02Thermal.cpp
+      Steel01Thermal.cpp
+      Concrete04.cpp
+      Concrete06.cpp
+      Concrete07.cpp
+      ResilienceMaterialHR.cpp
+      RambergOsgoodSteel.cpp
+      Steel01.cpp
+      HystereticMaterial.cpp
+      EPPGapMaterial.cpp
+      ViscousMaterial.cpp
+      SeriesMaterial.cpp
+      InitStrainMaterial.cpp
+      InitStressMaterial.cpp
+      SimpleFractureMaterial.cpp
+      MinMaxMaterial.cpp
+      TensionOnlyMaterial.cpp
+      PathIndependentMaterial.cpp
+      CableMaterial.cpp
+      ENTMaterial.cpp
+      FedeasMaterial.cpp
+      DrainMaterial.cpp
+      BoucWenOriginal.cpp
+      BoucWenMaterial.cpp
+      HardeningMaterial2.cpp
+      Pinching4Material.cpp
+      BarSlipMaterial.cpp
+      FatigueMaterial.cpp
+      SteelMP.cpp
+      SmoothPSConcrete.cpp
+      Steel02.cpp
+      Steel02Fatigue.cpp
+      GNGMaterial.cpp
+      Concrete02.cpp
+      Concrete02IS.cpp
+      Steel03.cpp
+      MultiLinear.cpp
+      HookGap.cpp
+      Bond_SP01.cpp
+      UniaxialJ2Plasticity.cpp
+      HyperbolicGapMaterial.cpp
+      ImpactMaterial.cpp
+      ReinforcingSteel.cpp
+      ContinuumUniaxial.cpp
+      SecantConcrete.cpp
+      Concrete01WithSITC.cpp
+      ConcretewBeta.cpp
+      FRPConfinedConcrete.cpp
+      FRPConfinedConcrete02.cpp
+      KikuchiAikenHDR.cpp
+      KikuchiAikenLRB.cpp
+      Concrete05.cpp
+      ECC01.cpp
+      PrestressedSteelMaterial.cpp
+      ElasticBDMaterial.cpp
+      ShearPanelMaterial.cpp
+      SelfCenteringMaterial.cpp
+      BackboneMaterial.cpp
+      SAWSMaterial.cpp
+      ConfinedConcrete01.cpp
+      ModIMKPeakOriented.cpp
+      ModIMKPeakOriented02.cpp
+      ModIMKPinching.cpp
+      ModIMKPinching02.cpp
+      pyUCLA.cpp
+      Dodd_Restrepo.cpp
+      DoddRestrepo.f
+      STEELDR.f
+      DoddRestr.cpp
+      SteelBRB.cpp
+      CubicSpline.cpp
+      TriMatrix.cpp
+      CFSSSWP.cpp
+      CFSWSWP.cpp
+      Steel4.cpp
+      ConcreteECThermal.cpp
+      ElasticMaterialThermal.cpp
+      StainlessECThermal.cpp
+      SteelECThermal.cpp
+      DamperMaterial.cpp
+      MaterialState.cpp
+      OOHystereticMaterial.cpp
+      SPSW02.cpp
+      TDConcrete.cpp
+      TDConcreteEXP.cpp
+      TDConcreteMC10.cpp
+      TDConcreteMC10NL.cpp
+      DegradingPinchedBW.cpp
+    PUBLIC
+      UniaxialMaterial.h
+      ElasticMaterial.h
+      Elastic2Material.h
+      ElasticPowerFunc.h
+      UVCuniaxial.h
+      Bilin.h
+      Bilin02.h
+      IMKBilin.h
+      IMKPeakOriented.h
+      IMKPinching.h
+      Steel2.h
+      OriginCentered.h
+      ConcretewBeta.h
+      ConcreteD.h
+      ConcreteSakaiKawashima.h
+      ConcreteCM.h
+      SteelMPF.h
+      ElasticMultiLinear.h
+      ElasticPPMaterial.h
+      ElasticBilin.h
+      ParallelMaterial.h
+      ResilienceLow.h
+      AxialSp.h
+      BWBN.h
+      AxialSpHD.h
+      AxialSp.h
+      Neoprene.h
+      Maxwell.h
+      ViscousDamper.h
+      BilinearOilDamper.h
+      Cast.h
+      HardeningMaterial.h
+      HardeningMaterial2.h
+      Concrete01.h
+      Concrete02Thermal.h
+      Steel02Thermal.h
+      Steel01Thermal.h
+      Concrete04.h
+      Concrete06.h
+      Concrete07.h
+      ResilienceMaterialHR.h
+      RambergOsgoodSteel.h
+      Steel01.h
+      HystereticMaterial.h
+      EPPGapMaterial.h
+      ViscousMaterial.h
+      SeriesMaterial.h
+      InitStrainMaterial.h
+      InitStressMaterial.h
+      SimpleFractureMaterial.h
+      MinMaxMaterial.h
+      TensionOnlyMaterial.h
+      PathIndependentMaterial.h
+      CableMaterial.h
+      ENTMaterial.h
+      FedeasMaterial.h
+      DrainMaterial.h
+      BoucWenOriginal.h
+      BoucWenMaterial.h
+      SecantConcrete.h
+      HardeningMaterial2.h
+      Pinching4Material.h
+      BarSlipMaterial.h
+      FatigueMaterial.h
+      SteelMP.h
+      SmoothPSConcrete.h
+      Steel02.h
+      Steel02Fatigue.h
+      GNGMaterial.h
+      Concrete02.h
+      Concrete02IS.h
+      Steel03.h
+      MultiLinear.h
+      HookGap.h
+      Bond_SP01.h
+      UniaxialJ2Plasticity.h
+      HyperbolicGapMaterial.h
+      ImpactMaterial.h
+      ReinforcingSteel.h
+      ContinuumUniaxial.h
+      Concrete01WithSITC.h
+      ConcretewBeta.h
+      FRPConfinedConcrete.h
+      FRPConfinedConcrete02.h
+      KikuchiAikenHDR.h
+      KikuchiAikenLRB.h
+      Concrete05.h
+      ECC01.h
+      PrestressedSteelMaterial.h
+      ElasticBDMaterial.h
+      ShearPanelMaterial.h
+      SelfCenteringMaterial.h
+      BackboneMaterial.h
+      WrapperUniaxialMaterial.h
+      SAWSMaterial.h
+      ConfinedConcrete01.h
+      ModIMKPeakOriented.h
+      ModIMKPeakOriented02.h
+      ModIMKPinching.h
+      ModIMKPinching02.h
+      pyUCLA.h
+      Dodd_Restrepo.h
+      DoddRestr.h
+      SteelBRB.h
+      CubicSpline.h
+      TriMatrix.h
+      CFSSSWP.h
+      CFSWSWP.h
+      Steel4.h
+      ConcreteECThermal.h
+      ElasticMaterialThermal.h
+      StainlessECThermal.h
+      SteelECThermal.h
+      DamperMaterial.h
+      MaterialState.h
+      OOHystereticMaterial.h
+      SPSW02.h
+      TDConcrete.h
+      TDConcreteEXP.h
+      TDConcreteMC10.h
+      TDConcreteMC10NL.h
+      DegradingPinchedBW.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(PY)
+add_subdirectory(snap)
+add_subdirectory(backbone)
+add_subdirectory(stiffness)
+add_subdirectory(strength)
+add_subdirectory(unloading)
+add_subdirectory(limitState)
diff --git a/SRC/material/uniaxial/PY/CMakeLists.txt b/SRC/material/uniaxial/PY/CMakeLists.txt
new file mode 100644
index 000000000..caba05191
--- /dev/null
+++ b/SRC/material/uniaxial/PY/CMakeLists.txt
@@ -0,0 +1,30 @@
+target_sources(material
+    PRIVATE
+	PySimple1.cpp
+	QzSimple1.cpp
+	TzSimple1.cpp
+	PySimple2.cpp
+	PySimple3.cpp
+	QzSimple2.cpp
+	TzSimple2.cpp
+	ShallowFoundationGen.cpp
+	PyLiq1.cpp
+	TzLiq1.cpp
+	PySimple1Gen.cpp
+	TzSimple1Gen.cpp
+    PUBLIC
+	PySimple1.h
+	QzSimple1.h
+	TzSimple1.h
+	PySimple2.h
+	PySimple3.h
+	QzSimple2.h
+	TzSimple2.h
+	ShallowFoundationGen.h
+	PyLiq1.h
+	TzLiq1.h
+	PySimple1Gen.h
+	TzSimple1Gen.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/material/uniaxial/PY/QzSimple2.cpp b/SRC/material/uniaxial/PY/QzSimple2.cpp
index 8c86d5f0a..ecc078eef 100644
--- a/SRC/material/uniaxial/PY/QzSimple2.cpp
+++ b/SRC/material/uniaxial/PY/QzSimple2.cpp
@@ -55,11 +55,43 @@
 #include "QzSimple2.h"
 #include <Vector.h>
 #include <Channel.h>
+#include <elementAPI.h>
 
 // Controls on internal iterations between spring components
 const int QZmaxIterations = 20;
 const double QZtolerance = 1.0e-12;
 
+void* OPS_QzSimple2()
+{
+    int numdata = OPS_GetNumRemainingInputArgs();
+    if (numdata < 4) {
+	opserr << "WARNING insufficient arguments\n";
+	opserr << "Want: uniaxialMaterial QzSimple2 tag? qzType? qult? z50? suction? c?\n";
+	return 0;
+    }
+    
+    int idata[2];
+    numdata = 2;
+    if (OPS_GetIntInput(&numdata, idata) < 0) {
+	opserr << "WARNING invalid int inputs\n";
+	return 0;
+    }
+    
+    double ddata[4] = {0,0,0,0};
+    numdata = OPS_GetNumRemainingInputArgs();
+    if (numdata > 4) numdata = 4;
+    if (OPS_GetDoubleInput(&numdata, ddata) < 0) {
+	opserr << "WARNING invalid double inputs\n";
+	return 0;
+    }
+    
+    UniaxialMaterial *theMaterial = 0;
+    theMaterial = new QzSimple2(idata[0], idata[1], ddata[0], ddata[1],
+				ddata[2], ddata[3]);
+    
+    return theMaterial;
+}
+
 /////////////////////////////////////////////////////////////////////
 //	Constructor with data
 
diff --git a/SRC/material/uniaxial/SteelBRB.cpp b/SRC/material/uniaxial/SteelBRB.cpp
index 1378fc442..65acd9a46 100755
--- a/SRC/material/uniaxial/SteelBRB.cpp
+++ b/SRC/material/uniaxial/SteelBRB.cpp
@@ -119,11 +119,6 @@ SteelBRB::SteelBRB(int pTag, double pE,double pSigmaY0, double pSigmaY_T,double
 	SHVs = 0;
 // AddingSensitivity:END //////////////////////////////////////
 
-#if !_DLL
-	debug1 = new ofstream("stress_sens_debug.out");
-
-	debug1->precision(16);
-#endif
 
 
 
@@ -135,10 +130,6 @@ SteelBRB::~SteelBRB()
 
 //	opserr<<"SteelBRB::~SteelBRB() is called!"<<endln; 
 
-#if !_DLL
-	debug1->close();
-	delete debug1;
-#endif
 }
 
 int 
diff --git a/SRC/material/uniaxial/SteelBRB.h b/SRC/material/uniaxial/SteelBRB.h
index 584ddc8fe..8af7fe37f 100755
--- a/SRC/material/uniaxial/SteelBRB.h
+++ b/SRC/material/uniaxial/SteelBRB.h
@@ -141,9 +141,6 @@ class SteelBRB : public UniaxialMaterial
 
 	double Tol;
  
-#if !_DLL
-	ofstream* debug1;
-#endif
 
 
 };
diff --git a/SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp b/SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp
index 5fe54c6ff..7546322fc 100644
--- a/SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp
+++ b/SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp
@@ -35,6 +35,8 @@
 
 #include <tcl.h>
 #include <elementAPI.h>
+extern "C" int OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+
 
 #include <Elastic2Material.h>	// ZHY
 #include <HardeningMaterial.h>	// MHS
diff --git a/SRC/material/uniaxial/backbone/CMakeLists.txt b/SRC/material/uniaxial/backbone/CMakeLists.txt
new file mode 100644
index 000000000..68515fd44
--- /dev/null
+++ b/SRC/material/uniaxial/backbone/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+target_sources(material
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/backbone/TclModelBuilderBackboneCommand.cpp b/SRC/material/uniaxial/backbone/TclModelBuilderBackboneCommand.cpp
index 1f3f63977..6f7ed60a8 100644
--- a/SRC/material/uniaxial/backbone/TclModelBuilderBackboneCommand.cpp
+++ b/SRC/material/uniaxial/backbone/TclModelBuilderBackboneCommand.cpp
@@ -33,6 +33,7 @@
 
 #include <tcl.h>
 #include <elementAPI.h>
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
 
 #include <TrilinearBackbone.h>
 #include <MultilinearBackbone.h>
diff --git a/SRC/material/uniaxial/drain/CMakeLists.txt b/SRC/material/uniaxial/drain/CMakeLists.txt
new file mode 100644
index 000000000..b0c72c559
--- /dev/null
+++ b/SRC/material/uniaxial/drain/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+target_sources(material
+    PRIVATE
+	DrainHardeningMaterial.cpp
+	anal00.f
+	common00.f
+	DrainBilinearMaterial.cpp
+	DrainClough1Material.cpp
+	DrainClough2Material.cpp
+	DrainPinch1Material.cpp
+    PUBLIC
+	DrainHardeningMaterial.h
+	DrainBilinearMaterial.h
+	DrainClough1Material.h
+	DrainClough2Material.h
+	DrainPinch1Material.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/fedeas/CMakeLists.txt b/SRC/material/uniaxial/fedeas/CMakeLists.txt
new file mode 100644
index 000000000..68515fd44
--- /dev/null
+++ b/SRC/material/uniaxial/fedeas/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+target_sources(material
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/limitState/CMakeLists.txt b/SRC/material/uniaxial/limitState/CMakeLists.txt
new file mode 100644
index 000000000..68515fd44
--- /dev/null
+++ b/SRC/material/uniaxial/limitState/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+target_sources(material
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/limitState/PinchingLimitStateMaterial.cpp b/SRC/material/uniaxial/limitState/PinchingLimitStateMaterial.cpp
index 2aca4bf30..5b128a9bd 100644
--- a/SRC/material/uniaxial/limitState/PinchingLimitStateMaterial.cpp
+++ b/SRC/material/uniaxial/limitState/PinchingLimitStateMaterial.cpp
@@ -61,7 +61,7 @@ OPS_PinchingLimitState(void)
 {
   if (numPinchingLimitStateMaterial == 0) {
     numPinchingLimitStateMaterial++;
-    opserr << "PinchingLimitStateMaterial unaxial material - Written by MRL UT Austin Copyright 2012 - Use at Your Peril\n";
+    //opserr << "PinchingLimitStateMaterial unaxial material - Written by MRL UT Austin Copyright 2012 - Use at Your Peril\n";
   }
 
   UniaxialMaterial *theMaterial = 0;
diff --git a/SRC/material/uniaxial/limitState/TclLimitState.cpp b/SRC/material/uniaxial/limitState/TclLimitState.cpp
index aed1ad548..e404f6160 100644
--- a/SRC/material/uniaxial/limitState/TclLimitState.cpp
+++ b/SRC/material/uniaxial/limitState/TclLimitState.cpp
@@ -36,7 +36,10 @@
 #include <TclModelBuilder.h> //MRL
 
 #include <string.h>
+#include <tcl.h>
 #include <elementAPI.h>//MRL
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+
 #include <packages.h>//MRL
 #include <LimitCurve.h>//**MRL
 
diff --git a/SRC/material/uniaxial/limitState/limitCurve/AxialCurve.cpp b/SRC/material/uniaxial/limitState/limitCurve/AxialCurve.cpp
index 1a94087a5..bdab61e1f 100644
--- a/SRC/material/uniaxial/limitState/limitCurve/AxialCurve.cpp
+++ b/SRC/material/uniaxial/limitState/limitCurve/AxialCurve.cpp
@@ -361,16 +361,9 @@ AxialCurve::checkElementState(double springForce)
 		
 		//cout << "force = " << force << ", forceSurface = " << forceSurface << endln;
 
-		char tclAssignment[100]="";
-
 		if (stateFlag == 0) //prior to failure
 		{
 
-			sprintf(tclAssignment , "set fail_%d  0", eleTag);
-#if !_DLL
-			Tcl_Eval(theTclInterp, tclAssignment);
-#endif
-
 
 			if (force >= forceSurface) // on/outside failure surface
 			//if (deform >= deformSurface) // on/outside failure surface SDK
@@ -410,11 +403,6 @@ AxialCurve::checkElementState(double springForce)
 
 					outputFile.close();
 
-					sprintf(tclAssignment , "set fail_%d  1", eleTag);
-#if !_DLL
-					Tcl_Eval(theTclInterp, tclAssignment);
-#endif
-
 				}
 			}
 			else // inside failure surface
diff --git a/SRC/material/uniaxial/limitState/limitCurve/RotationShearCurve.cpp b/SRC/material/uniaxial/limitState/limitCurve/RotationShearCurve.cpp
index 31f508810..62343fd0d 100644
--- a/SRC/material/uniaxial/limitState/limitCurve/RotationShearCurve.cpp
+++ b/SRC/material/uniaxial/limitState/limitCurve/RotationShearCurve.cpp
@@ -58,7 +58,7 @@ void *
 OPS_RotationShearCurve(void)
 {
   if (shearCurveCount == 0) {
-    opserr << "RotationShearCurve limit curve - Written by MRL UT Austin Copyright 2012 -  Use at your Own Peril \n";
+    //opserr << "RotationShearCurve limit curve - Written by MRL UT Austin Copyright 2012 -  Use at your Own Peril \n";
     shearCurveCount++;
   }
 
diff --git a/SRC/material/uniaxial/snap/CMakeLists.txt b/SRC/material/uniaxial/snap/CMakeLists.txt
new file mode 100644
index 000000000..34279dadb
--- /dev/null
+++ b/SRC/material/uniaxial/snap/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+target_sources(material
+    PRIVATE
+	Pinching.cpp
+	Bilinear.cpp
+	Clough.cpp
+	CloughHenry.cpp
+	CloughDamage.cpp
+	PinchingDamage.cpp
+    PUBLIC
+	Pinching.h
+	Bilinear.h
+	Clough.h
+	CloughHenry.h
+	CloughDamage.h
+	PinchingDamage.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/stiffness/CMakeLists.txt b/SRC/material/uniaxial/stiffness/CMakeLists.txt
new file mode 100644
index 000000000..68515fd44
--- /dev/null
+++ b/SRC/material/uniaxial/stiffness/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+target_sources(material
+    PRIVATE
+
+    PUBLIC
+
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/stiffness/TclModelBuilderStiffnessDegradationCommand.cpp b/SRC/material/uniaxial/stiffness/TclModelBuilderStiffnessDegradationCommand.cpp
index 5599bac5a..a69d1e225 100644
--- a/SRC/material/uniaxial/stiffness/TclModelBuilderStiffnessDegradationCommand.cpp
+++ b/SRC/material/uniaxial/stiffness/TclModelBuilderStiffnessDegradationCommand.cpp
@@ -31,6 +31,7 @@
 #include <OPS_Globals.h>
 
 #include <TclModelBuilder.h>
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
 
 #include <DuctilityStiffnessDegradation.h>
 #include <EnergyStiffnessDegradation.h>
diff --git a/SRC/material/uniaxial/strength/CMakeLists.txt b/SRC/material/uniaxial/strength/CMakeLists.txt
new file mode 100644
index 000000000..1d117186a
--- /dev/null
+++ b/SRC/material/uniaxial/strength/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+target_sources(material
+    PRIVATE
+	StrengthDegradation.cpp
+	ACIStrengthDegradation.cpp 
+	ConstantStrengthDegradation.cpp
+	DuctilityStrengthDegradation.cpp 
+	EnergyStrengthDegradation.cpp
+	PetrangeliStrengthDegradation.cpp 
+	SectionStrengthDegradation.cpp
+    PUBLIC
+	StrengthDegradation.h
+	ACIStrengthDegradation.h 
+	ConstantStrengthDegradation.h
+	DuctilityStrengthDegradation.h 
+	EnergyStrengthDegradation.h
+	PetrangeliStrengthDegradation.h 
+	SectionStrengthDegradation.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/strength/TclModelBuilderStrengthDegradationCommand.cpp b/SRC/material/uniaxial/strength/TclModelBuilderStrengthDegradationCommand.cpp
index e58d8c868..0ab37911b 100644
--- a/SRC/material/uniaxial/strength/TclModelBuilderStrengthDegradationCommand.cpp
+++ b/SRC/material/uniaxial/strength/TclModelBuilderStrengthDegradationCommand.cpp
@@ -32,6 +32,8 @@
 
 #include <TclModelBuilder.h>
 
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+
 #include <SectionStrengthDegradation.h>
 #include <EnergyStrengthDegradation.h>
 #include <ConstantStrengthDegradation.h>
diff --git a/SRC/material/uniaxial/unloading/CMakeLists.txt b/SRC/material/uniaxial/unloading/CMakeLists.txt
new file mode 100644
index 000000000..1298ec1da
--- /dev/null
+++ b/SRC/material/uniaxial/unloading/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+target_sources(material
+    PRIVATE
+	UnloadingRule.cpp
+	ConstantUnloadingRule.cpp 
+	EnergyUnloadingRule.cpp
+	KarsanUnloadingRule.cpp 
+	TakedaUnloadingRule.cpp
+    PUBLIC
+	UnloadingRule.h
+	ConstantUnloadingRule.h 
+	EnergyUnloadingRule.h
+	KarsanUnloadingRule.h 
+	TakedaUnloadingRule.h
+)
+
+target_include_directories(material PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+
diff --git a/SRC/material/uniaxial/unloading/TclModelBuilderUnloadingRuleCommand.cpp b/SRC/material/uniaxial/unloading/TclModelBuilderUnloadingRuleCommand.cpp
index 37bfb0809..244f4c13b 100644
--- a/SRC/material/uniaxial/unloading/TclModelBuilderUnloadingRuleCommand.cpp
+++ b/SRC/material/uniaxial/unloading/TclModelBuilderUnloadingRuleCommand.cpp
@@ -41,7 +41,10 @@ extern void *OPS_EnergyUnloadingRule(void);
 extern void *OPS_ConstantUnloadingRule(void);
 extern void *OPS_KarsanUnloadingRule(void);
 
+#include <tcl.h>
 #include <elementAPI.h>
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+
 #include <packages.h>
 
 int
diff --git a/SRC/matrix/CMakeLists.txt b/SRC/matrix/CMakeLists.txt
new file mode 100644
index 000000000..54941210d
--- /dev/null
+++ b/SRC/matrix/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_library(matrix "")
+
+target_sources(matrix
+    PRIVATE
+      Matrix.cpp
+      Vector.cpp
+      ID.cpp
+    PUBLIC
+      Matrix.h
+      Vector.h
+      ID.h
+)
+
+
+target_include_directories(matrix PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/matrix/ID.h b/SRC/matrix/ID.h
index 94edf06d9..7c2485b72 100644
--- a/SRC/matrix/ID.h
+++ b/SRC/matrix/ID.h
@@ -57,17 +57,6 @@ class ID
     int resize(int newSize, int fill_value=0);
     int fill(int fill_value);
 
-#if _DLL
-	inline int* GetData() { return this->data; }
-	void Print() {
-		opserr << "[";
-		for (int i = 0; i < this->sz; i++)
-		{
-			opserr << this->operator()(i) << ", ";
-		}
-		opserr << "]" << endln;
-	}
-#endif
     // overloaded operators
     inline int &operator()(int x);
     inline int operator()(int x) const;
diff --git a/SRC/matrix/Matrix.cpp b/SRC/matrix/Matrix.cpp
index 5b2731323..92b9baf33 100644
--- a/SRC/matrix/Matrix.cpp
+++ b/SRC/matrix/Matrix.cpp
@@ -42,12 +42,6 @@ using std::nothrow;
 #define MATRIX_WORK_AREA 400
 #define INT_WORK_AREA 20
 
-#ifdef _WIN32
-#ifdef _USRDLL
-#define _DLL
-#endif
-#endif
-
 #include <math.h>
 
 int Matrix::sizeDoubleWork = MATRIX_WORK_AREA;
@@ -335,7 +329,7 @@ Matrix::Assemble(const Matrix &V, const ID &rows, const ID &cols, double fact)
 }
 
 #ifdef _WIN32
-//#ifndef _DLL
+
 extern "C" int  DGESV(int *N, int *NRHS, double *A, int *LDA, 
 			      int *iPiv, double *B, int *LDB, int *INFO);
 
@@ -445,13 +439,9 @@ Matrix::Solve(const Vector &b, Vector &x) const
     
 
 #ifdef _WIN32
-//#ifndef _DLL
+
     DGESV(&n,&nrhs,Aptr,&ldA,iPIV,Xptr,&ldB,&info);
-//#endif
-//#ifdef _DLL
-//	opserr << "Matrix::Solve - not implemented in dll\n";
-//	return -1;
-//#endif
+
 #else
     dgesv_(&n,&nrhs,Aptr,&ldA,iPIV,Xptr,&ldB,&info);
 #endif
@@ -542,13 +532,9 @@ Matrix::Solve(const Matrix &b, Matrix &x) const
 	info = -1;
 
 #ifdef _WIN32
-//#ifndef _DLL
+
     DGESV(&n,&nrhs,Aptr,&ldA,iPIV,Xptr,&ldB,&info);
-//#endif
-//#ifdef _DLL
-//	opserr << "Matrix::Solve - not implemented in dll\n";
-//	return -1;
-//#endif
+
 #else
     dgesv_(&n,&nrhs,Aptr,&ldA,iPIV,Xptr,&ldB,&info);
 
@@ -640,23 +626,14 @@ Matrix::Invert(Matrix &theInverse) const
     
 
 #ifdef _WIN32
-//#ifndef _DLL
+
     DGETRF(&n,&n,Aptr,&ldA,iPIV,&info);
-//#endif
-//#ifdef _DLL
-//	opserr << "Matrix::Solve - not implemented in dll\n";
-//	return -1;
-//#endif
+
     if (info != 0) 
       return -abs(info);
 
-//#ifndef _DLL
     DGETRI(&n,Aptr,&ldA,iPIV,Wptr,&workSize,&info);
-//#endif
-//#ifdef _DLL
-//	opserr << "Matrix::Solve - not implemented in dll\n";
-//	return -1;
-//#endif
+
 #else
     dgetrf_(&n,&n,Aptr,&ldA,iPIV,&info);
     if (info != 0) 
diff --git a/SRC/matrix/Matrix.h b/SRC/matrix/Matrix.h
index 5776b4f1c..7de7e371e 100644
--- a/SRC/matrix/Matrix.h
+++ b/SRC/matrix/Matrix.h
@@ -79,22 +79,7 @@ class Matrix
     int addMatrixTransposeProduct(double factThis, const Matrix &A, const Matrix &B, double factOther); // A'B
     int addMatrixTripleProduct(double factThis, const Matrix &A, const Matrix &B, double factOther); // A'BA
     int addMatrixTripleProduct(double factThis, const Matrix &A, const Matrix &B, const Matrix &C, double otherFact); //A'BC
-#if _DLL
-	inline double* GetData() { return this->data; }
-	void Print() {
-		opserr << "[ ";
-		for (int i = 0; i < this->numRows; i++)
-		{
-			for (int j = 0; j < this->numCols - 1; j++)
-			{
-				opserr << this->operator()(i, j) << ", ";
-			}
-			opserr << this->operator()(i, this->numCols - 1) << " ";
-			opserr << ";" << endln;
-		}
-		opserr << "] " << endln;
-	}
-#endif
+
     // overloaded operators 
     inline double &operator()(int row, int col);
     inline double operator()(int row, int col) const;
diff --git a/SRC/matrix/Vector.h b/SRC/matrix/Vector.h
index 55a3a51a2..4183fcda8 100644
--- a/SRC/matrix/Vector.h
+++ b/SRC/matrix/Vector.h
@@ -67,26 +67,7 @@ class Vector
     int addVector(double factThis, const Vector &other, double factOther);
     int addMatrixVector(double factThis, const Matrix &m, const Vector &v, double factOther); 
     int addMatrixTransposeVector(double factThis, const Matrix &m, const Vector &v, double factOther);
-#if _DLL
-	inline double* GetData() { return this->theData; }
-	void Print() {
-		opserr << "[";
-		for (int i = 0; i < this->sz; i++)
-		{
-			opserr << this->operator()(i) << ", ";
-		}
-		opserr << "]" << endln;
-	}
-
-	void Print() const {
-		opserr << "[";
-		for (int i = 0; i < this->sz; i++)
-		{
-			opserr << this->operator()(i) << ", ";
-		}
-		opserr << "]" << endln;
-	}
-#endif
+
     // overloaded operators
     inline double operator()(int x) const;
     inline double &operator()(int x);
@@ -175,7 +156,7 @@ Vector::operator()(int x) const
   }
 #endif
 
-      return theData[x];
+  return theData[x];
 }
 
 
@@ -183,7 +164,7 @@ inline double &
 Vector::operator()(int x)
 {
 #ifdef _G3DEBUG
-    // check if it is inside range [0,sz-1]
+  // check if it is inside range [0,sz-1]
   if (x < 0 || x >= sz) {
       opserr << "Vector::(loc) - loc " << x << " outside range [0, " << sz-1 << endln;
       return VECTOR_NOT_VALID_ENTRY;
diff --git a/SRC/recorder/CMakeLists.txt b/SRC/recorder/CMakeLists.txt
new file mode 100644
index 000000000..e38ff94f2
--- /dev/null
+++ b/SRC/recorder/CMakeLists.txt
@@ -0,0 +1,54 @@
+add_library(recorder "")
+
+target_sources(recorder
+    PRIVATE
+      AlgorithmIncrements.cpp
+      DamageRecorder.cpp
+      DatastoreRecorder.cpp
+      DriftRecorder.cpp
+      ElementRecorder.cpp
+      ElementRecorderRMS.cpp
+      EnvelopeDriftRecorder.cpp
+      EnvelopeElementRecorder.cpp
+      EnvelopeNodeRecorder.cpp
+      FilePlotter.cpp
+      GSA_Recorder.cpp
+      GmshRecorder.cpp
+      MPCORecorder.cpp
+      MaxNodeDispRecorder.cpp
+      NodeRecorder.cpp
+      NodeRecorderRMS.cpp
+      NormElementRecorder.cpp
+      NormEnvelopeElementRecorder.cpp
+      PVDRecorder.cpp
+      PatternRecorder.cpp
+      Recorder.cpp
+      RemoveRecorder.cpp
+      VTK_Recorder.cpp
+    PUBLIC
+      AlgorithmIncrements.h
+      DamageRecorder.h
+      DatastoreRecorder.h
+      DriftRecorder.h
+      ElementRecorder.h
+      ElementRecorderRMS.h
+      EnvelopeDriftRecorder.h
+      EnvelopeElementRecorder.h
+      EnvelopeNodeRecorder.h
+      FilePlotter.h
+      GSA_Recorder.h
+      GmshRecorder.h
+      MPCORecorder.h
+      MaxNodeDispRecorder.h
+      NodeRecorder.h
+      NodeRecorderRMS.h
+      NormElementRecorder.h
+      NormEnvelopeElementRecorder.h
+      PVDRecorder.h
+      PatternRecorder.h
+      Recorder.h
+      RemoveRecorder.h
+      VTK_Recorder.h
+)
+
+target_include_directories(recorder PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/SRC/recorder/TclRecorderCommands.cpp b/SRC/recorder/TclRecorderCommands.cpp
index c4dcb5caf..c704c1b47 100644
--- a/SRC/recorder/TclRecorderCommands.cpp
+++ b/SRC/recorder/TclRecorderCommands.cpp
@@ -36,12 +36,15 @@
 
  #include <tcl.h>
 
+
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <Domain.h>
  #include <EquiSolnAlgo.h>
 
+
+
  // recorders
  #include <NodeRecorder.h>
  #include <EnvelopeNodeRecorder.h>
@@ -53,7 +56,7 @@
  #include <NormElementRecorder.h>
  #include <NormEnvelopeElementRecorder.h>
  #include <PVDRecorder.h>
- #include <MPCORecorder.h>
+// #include <MPCORecorder.h>
  #include <GmshRecorder.h>
  #include <VTK_Recorder.h>
 extern void* OPS_PVDRecorder();
@@ -88,6 +91,7 @@ extern void* OPS_NodeRecorderRMS();
 
  #include <packages.h>
  #include <elementAPI.h>
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
 
 
  extern TimeSeries *TclSeriesCommand(ClientData clientData, Tcl_Interp *interp, TCL_Char *arg);
@@ -1852,6 +1856,7 @@ enum outputMode  {STANDARD_STREAM, DATA_STREAM, XML_STREAM, DATABASE_STREAM, BIN
        OPS_ResetInputNoBuilder(clientData, interp, 2, argc, argv, &theDomain);
        (*theRecorder) = (Recorder*) OPS_VTK_Recorder();
      }
+     /*
      else if (strcmp(argv[1], "mpco") == 0) {
        OPS_ResetInputNoBuilder(clientData, interp, 2, argc, argv, &theDomain);
        (*theRecorder) = (Recorder*)OPS_MPCORecorder();
@@ -1859,6 +1864,7 @@ enum outputMode  {STANDARD_STREAM, DATA_STREAM, XML_STREAM, DATABASE_STREAM, BIN
 	 return TCL_ERROR;
        }
      }
+     */
      else if (strcmp(argv[1],"gmsh") == 0 || strcmp(argv[1],"GMSH") == 0) {
        OPS_ResetInputNoBuilder(clientData, interp, 2, argc, argv, &theDomain);
        (*theRecorder) = (Recorder*) OPS_GmshRecorder();
diff --git a/SRC/renderer/CMakeLists.txt b/SRC/renderer/CMakeLists.txt
new file mode 100644
index 000000000..4d164bc36
--- /dev/null
+++ b/SRC/renderer/CMakeLists.txt
@@ -0,0 +1,11 @@
+if(APPLE)
+
+endif()
+
+if(UNIX AND NOT APPLE)
+
+endif()
+
+if(WIN32)
+
+endif()
diff --git a/SRC/renderer/OpenGlRenderer.cpp b/SRC/renderer/OpenGlRenderer.cpp
index d69b0c097..c59575c01 100644
--- a/SRC/renderer/OpenGlRenderer.cpp
+++ b/SRC/renderer/OpenGlRenderer.cpp
@@ -341,9 +341,9 @@ OpenGLRenderer::startImage(void)
 	double VRPn = -PRPn;  // VRP after T(-PRP)
 	float near2 = PRPn-F;
 	float far2  = PRPn-B;
-	float zMin = near2/far2;
 
 	/**************** Having trouble with the following transformation ******
+	float zMin = near2/far2;
 	float a,b,c,e,f,g,h;
 
 	a = 2.0*PRPn/(diffU * far);
@@ -486,6 +486,7 @@ OpenGLRenderer::drawLine(const Vector &pos1, const Vector &pos2,
     if (pos1(0) == pos2(0) && pos1(1) == pos2(1) && pos1(2) == pos2(2))
       return 0;
 
+    width = 2; // S. Mazzoni
     glLineWidth(width);
 
     glBegin(GL_LINES);
@@ -526,6 +527,7 @@ OpenGLRenderer::drawLine(const Vector &end1, const Vector &end2,
     if (end1(0) == end2(0) && end1(1) == end2(1) && end1(2) == end2(2))
       return 0;
 
+    width = 2; // S. Mazzoni
     glLineWidth(width);
 
     glBegin(GL_LINES);
diff --git a/SRC/system_of_eqn/CMakeLists.txt b/SRC/system_of_eqn/CMakeLists.txt
new file mode 100644
index 000000000..20d2d6eb9
--- /dev/null
+++ b/SRC/system_of_eqn/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library(systemOfEqn "")
+
+target_sources(systemOfEqn
+    PRIVATE
+    PUBLIC
+	Solver.h
+	SystemOfEqn.h
+)
+
+target_include_directories(systemOfEqn PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(linearSOE)
+add_subdirectory(eigenSOE)
diff --git a/SRC/system_of_eqn/eigenSOE/ArpackSOE.cpp b/SRC/system_of_eqn/eigenSOE/ArpackSOE.cpp
index 8a5edebec..b6800d3a5 100644
--- a/SRC/system_of_eqn/eigenSOE/ArpackSOE.cpp
+++ b/SRC/system_of_eqn/eigenSOE/ArpackSOE.cpp
@@ -33,9 +33,7 @@
 #include <Graph.h>
 #include <Vertex.h>
 #include <VertexIter.h>
-#if !_DLL
 #include <f2c.h>
-#endif
 #include <math.h>
 #include <Channel.h>
 #include <FEM_ObjectBroker.h>
diff --git a/SRC/system_of_eqn/eigenSOE/ArpackSolver.cpp b/SRC/system_of_eqn/eigenSOE/ArpackSolver.cpp
index ecf37d54b..037eb6c4e 100644
--- a/SRC/system_of_eqn/eigenSOE/ArpackSolver.cpp
+++ b/SRC/system_of_eqn/eigenSOE/ArpackSolver.cpp
@@ -103,16 +103,7 @@ extern "C" int  DSAUPD(int *ido, char* bmat,
 		       int *ldv,
 		       int *iparam, int *ipntr, double *workd, double *workl,
 		       int *lworkl, int *info);
-#if _DLL
-extern "C" int  DSEUPD(bool* rvec, char* howmny,
-	long int* select, double* d, double* z,
-	int* ldz, double* sigma, char* bmat,
-	int* n, char* which,
-	int* nev, double* tol, double* resid, int* ncv,
-	double* v,
-	int* ldv, int* iparam, int* ipntr, double* workd,
-	double* workl, int* lworkl, int* info);
-#else
+
 extern "C" int  DSEUPD(bool *rvec, char *howmny,
 		       logical *select, double *d, double *z,
 		       int *ldz, double *sigma, char *bmat,
@@ -121,7 +112,6 @@ extern "C" int  DSEUPD(bool *rvec, char *howmny,
 		       double *v,
 		       int *ldv, int *iparam, int *ipntr, double *workd, 
 		       double *workl, int *lworkl, int *info);
-#endif
 #else
 
 extern "C" int dsaupd_(int *ido, char* bmat, int *n, char *which, int *nev, 
@@ -183,11 +173,7 @@ ArpackSolver::solve(int numModes, bool generalized, bool findSmallest)
     eigenvalues = new double[nev];
     eigenvectors = new double[n * nev];
     resid = new double[n];
-#if _DLL
-	select = new long int[ncv];
-#else
-	select = new logical[ncv];
-#endif
+    select = new logical[ncv];
 
     for (int i=0; i<lworkl+1; i++)
 	   workl[i] = 0;
diff --git a/SRC/system_of_eqn/eigenSOE/ArpackSolver.h b/SRC/system_of_eqn/eigenSOE/ArpackSolver.h
index 2ee06ef8a..615179c95 100644
--- a/SRC/system_of_eqn/eigenSOE/ArpackSolver.h
+++ b/SRC/system_of_eqn/eigenSOE/ArpackSolver.h
@@ -46,9 +46,7 @@
 
 #include <EigenSolver.h>
 #include <ArpackSOE.h>
-#if !_DLL
 #include <f2c.h>
-#endif
 
 class LinearSOE;
 
@@ -89,11 +87,8 @@ class ArpackSolver : public EigenSolver
     double *resid;
     int iparam[11];
     int ipntr[11];
-#if _DLL
-	long int* select;
-#else
-	logical* select;
-#endif
+  //	long int* select;
+  logical* select;
     
     void myMv(int n, double *v, double *result);
     void myCopy(int n, double *v, double *result);
diff --git a/SRC/system_of_eqn/linearSOE/bandSPD/DistributedBandSPDLinSOE.cpp b/SRC/system_of_eqn/linearSOE/bandSPD/DistributedBandSPDLinSOE.cpp
index b01df12d5..bd35bdc25 100644
--- a/SRC/system_of_eqn/linearSOE/bandSPD/DistributedBandSPDLinSOE.cpp
+++ b/SRC/system_of_eqn/linearSOE/bandSPD/DistributedBandSPDLinSOE.cpp
@@ -34,9 +34,7 @@
 #include <Graph.h>
 #include <Vertex.h>
 #include <VertexIter.h>
-#if !_DLL
 #include <f2c.h>
-#endif
 #include <math.h>
 #include <Channel.h>
 #include <FEM_ObjectBroker.h>
diff --git a/SRC/tagged/CMakeLists.txt b/SRC/tagged/CMakeLists.txt
new file mode 100644
index 000000000..eab9a274c
--- /dev/null
+++ b/SRC/tagged/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(tagged "")
+
+target_sources(tagged
+    PRIVATE
+      TaggedObject.cpp
+    PUBLIC
+      TaggedObject.h
+)
+
+target_include_directories(tagged PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
+add_subdirectory(storage)
diff --git a/SRC/tagged/storage/CMakeLists.txt b/SRC/tagged/storage/CMakeLists.txt
new file mode 100644
index 000000000..2320fef44
--- /dev/null
+++ b/SRC/tagged/storage/CMakeLists.txt
@@ -0,0 +1,15 @@
+target_sources(tagged
+    PRIVATE
+      ArrayOfTaggedObjects.cpp 
+      ArrayOfTaggedObjectsIter.cpp
+      MapOfTaggedObjectsIter.cpp 
+      MapOfTaggedObjects.cpp
+    PUBLIC
+      ArrayOfTaggedObjects.h 
+      ArrayOfTaggedObjectsIter.h
+      MapOfTaggedObjectsIter.h 
+      MapOfTaggedObjects.h
+)
+
+target_include_directories(tagged PUBLIC $(CMAKE_CURRENT_LIST_DIR))
+
diff --git a/SRC/tcl/commands.cpp b/SRC/tcl/commands.cpp
index d22be31f9..49234cbed 100644
--- a/SRC/tcl/commands.cpp
+++ b/SRC/tcl/commands.cpp
@@ -86,6 +86,8 @@ OPS_Stream *opserrPtr = &sserr;
 #include <string.h>
 
 #include <elementAPI.h>
+extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp * interp, int cArg, int mArg, TCL_Char * *argv, Domain * domain);
+
 #include <packages.h>
 
 #include <FEM_ObjectBrokerAllClasses.h>
diff --git a/SRC/utility/CMakeLists.txt b/SRC/utility/CMakeLists.txt
new file mode 100644
index 000000000..5a987fee1
--- /dev/null
+++ b/SRC/utility/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_library(utility "")
+
+target_sources(utility
+    PRIVATE
+	Timer.cpp 
+	FileIter.cpp 
+	File.cpp 
+	SimulationInformation.cpp 
+	StringContainer.cpp 
+    PUBLIC
+	Timer.h 
+	FileIter.h 
+	File.h 
+	SimulationInformation.h 
+	StringContainer.h 
+)
+
+target_include_directories(utility PUBLIC $(CMAKE_CURRENT_LIST_DIR))
diff --git a/Win32/proj/element/element.vcxproj b/Win32/proj/element/element.vcxproj
index d9851f5d5..889e788fe 100644
--- a/Win32/proj/element/element.vcxproj
+++ b/Win32/proj/element/element.vcxproj
@@ -106,13 +106,16 @@
     <ClCompile Include="..\..\..\OTHER\tetgen1.4.3\tetgen.cxx" />
     <ClCompile Include="..\..\..\OTHER\Triangle\triangle.c" />
     <ClCompile Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping2d.cpp" />
+    <ClCompile Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\absorbentBoundaries\LysmerTriangle.cpp" />
     <ClCompile Include="..\..\..\SRC\element\catenaryCable\CatenaryCable.cpp" />
     <ClCompile Include="..\..\..\SRC\element\componentElement\ComponentElement2d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\AxEqDispBeamColumn2d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumn3dThermal.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnNL2d.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\TimoshenkoBeamColumn2d.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\elasticBeamColumn\WheelRail.cpp" />
     <ClCompile Include="..\..\..\SRC\element\elastomericBearing\ElastomericBearingBoucWenMod3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\Element.cpp" />
@@ -135,7 +138,7 @@
     <ClCompile Include="..\..\..\SRC\element\mvlem\MVLEM.cpp" />
     <ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM.cpp" />
     <ClCompile Include="..\..\..\SRC\element\mvlem\MVLEM_3D.cpp" />
-	<ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\BackgroundDef.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\BackgroundMesh.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\HigherOrder.cpp" />
@@ -163,6 +166,8 @@
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\TriangleMeshGenerator.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\TriGaussPoints.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\TriMesh.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\PML\PML2D.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\PML\PML3D.cpp" />
     <ClCompile Include="..\..\..\SRC\element\RockingBC\RockingBC.cpp" />
     <ClCompile Include="..\..\..\SRC\element\shell\ShellANDeS.cpp" />
     <ClCompile Include="..\..\..\SRC\element\shell\ShellDKGT.cpp" />
@@ -372,6 +377,7 @@
     <ClInclude Include="..\..\..\OTHER\tetgen1.4.3\tetgen.h" />
     <ClInclude Include="..\..\..\OTHER\Triangle\triangle.h" />
     <ClInclude Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping2d.h" />
+    <ClInclude Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\element\absorbentBoundaries\LysmerTriangle.h" />
     <ClInclude Include="..\..\..\SRC\element\catenaryCable\CatenaryCable.h" />
     <ClInclude Include="..\..\..\SRC\element\componentElement\ComponentElement2d.h" />
@@ -380,7 +386,9 @@
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumn3dThermal.h" />
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumn3dWithSensitivity.h" />
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnNL2d.h" />
+    <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\TimoshenkoBeamColumn2d.h" />
+    <ClInclude Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\element\elasticBeamColumn\WheelRail.h" />
     <ClInclude Include="..\..\..\SRC\element\elastomericBearing\ElastomericBearingBoucWenMod3d.h" />
     <ClInclude Include="..\..\..\SRC\element\Element.h" />
@@ -402,7 +410,7 @@
     <ClInclude Include="..\..\..\SRC\element\mvlem\MVLEM.h" />
     <ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM.h" />
     <ClInclude Include="..\..\..\SRC\element\mvlem\MVLEM_3D.h" />
-	<ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h" />
+    <ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\BackgroundDef.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\BackgroundMesh.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\HigherOrder.h" />
@@ -430,6 +438,8 @@
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\TriangleMeshGenerator.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\TriGaussPoints.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\TriMesh.h" />
+    <ClInclude Include="..\..\..\SRC\element\PML\PML2D.h" />
+    <ClInclude Include="..\..\..\SRC\element\PML\PML3D.h" />
     <ClInclude Include="..\..\..\SRC\element\RockingBC\RockingBC.h" />
     <ClInclude Include="..\..\..\SRC\element\shell\ShellANDeS.h" />
     <ClInclude Include="..\..\..\SRC\element\shell\ShellDKGT.h" />
diff --git a/Win32/proj/element/element.vcxproj.filters b/Win32/proj/element/element.vcxproj.filters
index da0c5c771..a085fee5e 100644
--- a/Win32/proj/element/element.vcxproj.filters
+++ b/Win32/proj/element/element.vcxproj.filters
@@ -129,6 +129,9 @@
     <Filter Include="RockingBC">
       <UniqueIdentifier>{91ebcb15-2aac-4ce7-ad6a-0b8c7b83b286}</UniqueIdentifier>
     </Filter>
+    <Filter Include="PML">
+      <UniqueIdentifier>{b9971b16-c2ff-443f-ab28-9022482c25ed}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\SRC\element\Element.cpp">
@@ -704,7 +707,7 @@
     <ClCompile Include="..\..\..\SRC\element\mvlem\MVLEM_3D.cpp">
       <Filter>mvlem</Filter>
     </ClCompile>
-	<ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp">
+    <ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp">
       <Filter>mvlem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\SRC\element\componentElement\ComponentElement2d.cpp">
@@ -917,6 +920,21 @@
     <ClCompile Include="..\..\..\SRC\element\RockingBC\RockingBC.cpp">
       <Filter>RockingBC</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.cpp">
+      <Filter>elasticBeamColumn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.cpp">
+      <Filter>dispBeamColumn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.cpp">
+      <Filter>crdTransf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\element\PML\PML2D.cpp">
+      <Filter>PML</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\element\PML\PML3D.cpp">
+      <Filter>PML</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\SRC\element\Element.h">
@@ -1420,7 +1438,7 @@
     <ClInclude Include="..\..\..\SRC\element\mvlem\MVLEM_3D.h">
       <Filter>mvlem</Filter>
     </ClInclude>
-	<ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h">
+    <ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h">
       <Filter>mvlem</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\SRC\element\componentElement\ComponentElement2d.h">
@@ -1633,5 +1651,20 @@
     <ClInclude Include="..\..\..\SRC\element\RockingBC\RockingBC.h">
       <Filter>RockingBC</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.h">
+      <Filter>elasticBeamColumn</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.h">
+      <Filter>dispBeamColumn</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.h">
+      <Filter>crdTransf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\element\PML\PML2D.h">
+      <Filter>PML</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\element\PML\PML3D.h">
+      <Filter>PML</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Win32/proj/material/material.vcxproj b/Win32/proj/material/material.vcxproj
index 69f29b953..b23d3a8c1 100644
--- a/Win32/proj/material/material.vcxproj
+++ b/Win32/proj/material/material.vcxproj
@@ -140,6 +140,7 @@
     <ClCompile Include="..\..\..\SRC\material\section\Elliptical2.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\FiberSection3dThermal.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\FiberSectionGJThermal.cpp" />
+    <ClCompile Include="..\..\..\SRC\material\section\FiberSectionWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\integration\RCCircularSectionIntegration.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\integration\RCTunnelSectionIntegration.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\integration\TubeSectionIntegration.cpp" />
@@ -175,6 +176,7 @@
     <ClCompile Include="..\..\..\SRC\material\uniaxial\FRPConfinedConcrete02.cpp" />
     <ClCompile Include="..\..\..\SRC\material\uniaxial\GNGMaterial.cpp" />
     <ClCompile Include="..\..\..\SRC\material\uniaxial\HardeningMaterial2.cpp" />
+    <ClCompile Include="..\..\..\SRC\material\uniaxial\HystereticPoly.cpp" />
     <ClCompile Include="..\..\..\SRC\material\uniaxial\IMKBilin.cpp" />
     <ClCompile Include="..\..\..\SRC\material\uniaxial\IMKPeakOriented.cpp" />
     <ClCompile Include="..\..\..\SRC\material\uniaxial\IMKPinching.cpp" />
@@ -557,6 +559,7 @@
     <ClInclude Include="..\..\..\SRC\material\section\Elliptical2.h" />
     <ClInclude Include="..\..\..\SRC\material\section\FiberSection3dThermal.h" />
     <ClInclude Include="..\..\..\SRC\material\section\FiberSectionGJThermal.h" />
+    <ClInclude Include="..\..\..\SRC\material\section\FiberSectionWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\material\section\integration\RCCircularSectionIntegration.h" />
     <ClInclude Include="..\..\..\SRC\material\section\integration\RCTunnelSectionIntegration.h" />
     <ClInclude Include="..\..\..\SRC\material\section\integration\TubeSectionIntegration.h" />
@@ -593,6 +596,7 @@
     <ClInclude Include="..\..\..\SRC\material\uniaxial\FRPConfinedConcrete02.h" />
     <ClInclude Include="..\..\..\SRC\material\uniaxial\GNGMaterial.h" />
     <ClInclude Include="..\..\..\SRC\material\uniaxial\HardeningMaterial2.h" />
+    <ClInclude Include="..\..\..\SRC\material\uniaxial\HystereticPoly.h" />
     <ClInclude Include="..\..\..\SRC\material\uniaxial\IMKBilin.h" />
     <ClInclude Include="..\..\..\SRC\material\uniaxial\IMKPeakOriented.h" />
     <ClInclude Include="..\..\..\SRC\material\uniaxial\IMKPinching.h" />
diff --git a/Win32/proj/material/material.vcxproj.filters b/Win32/proj/material/material.vcxproj.filters
index 178c998b6..9f91cf043 100644
--- a/Win32/proj/material/material.vcxproj.filters
+++ b/Win32/proj/material/material.vcxproj.filters
@@ -1355,6 +1355,12 @@
     <ClCompile Include="..\..\..\SRC\material\nD\IncrementalElasticIsotropicThreeDimensional.cpp">
       <Filter>nD\elasticIsotropic</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\SRC\material\uniaxial\HystereticPoly.cpp">
+      <Filter>uniaxial</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\material\section\FiberSectionWarping3d.cpp">
+      <Filter>section</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\SRC\material\uniaxial\AxialSp.h">
@@ -2543,5 +2549,11 @@
     <ClInclude Include="..\..\..\SRC\material\nD\IncrementalElasticIsotropicThreeDimensional.h">
       <Filter>nD\elasticIsotropic</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\SRC\material\uniaxial\HystereticPoly.h">
+      <Filter>uniaxial</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\material\section\FiberSectionWarping3d.h">
+      <Filter>section</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Win32/proj/openSees/OpenSees.vcxproj b/Win32/proj/openSees/OpenSees.vcxproj
index ee76e8ab6..20c589ade 100644
--- a/Win32/proj/openSees/OpenSees.vcxproj
+++ b/Win32/proj/openSees/OpenSees.vcxproj
@@ -73,7 +73,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;PML.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\bin\OpenSees.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\lib;..\..\lib\release;c:\Program Files (x86)\tcl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -114,7 +114,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;PML.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\bin\OpenSees.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\lib;..\..\lib\debug;c:\Program Files (x86)\tcl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/Win32/proj/openSeesTk/OpenSeesTk.vcxproj b/Win32/proj/openSeesTk/OpenSeesTk.vcxproj
index d5969bc91..1fd750c99 100644
--- a/Win32/proj/openSeesTk/OpenSeesTk.vcxproj
+++ b/Win32/proj/openSeesTk/OpenSeesTk.vcxproj
@@ -73,7 +73,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;PML.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\bin\OpenSeesTk.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\lib;..\..\lib\release;c:\Program Files (x86)\tcl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -115,7 +115,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 /FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>actor.lib;analysis.lib;arpack.lib;blas.lib;cblas.lib;convergence.lib;cssparse.lib;damage.lib;database.lib;DoddRestrepo.lib;domain.lib;drain.lib;element.lib;feap.lib;fedeas.lib;glu32.lib;graph.lib;handler.lib;ifconsol.lib;lapack.lib;libifcoremt.lib;libmmt.lib;material.lib;matrix.lib;modelbuilder.lib;opengl32.lib;optimization.lib;PML.lib;recorder.lib;reliability.lib;renderer.lib;sdmuc.lib;superLU.lib;system.lib;tagged.lib;tcl.lib;tcl86t.lib;tk86t.lib;umfpackC.lib;utility.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\..\..\bin\OpenSeesTk.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\lib;..\..\lib\debug;c:\Program Files (x86)\tcl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/Win64/proj/element/element.vcxproj b/Win64/proj/element/element.vcxproj
index 0fa403955..0e7ef7c25 100644
--- a/Win64/proj/element/element.vcxproj
+++ b/Win64/proj/element/element.vcxproj
@@ -191,13 +191,16 @@
     <ClCompile Include="..\..\..\OTHER\tetgen1.4.3\tetgen.cxx" />
     <ClCompile Include="..\..\..\OTHER\Triangle\triangle.c" />
     <ClCompile Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping2d.cpp" />
+    <ClCompile Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\absorbentBoundaries\LysmerTriangle.cpp" />
     <ClCompile Include="..\..\..\SRC\element\catenaryCable\CatenaryCable.cpp" />
     <ClCompile Include="..\..\..\SRC\element\componentElement\ComponentElement2d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\AxEqDispBeamColumn2d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumn3dThermal.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnNL2d.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\TimoshenkoBeamColumn2d.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\elasticBeamColumn\WheelRail.cpp" />
     <ClCompile Include="..\..\..\SRC\element\elastomericBearing\ElastomericBearingBoucWenMod3d.cpp" />
     <ClCompile Include="..\..\..\SRC\element\Element.cpp" />
@@ -222,7 +225,7 @@
     <ClCompile Include="..\..\..\SRC\element\mvlem\MVLEM.cpp" />
     <ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM.cpp" />
     <ClCompile Include="..\..\..\SRC\element\mvlem\MVLEM_3D.cpp" />
-	<ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp" />
+    <ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\BackgroundDef.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\BackgroundMesh.cpp" />
     <ClCompile Include="..\..\..\SRC\element\PFEMElement\HigherOrder.cpp" />
@@ -462,6 +465,7 @@
     <ClInclude Include="..\..\..\OTHER\tetgen1.4.3\tetgen.h" />
     <ClInclude Include="..\..\..\OTHER\Triangle\triangle.h" />
     <ClInclude Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping2d.h" />
+    <ClInclude Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\element\absorbentBoundaries\LysmerTriangle.h" />
     <ClInclude Include="..\..\..\SRC\element\catenaryCable\CatenaryCable.h" />
     <ClInclude Include="..\..\..\SRC\element\componentElement\ComponentElement2d.h" />
@@ -470,7 +474,9 @@
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumn3dThermal.h" />
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumn3dWithSensitivity.h" />
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnNL2d.h" />
+    <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\TimoshenkoBeamColumn2d.h" />
+    <ClInclude Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\element\elasticBeamColumn\WheelRail.h" />
     <ClInclude Include="..\..\..\SRC\element\elastomericBearing\ElastomericBearingBoucWenMod3d.h" />
     <ClInclude Include="..\..\..\SRC\element\Element.h" />
@@ -494,7 +500,7 @@
     <ClInclude Include="..\..\..\SRC\element\mvlem\MVLEM.h" />
     <ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM.h" />
     <ClInclude Include="..\..\..\SRC\element\mvlem\MVLEM_3D.h" />
-	<ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h" />
+    <ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\BackgroundDef.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\BackgroundMesh.h" />
     <ClInclude Include="..\..\..\SRC\element\PFEMElement\HigherOrder.h" />
diff --git a/Win64/proj/element/element.vcxproj.filters b/Win64/proj/element/element.vcxproj.filters
index b9f0dab53..5eccb06df 100644
--- a/Win64/proj/element/element.vcxproj.filters
+++ b/Win64/proj/element/element.vcxproj.filters
@@ -731,7 +731,7 @@
     <ClCompile Include="..\..\..\SRC\element\mvlem\MVLEM_3D.cpp">
       <Filter>mvlem</Filter>
     </ClCompile>
-	<ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp">
+    <ClCompile Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.cpp">
       <Filter>mvlem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\SRC\element\componentElement\ComponentElement2d.cpp">
@@ -929,6 +929,15 @@
     <ClCompile Include="..\..\..\SRC\element\RockingBC\RockingBC.cpp">
       <Filter>RockingBC</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.cpp">
+      <Filter>crdTransf</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.cpp">
+      <Filter>elasticBeamColumn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.cpp">
+      <Filter>dispBeamColumn</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\SRC\element\Element.h">
@@ -1450,7 +1459,7 @@
     <ClInclude Include="..\..\..\SRC\element\mvlem\MVLEM_3D.h">
       <Filter>mvlem</Filter>
     </ClInclude>
-	<ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h">
+    <ClInclude Include="..\..\..\SRC\element\mvlem\SFI_MVLEM_3D.h">
       <Filter>mvlem</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\SRC\element\componentElement\ComponentElement2d.h">
@@ -1654,5 +1663,14 @@
     <ClInclude Include="..\..\..\SRC\element\RockingBC\RockingBC.h">
       <Filter>RockingBC</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\SRC\coordTransformation\CorotCrdTransfWarping3d.h">
+      <Filter>crdTransf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\element\elasticBeamColumn\ElasticBeamWarping3d.h">
+      <Filter>elasticBeamColumn</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\SRC\element\dispBeamColumn\DispBeamColumnWarping3d.h">
+      <Filter>dispBeamColumn</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Win64/proj/material/material.vcxproj b/Win64/proj/material/material.vcxproj
index a92aa1b3b..e7b3fbf85 100644
--- a/Win64/proj/material/material.vcxproj
+++ b/Win64/proj/material/material.vcxproj
@@ -240,6 +240,7 @@
     <ClCompile Include="..\..\..\SRC\material\section\Elliptical2.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\FiberSection3dThermal.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\FiberSectionGJThermal.cpp" />
+    <ClCompile Include="..\..\..\SRC\material\section\FiberSectionWarping3d.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\integration\RCCircularSectionIntegration.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\integration\RCTunnelSectionIntegration.cpp" />
     <ClCompile Include="..\..\..\SRC\material\section\integration\TubeSectionIntegration.cpp" />
@@ -659,6 +660,7 @@
     <ClInclude Include="..\..\..\SRC\material\section\Elliptical2.h" />
     <ClInclude Include="..\..\..\SRC\material\section\FiberSection3dThermal.h" />
     <ClInclude Include="..\..\..\SRC\material\section\FiberSectionGJThermal.h" />
+    <ClInclude Include="..\..\..\SRC\material\section\FiberSectionWarping3d.h" />
     <ClInclude Include="..\..\..\SRC\material\section\integration\RCCircularSectionIntegration.h" />
     <ClInclude Include="..\..\..\SRC\material\section\integration\RCTunnelSectionIntegration.h" />
     <ClInclude Include="..\..\..\SRC\material\section\integration\TubeSectionIntegration.h" />
diff --git a/Win64/proj/material/material.vcxproj.filters b/Win64/proj/material/material.vcxproj.filters
index cf9cf57e8..1a2bfd471 100644
--- a/Win64/proj/material/material.vcxproj.filters
+++ b/Win64/proj/material/material.vcxproj.filters
@@ -1364,6 +1364,9 @@
     <ClCompile Include="..\..\..\SRC\material\uniaxial\HystereticPoly.cpp">
       <Filter>uniaxial</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\SRC\material\section\FiberSectionWarping3d.cpp">
+      <Filter>section</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\SRC\material\uniaxial\AxialSp.h">
@@ -2549,5 +2552,8 @@
     <ClInclude Include="..\..\..\SRC\material\nD\UWmaterials\J2CyclicBoundingSurfacePlaneStrain.h">
       <Filter>nD\UWmaterials</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\SRC\material\section\FiberSectionWarping3d.h">
+      <Filter>section</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file