diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 19c2160f56fd45cdf02ed3622b3bb7953171d71f..1ca1faa6adc315de3f5ec1fb4b5d1ed3c0326015 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -37,7 +37,7 @@
 #include "ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h"
 #include "ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h"
 #include "ProcessLib/SmallDeformation/CreateSmallDeformationProcess.h"
-#include "ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.h"
+#include "ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h"
 #include "ProcessLib/TES/CreateTESProcess.h"
 
 namespace detail
@@ -343,7 +343,7 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config,
             switch (process_config.getConfigParameter<int>("dimension"))
             {
                 case 2:
-                    process = ProcessLib::SmallDeformationWithLIE::
+                    process = ProcessLib::LIE::SmallDeformation::
                         createSmallDeformationProcess<2>(
                             *_mesh_vec[0], std::move(jacobian_assembler),
                             _process_variables, _parameters, integration_order,
diff --git a/Applications/Utils/PostProcessing/postLIE.cpp b/Applications/Utils/PostProcessing/postLIE.cpp
index 8d0dad254af300abe95220b6144a85be71f1ef1a..20df62f17dfc38403287431c86f157a26a855449 100644
--- a/Applications/Utils/PostProcessing/postLIE.cpp
+++ b/Applications/Utils/PostProcessing/postLIE.cpp
@@ -24,8 +24,8 @@
 
 #include "MeshLib/Mesh.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/PostUtils.h"
+#include "ProcessLib/LIE/Common/MeshUtils.h"
+#include "ProcessLib/LIE/Common/PostUtils.h"
 
 
 int main (int argc, char* argv[])
@@ -71,11 +71,11 @@ int main (int argc, char* argv[])
         std::vector<std::vector<MeshLib::Element*>> vec_fracture_elements;
         std::vector<std::vector<MeshLib::Element*>> vec_fracture_matrix_elements;
         std::vector<std::vector<MeshLib::Node*>> vec_fracture_nodes;
-        ProcessLib::SmallDeformationWithLIE::getFractureMatrixDataInMesh(
+        ProcessLib::LIE::getFractureMatrixDataInMesh(
             *mesh, vec_matrix_elements, vec_fracture_mat_IDs, vec_fracture_elements,
             vec_fracture_matrix_elements, vec_fracture_nodes);
 
-        ProcessLib::SmallDeformationWithLIE::PostProcessTool post(
+        ProcessLib::LIE::PostProcessTool post(
             *mesh, vec_fracture_nodes, vec_fracture_matrix_elements);
 
         // create a new VTU file and update XML
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index 0dd7a458c2bf1ea8f58e376dfebf9662a5c3cf53..a2e23fa4388e9b9b10dd49eab32e6035dcc31250 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -18,10 +18,10 @@ APPEND_SOURCE_FILES(SOURCES LiquidFlow)
 
 APPEND_SOURCE_FILES(SOURCES SmallDeformation)
 
-APPEND_SOURCE_FILES(SOURCES SmallDeformationWithLIE)
-APPEND_SOURCE_FILES(SOURCES SmallDeformationWithLIE/BoundaryCondition)
-APPEND_SOURCE_FILES(SOURCES SmallDeformationWithLIE/Common)
-APPEND_SOURCE_FILES(SOURCES SmallDeformationWithLIE/LocalAssembler)
+APPEND_SOURCE_FILES(SOURCES LIE/BoundaryCondition)
+APPEND_SOURCE_FILES(SOURCES LIE/Common)
+APPEND_SOURCE_FILES(SOURCES LIE/SmallDeformation)
+APPEND_SOURCE_FILES(SOURCES LIE/SmallDeformation/LocalAssembler)
 
 APPEND_SOURCE_FILES(SOURCES TES)
 
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.cpp b/ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.cpp
similarity index 90%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.cpp
rename to ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.cpp
index 5cfa0fb5d79bd257bcab583a98d0052435d4e29d..9f09e957b6ba97e46d7d4a6a0f364a022f72d2df 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.cpp
+++ b/ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.cpp
@@ -15,7 +15,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 std::unique_ptr<BoundaryCondition>
@@ -28,7 +28,7 @@ BoundaryConditionBuilder::createNeumannBoundaryCondition(
         MeshGeoToolsLib::MeshNodeSearcher& /*mesh_node_searcher*/,
         MeshGeoToolsLib::BoundaryElementsSearcher& boundary_element_searcher)
 {
-    return ProcessLib::SmallDeformationWithLIE::createNeumannBoundaryCondition(
+    return ProcessLib::LIE::createNeumannBoundaryCondition(
         config.config,
         getClonedElements(boundary_element_searcher, config.geometry),
         dof_table, variable_id, config.component_id,
@@ -36,5 +36,5 @@ BoundaryConditionBuilder::createNeumannBoundaryCondition(
         parameters, _fracture_prop);
 }
 
-}  // SmallDeformationWithLIE
+}  // LIE
 }  // ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.h b/ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.h
similarity index 80%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.h
rename to ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.h
index 5e7bac36b86e2bce00a1ef14850703f6f6c24286..2f91f6d73d3a21919a987c2e25709295e96d859f 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.h
+++ b/ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.h
@@ -7,14 +7,14 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_BOUNDARYCONDITIONBUILDER_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_BOUNDARYCONDITIONBUILDER_H_
+#ifndef PROCESSLIB_LIE_BOUNDARYCONDITIONBUILDER_H_
+#define PROCESSLIB_LIE_BOUNDARYCONDITIONBUILDER_H_
 
 #include "NumLib/NumericsConfig.h"
 
 #include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h"
+#include "ProcessLib/LIE/Common/FractureProperty.h"
 
 namespace MeshLib
 {
@@ -28,7 +28,7 @@ class LocalToGlobalIndexMap;
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 /// A boundary condition builder for displacement jumps. Boundary integration,
@@ -54,7 +54,7 @@ private:
     FractureProperty const& _fracture_prop;
 };
 
-}  // SmallDeformationWithLIE
+}  // LIE
 }  // ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_BOUNDARYCONDITIONBUILDER_H_
+#endif // PROCESSLIB_LIE_BOUNDARYCONDITIONBUILDER_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h b/ProcessLib/LIE/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
similarity index 91%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
rename to ProcessLib/LIE/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
index 84222f6cd0b8a0b125fd249fe5eaa0b8627f122d..7c8815f61a8e3349c4d0fa93b9eccdc45c802532 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
+++ b/ProcessLib/LIE/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_GENERICNATURALBOUNDARYCONDITION_IMPL_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_GENERICNATURALBOUNDARYCONDITION_IMPL_H_
+#ifndef PROCESSLIB_LIE_GENERICNATURALBOUNDARYCONDITION_IMPL_H_
+#define PROCESSLIB_LIE_GENERICNATURALBOUNDARYCONDITION_IMPL_H_
 
 #include "GenericNaturalBoundaryCondition.h"
 
@@ -19,7 +19,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 template <typename BoundaryConditionData,
           template <typename, typename, unsigned>
@@ -94,7 +94,7 @@ void GenericNaturalBoundaryCondition<
         _local_assemblers, *_dof_table_boundary, t, x, K, b);
 }
 
-}  // SmallDeformationWithLIE
+}  // LIE
 }  // ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_GENERICNATURALBOUNDARYCONDITION_IMPL_H_
+#endif // PROCESSLIB_LIE_GENERICNATURALBOUNDARYCONDITION_IMPL_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/GenericNaturalBoundaryCondition.h b/ProcessLib/LIE/BoundaryCondition/GenericNaturalBoundaryCondition.h
similarity index 88%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/GenericNaturalBoundaryCondition.h
rename to ProcessLib/LIE/BoundaryCondition/GenericNaturalBoundaryCondition.h
index 4a2e677eb794b698a5cbd9fd82c7a0ba3fb5e63b..d2c156eb3bef2ea25313a0cd0969668b331b0832 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/GenericNaturalBoundaryCondition.h
+++ b/ProcessLib/LIE/BoundaryCondition/GenericNaturalBoundaryCondition.h
@@ -7,18 +7,18 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_GENERICNATURALBOUNDARYCONDITION_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_GENERICNATURALBOUNDARYCONDITION_H_
+#ifndef PROCESSLIB_LIE_GENERICNATURALBOUNDARYCONDITION_H_
+#define PROCESSLIB_LIE_GENERICNATURALBOUNDARYCONDITION_H_
 
 #include "MeshLib/MeshSubset.h"
 #include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h"
+#include "ProcessLib/LIE/Common/FractureProperty.h"
 
 namespace ProcessLib
 {
 class GenericNaturalBoundaryConditionLocalAssemblerInterface;
 
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 template <typename BoundaryConditionData,
@@ -76,9 +76,9 @@ private:
         _local_assemblers;
 };
 
-}  // SmallDeformationWithLIE
+}  // LIE
 }  // ProcessLib
 
 #include "GenericNaturalBoundaryCondition-impl.h"
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_GENERICNATURALBOUNDARYCONDITION_H_
+#endif // PROCESSLIB_LIE_GENERICNATURALBOUNDARYCONDITION_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryCondition.cpp b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp
similarity index 96%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryCondition.cpp
rename to ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp
index fb09e7c3538fd4e9bd1c6aa99482ccebc3ef57f6..207150ac4ab063dd8c47290b952f2d51890425e1 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryCondition.cpp
+++ b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.cpp
@@ -16,7 +16,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 using NeumannBoundaryCondition = GenericNaturalBoundaryCondition<
@@ -49,5 +49,5 @@ std::unique_ptr<BoundaryCondition> createNeumannBoundaryCondition(
             global_dim, std::move(elements), param, fracture_prop));
 }
 
-}  // SmallDeformationWithLIE
+}  // LIE
 }  // ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryCondition.h b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.h
similarity index 72%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryCondition.h
rename to ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.h
index dc76409af349e8d4a905d7c52f0da3a282eff17f..deaac587c095cdc6f605650d0db94041df4838fe 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryCondition.h
+++ b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryCondition.h
@@ -7,13 +7,13 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_NEUMANNBOUNDARYCONDITION_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_NEUMANNBOUNDARYCONDITION_H_
+#ifndef PROCESSLIB_LIE_NEUMANNBOUNDARYCONDITION_H_
+#define PROCESSLIB_LIE_NEUMANNBOUNDARYCONDITION_H_
 
 #include "ProcessLib/Parameter/Parameter.h"
 #include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h"
+#include "ProcessLib/LIE/Common/FractureProperty.h"
 
 
 namespace MeshLib
@@ -23,7 +23,7 @@ class Element;
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 std::unique_ptr<BoundaryCondition>
@@ -38,7 +38,7 @@ createNeumannBoundaryCondition(
     std::vector<std::unique_ptr<ParameterBase>> const& parameters,
     FractureProperty const& fracture_prop);
 
-}  // SmallDeformationWithLIE
+}  // LIE
 }  // ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_NEUMANNBOUNDARYCONDITION_H_
+#endif // PROCESSLIB_LIE_NEUMANNBOUNDARYCONDITION_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
similarity index 86%
rename from ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
rename to ProcessLib/LIE/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
index a6af40b3443f4c7921d55c7637e55ebd7254ca12..02d0c3b0bbe2dfe174fc926fa0d29a21dd9be214 100644
--- a/ProcessLib/SmallDeformationWithLIE/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/LIE/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
@@ -7,20 +7,20 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_NEUMANNBOUNDARYCONDITION_LOCALASSEMBLER_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_NEUMANNBOUNDARYCONDITION_LOCALASSEMBLER_H_
+#ifndef PROCESSLIB_LIE_NEUMANNBOUNDARYCONDITION_LOCALASSEMBLER_H_
+#define PROCESSLIB_LIE_NEUMANNBOUNDARYCONDITION_LOCALASSEMBLER_H_
 
 #include "NumLib/DOF/DOFTableUtil.h"
 
 #include "ProcessLib/Parameter/Parameter.h"
 #include "ProcessLib/BoundaryCondition/GenericNaturalBoundaryConditionLocalAssembler.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/Utils.h"
+#include "ProcessLib/LIE/Common/LevelSetFunction.h"
+#include "ProcessLib/LIE/Common/Utils.h"
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -92,7 +92,7 @@ private:
     int const _variable_id;
 };
 
-}   // namespace SmallDeformationWithLIE
+}   // namespace LIE
 }   // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_NEUMANNBOUNDARYCONDITION_LOCALASSEMBLER_H_
+#endif // PROCESSLIB_LIE_NEUMANNBOUNDARYCONDITION_LOCALASSEMBLER_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h b/ProcessLib/LIE/Common/FractureProperty.h
similarity index 82%
rename from ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h
rename to ProcessLib/LIE/Common/FractureProperty.h
index cb0525d5079a7f9be7b00278f25f75d24b26dbcd..24caa748bda94e0787851575af44c233bb33cda9 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h
+++ b/ProcessLib/LIE/Common/FractureProperty.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_FRACTUREPROPERTY_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_FRACTUREPROPERTY_H_
+#ifndef PROCESSLIB_LIE_COMMON_FRACTUREPROPERTY_H_
+#define PROCESSLIB_LIE_COMMON_FRACTUREPROPERTY_H_
 
 #include <Eigen/Eigen>
 
@@ -22,7 +22,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 struct FractureProperty
@@ -51,7 +51,7 @@ inline void setFractureProperty(unsigned dim, MeshLib::Element const& e,
     computeRotationMatrix(frac_prop.normal_vector, dim, frac_prop.R);
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_FRACTUREPROPERTY_H_
+#endif // PROCESSLIB_LIE_COMMON_FRACTUREPROPERTY_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/HMatrixUtils.h b/ProcessLib/LIE/Common/HMatrixUtils.h
similarity index 90%
rename from ProcessLib/SmallDeformationWithLIE/Common/HMatrixUtils.h
rename to ProcessLib/LIE/Common/HMatrixUtils.h
index 7576cf55b1b12db5afa16b59a76c9e2f548b579d..901e34a21f212180dabf3003fdb7c64469f27e14 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/HMatrixUtils.h
+++ b/ProcessLib/LIE/Common/HMatrixUtils.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_HMATRIXPOLICYTYPE_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_HMATRIXPOLICYTYPE_H_
+#ifndef PROCESSLIB_LIE_COMMON_HMATRIXPOLICYTYPE_H_
+#define PROCESSLIB_LIE_COMMON_HMATRIXPOLICYTYPE_H_
 
 #include "NumLib/Fem/ShapeMatrixPolicy.h"
 
@@ -63,4 +63,4 @@ void computeHMatrix(N_Type const& N, HMatrixType& H)
 
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_HMATRIXPOLICYTYPE_H_
+#endif // PROCESSLIB_LIE_COMMON_HMATRIXPOLICYTYPE_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.cpp b/ProcessLib/LIE/Common/LevelSetFunction.cpp
similarity index 93%
rename from ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.cpp
rename to ProcessLib/LIE/Common/LevelSetFunction.cpp
index 0edc5162dcc3395c6ec92bb44b47f119ef349799..b7f905d895a28fc2636c1698992b06eb559d43e9 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.cpp
+++ b/ProcessLib/LIE/Common/LevelSetFunction.cpp
@@ -26,7 +26,7 @@ inline double Heaviside(double v)
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 double calculateLevelSetFunction(
@@ -38,5 +38,5 @@ double calculateLevelSetFunction(
                     frac.normal_vector.dot(x - frac.point_on_fracture)));
 }
 
-} // SmallDeformationWithLIE
+} // LIE
 } // ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h b/ProcessLib/LIE/Common/LevelSetFunction.h
similarity index 73%
rename from ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h
rename to ProcessLib/LIE/Common/LevelSetFunction.h
index ad8abf666985594a51b1fcd735b61865cb2cfeee..e36cc098945e06426e96429941074520f43067f9 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h
+++ b/ProcessLib/LIE/Common/LevelSetFunction.h
@@ -6,12 +6,12 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_LEVELSETFUNCTION_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_LEVELSETFUNCTION_H_
+#ifndef PROCESSLIB_LIE_COMMON_LEVELSETFUNCTION_H_
+#define PROCESSLIB_LIE_COMMON_LEVELSETFUNCTION_H_
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 struct FractureProperty;
@@ -23,7 +23,7 @@ struct FractureProperty;
 double calculateLevelSetFunction(
         FractureProperty const& fracture_property, double const* x);
 
-} // SmallDeformationWithLIE
+} // LIE
 } // ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_LEVELSETFUNCTION_H_
+#endif // PROCESSLIB_LIE_COMMON_LEVELSETFUNCTION_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.cpp b/ProcessLib/LIE/Common/MeshUtils.cpp
similarity index 98%
rename from ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.cpp
rename to ProcessLib/LIE/Common/MeshUtils.cpp
index b526e10e9d2b4a0b90cd9d3b294573cf913855b6..c880a90d4abc54a42b98489887e709d5f57397dc 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.cpp
+++ b/ProcessLib/LIE/Common/MeshUtils.cpp
@@ -13,7 +13,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 namespace
@@ -167,5 +167,5 @@ void getFractureMatrixDataInMesh(
     }
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.h b/ProcessLib/LIE/Common/MeshUtils.h
similarity index 85%
rename from ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.h
rename to ProcessLib/LIE/Common/MeshUtils.h
index e2168211943b01f6934870cdb8ba0542cec101b7..647ab818d9a6b3f5b13b9e72147c3828d374261e 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.h
+++ b/ProcessLib/LIE/Common/MeshUtils.h
@@ -6,8 +6,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_MESHUTILS_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_MESHUTILS_H_
+#ifndef PROCESSLIB_LIE_COMMON_MESHUTILS_H_
+#define PROCESSLIB_LIE_COMMON_MESHUTILS_H_
 
 #include <vector>
 
@@ -17,7 +17,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 /**
@@ -41,7 +41,7 @@ void getFractureMatrixDataInMesh(
         std::vector<std::vector<MeshLib::Node*>>& vec_fracture_nodes
         );
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_MESHUTILS_H_
+#endif // PROCESSLIB_LIE_COMMON_MESHUTILS_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/PostUtils.cpp b/ProcessLib/LIE/Common/PostUtils.cpp
similarity index 99%
rename from ProcessLib/SmallDeformationWithLIE/Common/PostUtils.cpp
rename to ProcessLib/LIE/Common/PostUtils.cpp
index 1e3025d47e036f695ba53fbd0e61a43914328bb2..91fdab8e5b19378271008102bec4724b2eda6636 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/PostUtils.cpp
+++ b/ProcessLib/LIE/Common/PostUtils.cpp
@@ -17,7 +17,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 namespace
@@ -247,5 +247,5 @@ void PostProcessTool::calculateTotalDisplacement(unsigned const n_fractures)
 
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/PostUtils.h b/ProcessLib/LIE/Common/PostUtils.h
similarity index 82%
rename from ProcessLib/SmallDeformationWithLIE/Common/PostUtils.h
rename to ProcessLib/LIE/Common/PostUtils.h
index 82ccf32a0f15f44c62dc833301f338b4a9a292d3..e8b4079240f8fed255a780b8a52449631c5b72f5 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/PostUtils.h
+++ b/ProcessLib/LIE/Common/PostUtils.h
@@ -6,8 +6,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_POSTUTILS_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_POSTUTILS_H_
+#ifndef PROCESSLIB_LIE_COMMON_POSTUTILS_H_
+#define PROCESSLIB_LIE_COMMON_POSTUTILS_H_
 
 #include <map>
 #include <memory>
@@ -17,7 +17,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 /// A tool for post-processing results from the LIE approach
@@ -46,7 +46,7 @@ private:
     std::map<std::size_t, std::size_t> _map_dup_newNodeIDs;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_POSTUTILS_H_
+#endif // PROCESSLIB_LIE_COMMON_POSTUTILS_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/Utils.cpp b/ProcessLib/LIE/Common/Utils.cpp
similarity index 96%
rename from ProcessLib/SmallDeformationWithLIE/Common/Utils.cpp
rename to ProcessLib/LIE/Common/Utils.cpp
index 91597e68a5bb45481db7c67f278343c7817cd5ca..28b73ac2a1bc2914c1a041965f8dd7cc60dbdcee 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/Utils.cpp
+++ b/ProcessLib/LIE/Common/Utils.cpp
@@ -19,7 +19,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 namespace
@@ -68,5 +68,5 @@ void computeRotationMatrix(Eigen::Vector3d const& normal_vector, int dim, Eigen:
         OGS_FATAL("2D elements are not supported in computeNormalVector()");
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/Common/Utils.h b/ProcessLib/LIE/Common/Utils.h
similarity index 86%
rename from ProcessLib/SmallDeformationWithLIE/Common/Utils.h
rename to ProcessLib/LIE/Common/Utils.h
index 933809a41591a21989c1a053fea90f172476ad18..a4c3804e4a3881643d1bbf44ec9918074badb4d1 100644
--- a/ProcessLib/SmallDeformationWithLIE/Common/Utils.h
+++ b/ProcessLib/LIE/Common/Utils.h
@@ -6,8 +6,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_UTILS_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_COMMON_UTILS_H_
+#ifndef PROCESSLIB_LIE_COMMON_UTILS_H_
+#define PROCESSLIB_LIE_COMMON_UTILS_H_
 
 #include <Eigen/Eigen>
 
@@ -16,7 +16,7 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
 
 /// compute a normal vector of the given element
@@ -39,7 +39,7 @@ MathLib::Point3d computePhysicalCoordinates(MeshLib::Element const&e, Eigen::Mat
     return pt;
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace LIE
 }  // namespace ProcessLib
 
 #endif
diff --git a/ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
similarity index 98%
rename from ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.cpp
rename to ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
index e8e421007e20f9830fe017656347ec5e825498b1..13f06298799b8390304a53bfd1b3ffb0e4cfb772 100644
--- a/ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
@@ -23,8 +23,11 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <int DisplacementDim>
 class SmallDeformationProcess;
 
@@ -183,6 +186,7 @@ createSmallDeformationProcess<2>(
     unsigned const integration_order,
     BaseLib::ConfigTree const& config);
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
diff --git a/ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h
similarity index 71%
rename from ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.h
rename to ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h
index 0b30c314b38264fa1fb6d15628c39ea2dd10d3e9..1dcc22de140f1e010588cc8317f3178eb8b606ce 100644
--- a/ProcessLib/SmallDeformationWithLIE/CreateSmallDeformationProcess.h
+++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESS_LIB_SMALLDEFORMATION_WITH_LIE_CREATESMALLDEFORMATIONPROCESS_H_
-#define PROCESS_LIB_SMALLDEFORMATION_WITH_LIE_CREATESMALLDEFORMATIONPROCESS_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_CREATESMALLDEFORMATIONPROCESS_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_CREATESMALLDEFORMATIONPROCESS_H_
 
 #include <memory>
 #include <vector>
@@ -17,8 +17,11 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <int DisplacementDim>
 std::unique_ptr<Process> createSmallDeformationProcess(
     MeshLib::Mesh& mesh,
@@ -28,7 +31,8 @@ std::unique_ptr<Process> createSmallDeformationProcess(
     unsigned const integration_order,
     BaseLib::ConfigTree const& config);
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESS_LIB_SMALLDEFORMATION_WITH_LIE_CREATESMALLDEFORMATIONPROCESS_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_CREATESMALLDEFORMATIONPROCESS_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/CreateLocalAssemblers.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h
similarity index 92%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/CreateLocalAssemblers.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h
index 4d0b25c910a3359d01bbac32488818659fc26e53..773bb718cc6c40f71b580d46d6bb1d43ab953ed4 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/CreateLocalAssemblers.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h
@@ -6,8 +6,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_CREATE_LOCAL_ASSEMBLERS_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_CREATE_LOCAL_ASSEMBLERS_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_CREATE_LOCAL_ASSEMBLERS_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_CREATE_LOCAL_ASSEMBLERS_H_
 
 #include <vector>
 
@@ -19,8 +19,11 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 namespace detail
 {
 template <unsigned GlobalDim, int DisplacementDim,
@@ -106,8 +109,9 @@ void createLocalAssemblers(
                 "supported.");
     }
 }
-}  // SmallDeformation
 
-}  // ProcessLib
+}  // namespace SmallDeformation
+}  // namespace LIE
+}  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_CREATE_LOCAL_ASSEMBLERS_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_CREATE_LOCAL_ASSEMBLERS_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/IntegrationPointDataFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataFracture.h
similarity index 86%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/IntegrationPointDataFracture.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataFracture.h
index 1b627932b5ee50ed9d17114f864a5559f4f90693..574c02b8d9437b5e59d08b70af2642c4a5f333ca 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/IntegrationPointDataFracture.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataFracture.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_INTEGRATIONPOINTDATAFRACTURE_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_INTEGRATIONPOINTDATAFRACTURE_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_INTEGRATIONPOINTDATAFRACTURE_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_INTEGRATIONPOINTDATAFRACTURE_H_
 
 #include <Eigen/Eigen>
 
@@ -16,7 +16,9 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename HMatricesType, int DisplacementDim>
@@ -69,7 +71,8 @@ struct IntegrationPointDataFracture final
     }
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_INTEGRATIONPOINTDATAFRACTURE_H_
+#endif // PROCESSLIB_LIE_SMALLDEFORMATION_INTEGRATIONPOINTDATAFRACTURE_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/IntegrationPointDataMatrix.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h
similarity index 87%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/IntegrationPointDataMatrix.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h
index a35d8602e7f1bf5f24f7971f3ff0e6b359fee886..3203bce0476e0485eea5e0a31d29cb9b6f99b05a 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/IntegrationPointDataMatrix.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_INTEGRATIONPOINTDATAMATRIX_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_INTEGRATIONPOINTDATAMATRIX_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_INTEGRATIONPOINTDATAMATRIX_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_INTEGRATIONPOINTDATAMATRIX_H_
 
 #include <memory>
 #include <vector>
@@ -17,7 +17,9 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename BMatricesType, int DisplacementDim>
@@ -69,7 +71,8 @@ struct IntegrationPointDataMatrix final
     }
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_INTEGRATIONPOINTDATAMATRIX_H_
+#endif // PROCESSLIB_LIE_SMALLDEFORMATION_INTEGRATIONPOINTDATAMATRIX_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataFracture.h
similarity index 82%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataFracture.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataFracture.h
index 76422e56bc8bdc31641c6501bbddc3c0a8d2f544..33a2dcc9edf40256316e0b2ccdadf73b810bc939 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataFracture.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataFracture.h
@@ -7,14 +7,16 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATA_FRACTURE_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATA_FRACTURE_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATA_FRACTURE_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATA_FRACTURE_H_
 
 #include "SmallDeformationLocalAssemblerFracture.h"
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -42,7 +44,8 @@ public:
     }
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATA_FRACTURE_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATA_FRACTURE_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrix.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrix.h
similarity index 82%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrix.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrix.h
index f9699ab2f00c1411fefad032bc813399ab7b5cc5..e3a4e5f9fe4b57030646be14e7a6c0bbd7aab74b 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrix.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrix.h
@@ -7,14 +7,16 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATA_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATA_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATA_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATA_H_
 
 #include "SmallDeformationLocalAssemblerMatrix.h"
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -41,7 +43,8 @@ public:
     }
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATA_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATA_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h
similarity index 82%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h
index 43504f06667d938a26256d453d880b468a3bdce2..e68744cc3255da0c9a0db25d50d519048b3d991e 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h
@@ -7,14 +7,16 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATAMATRIXNEARFRACTURE_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATAMATRIXNEARFRACTURE_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATAMATRIXNEARFRACTURE_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATAMATRIXNEARFRACTURE_H_
 
 #include "SmallDeformationLocalAssemblerMatrixNearFracture.h"
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -43,7 +45,8 @@ public:
     }
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALASSEMBLERDATAMATRIXNEARFRACTURE_H_
+#endif // PROCESSLIB_LIE_SMALLDEFORMATION_LOCALASSEMBLERDATAMATRIXNEARFRACTURE_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalDataInitializer.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalDataInitializer.h
similarity index 97%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalDataInitializer.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalDataInitializer.h
index 7b91e6ef01b68a2dfc8979447464b4887070883e..5ce9abcd7a16ae85da9c3154152a49ad58a388e6 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalDataInitializer.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalDataInitializer.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALDATAINITIALIZER_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALDATAINITIALIZER_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_LOCALDATAINITIALIZER_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_LOCALDATAINITIALIZER_H_
 
 #include <functional>
 #include <memory>
@@ -111,7 +111,9 @@ static_assert(false, "The macro OGS_MAX_ELEMENT_ORDER is undefined.");
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 /// The LocalDataInitializer is a functor creating a local assembler data with
@@ -372,7 +374,8 @@ private:
     NumLib::LocalToGlobalIndexMap const& _dof_table;
 };
 
-}   // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}   // namespace LIE
 }   // namespace ProcessLib
 
 
@@ -384,4 +387,4 @@ private:
 #undef ENABLED_ELEMENT_TYPE_QUAD
 #undef OGS_ENABLED_ELEMENTS
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_LOCALDATAINITIALIZER_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_LOCALDATAINITIALIZER_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SecondaryData.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h
similarity index 66%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SecondaryData.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h
index a7f7b6c098c64ef5028d23cbfa616f921180e574..5bbee44634e53c195c5c6d3d64c65c2ff48cce94 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SecondaryData.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h
@@ -7,12 +7,14 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SECONDARY_DATA_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SECONDARY_DATA_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SECONDARY_DATA_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SECONDARY_DATA_H_
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 /// Used by for extrapolation of the integration point values. It is ordered
@@ -23,7 +25,8 @@ struct SecondaryData
     std::vector<ShapeMatrixType> N;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SECONDARY_DATA_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SECONDARY_DATA_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerFracture-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture-impl.h
similarity index 93%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerFracture-impl.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture-impl.h
index ff1d7dc52c33903dcbcc26ff62e8c07a551c2477..9073dab93c967e4291c58922d53682e2d769c0cc 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerFracture-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture-impl.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_IMPL_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_IMPL_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_IMPL_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_IMPL_H_
 
 #include "SmallDeformationLocalAssemblerFracture.h"
 
@@ -18,13 +18,16 @@
 
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h"
+#include "ProcessLib/LIE/Common/LevelSetFunction.h"
 
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <typename ShapeFunction, typename IntegrationMethod,
           int DisplacementDim>
 SmallDeformationLocalAssemblerFracture<ShapeFunction, IntegrationMethod,
@@ -171,7 +174,8 @@ postTimestepConcrete(std::vector<double> const& /*local_x*/)
     (*_process_data._mesh_prop_b)[_element.getID()] = ele_b;
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_IMPL_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_IMPL_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h
similarity index 91%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerFracture.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h
index 61eee6714389c88c5e6b8cf14e624f87736dc647..f89d2e605e74f92de78f650d55ecfa1e7c28944d 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerFracture.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h
@@ -7,15 +7,15 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_H_
 
 #include <vector>
 
 #include "NumLib/Fem/ShapeMatrixPolicy.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/HMatrixUtils.h"
-#include "ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h"
+#include "ProcessLib/LIE/Common/HMatrixUtils.h"
+#include "ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h"
 
 #include "IntegrationPointDataFracture.h"
 #include "SecondaryData.h"
@@ -23,7 +23,9 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -159,9 +161,10 @@ private:
     SecondaryData<typename ShapeMatrices::ShapeType> _secondary_data;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
 #include "SmallDeformationLocalAssemblerFracture-impl.h"
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_FRACTURE_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerInterface.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
similarity index 90%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
index 9dabd4511e041235a56548c00baaf5b75afbb60c..604348ec6f487d61d43f35291141b365e671c294 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLERINTERFACE_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLERINTERFACE_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLERINTERFACE_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLERINTERFACE_H_
 
 #include <vector>
 
@@ -20,7 +20,9 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 class SmallDeformationLocalAssemblerInterface
@@ -109,7 +111,8 @@ private:
     std::vector<unsigned> const _dofIndex_to_localIndex;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLERINTERFACE_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLERINTERFACE_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
similarity index 94%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
index 697a2b24cfccd3312de47b2c64cfe5db39d33dec..227708f79a349f34707a0dd268578a95091a6d90 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_IMPL_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_IMPL_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_IMPL_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_IMPL_H_
 
 #include "SmallDeformationLocalAssemblerMatrix.h"
 
@@ -24,7 +24,7 @@
 #include "ProcessLib/Deformation/LinearBMatrix.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h"
+#include "ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h"
 
 #include "IntegrationPointDataMatrix.h"
 #include "SecondaryData.h"
@@ -32,8 +32,11 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <typename ShapeFunction, typename IntegrationMethod,
           int DisplacementDim>
 SmallDeformationLocalAssemblerMatrix<ShapeFunction, IntegrationMethod,
@@ -190,7 +193,8 @@ postTimestepConcrete(std::vector<double> const& /*local_x*/)
     (*_process_data._mesh_prop_strain_xy)[_element.getID()] = ele_strain[2];
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_IMPL_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_IMPL_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h
similarity index 93%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h
index 3a5a0dd878f3b94c195f53091f24b6678945c2e4..b0682bd966051ebfd0623cb521d8c23553ad6c43 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
 
 #include <vector>
 
@@ -17,7 +17,7 @@
 #include "ProcessLib/Deformation/LinearBMatrix.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h"
+#include "ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h"
 
 #include "IntegrationPointDataMatrix.h"
 #include "SecondaryData.h"
@@ -25,7 +25,9 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -165,9 +167,10 @@ private:
     SecondaryData<typename ShapeMatrices::ShapeType> _secondary_data;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
 #include "SmallDeformationLocalAssemblerMatrix-impl.h"
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
similarity index 95%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
index d483ee1876e56658a6d354098efba8beffb4710c..ec00c6e303f43474871d3f575d5ad3b716bc4e47 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_IMPL_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_IMPL_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_IMPL_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_IMPL_H_
 
 #include "SmallDeformationLocalAssemblerMatrixNearFracture.h"
 
@@ -30,8 +30,8 @@
 #include "ProcessLib/Deformation/LinearBMatrix.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/Utils.h"
+#include "ProcessLib/LIE/Common/LevelSetFunction.h"
+#include "ProcessLib/LIE/Common/Utils.h"
 
 #include "IntegrationPointDataMatrix.h"
 #include "SecondaryData.h"
@@ -39,8 +39,11 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <typename ShapeFunction, typename IntegrationMethod,
           int DisplacementDim>
 SmallDeformationLocalAssemblerMatrixNearFracture<ShapeFunction, IntegrationMethod,
@@ -276,7 +279,8 @@ postTimestepConcrete(std::vector<double> const& /*local_x*/)
     (*_process_data._mesh_prop_strain_xy)[_element.getID()] = ele_strain[2];
 }
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_IMPL_H_
+#endif // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_IMPL_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h
similarity index 91%
rename from ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h
rename to ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h
index 3bf494656c70f3e9c48385372171ecded6709878..971171f3010d53e7e370afe36f337543f5f03a4e 100644
--- a/ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_NEAR_FRACTUER_H_
 
 #include <vector>
 
@@ -18,8 +18,8 @@
 #include "ProcessLib/Deformation/LinearBMatrix.h"
 #include "ProcessLib/Utils/InitShapeMatrices.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h"
-#include "ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h"
+#include "ProcessLib/LIE/Common/FractureProperty.h"
+#include "ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h"
 
 #include "IntegrationPointDataMatrix.h"
 #include "SecondaryData.h"
@@ -27,7 +27,9 @@
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <typename ShapeFunction, typename IntegrationMethod,
@@ -169,9 +171,10 @@ private:
     SecondaryData<typename ShapeMatrices::ShapeType> _secondary_data;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
 #include "SmallDeformationLocalAssemblerMatrixNearFracture-impl.h"
 
-#endif // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
+#endif // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONLOCALASSEMBLER_MATRIX_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess-fwd.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess-fwd.h
similarity index 50%
rename from ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess-fwd.h
rename to ProcessLib/LIE/SmallDeformation/SmallDeformationProcess-fwd.h
index 58ac118ebcca462ff21959e35d8239b3580b25f2..be3b9d4123bbef3514a0c03aa3f64bc47b368d26 100644
--- a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess-fwd.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess-fwd.h
@@ -7,11 +7,11 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_PROCESS_FWD_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_PROCESS_FWD_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATION_PROCESS_FWD_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATION_PROCESS_FWD_H_
 
 #include "SmallDeformationProcess.h"
 
-extern template class ProcessLib::SmallDeformationWithLIE::SmallDeformationProcess<2>;
+extern template class ProcessLib::LIE::SmallDeformation::SmallDeformationProcess<2>;
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_PROCESS_FWD_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATION_PROCESS_FWD_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
similarity index 94%
rename from ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess.cpp
rename to ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
index d579f7f937df5957a1e87806870012f8afa73b3e..92c8a5c2dedb3fff02ee87dbc145f6afa69cee0e 100644
--- a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -23,17 +23,19 @@
 
 #include "NumLib/DOF/LocalToGlobalIndexMap.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/BoundaryCondition/BoundaryConditionBuilder.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/LevelSetFunction.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/MeshUtils.h"
-#include "ProcessLib/SmallDeformationWithLIE/Common/Utils.h"
-#include "ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrix.h"
-#include "ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h"
-#include "ProcessLib/SmallDeformationWithLIE/LocalAssembler/LocalAssemblerDataFracture.h"
+#include "ProcessLib/LIE/BoundaryCondition/BoundaryConditionBuilder.h"
+#include "ProcessLib/LIE/Common/LevelSetFunction.h"
+#include "ProcessLib/LIE/Common/MeshUtils.h"
+#include "ProcessLib/LIE/Common/Utils.h"
+#include "ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrix.h"
+#include "ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataMatrixNearFracture.h"
+#include "ProcessLib/LIE/SmallDeformation/LocalAssembler/LocalAssemblerDataFracture.h"
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
+{
+namespace SmallDeformation
 {
 
 template <int DisplacementDim>
@@ -173,7 +175,7 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
     MeshLib::Mesh const& mesh,
     unsigned const integration_order)
 {
-    ProcessLib::SmallDeformationWithLIE::createLocalAssemblers
+    ProcessLib::LIE::SmallDeformation::createLocalAssemblers
             <DisplacementDim,
              LocalAssemblerDataMatrix,
              LocalAssemblerDataMatrixNearFracture,
@@ -323,5 +325,6 @@ void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(Globa
 // ------------------------------------------------------------------------------------
 template class SmallDeformationProcess<2>;
 
-}   // namespace SmallDeformationWithLIE
+}   // namespace SmallDeformation
+}   // namespace LIE
 }   // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
similarity index 88%
rename from ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess.h
rename to ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
index 646d47a827173002949919270567e11d597d1601..00cdd35912320d87d5c1c77f30e7a9071cd43f21 100644
--- a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcess.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
@@ -7,29 +7,32 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_PROCESS_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_PROCESS_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATION_PROCESS_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATION_PROCESS_H_
 
 #include <cassert>
 
 #include "ProcessLib/Process.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/LocalAssembler/CreateLocalAssemblers.h"
-#include "ProcessLib/SmallDeformationWithLIE/LocalAssembler/SmallDeformationLocalAssemblerInterface.h"
+#include "ProcessLib/LIE/SmallDeformation/LocalAssembler/CreateLocalAssemblers.h"
+#include "ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h"
 
 #include "SmallDeformationProcessData.h"
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <int DisplacementDim>
 class SmallDeformationProcess final : public Process
 {
     using Base = Process;
 
     static_assert(DisplacementDim==2,
-                  "Currently SmallDeformationWithLIE::SmallDeformationProcess "
+                  "Currently LIE::SmallDeformationProcess "
                   "supports only 2D.");
 
 public:
@@ -120,7 +123,8 @@ private:
     std::unique_ptr<MeshLib::MeshSubset const> _mesh_subset_matrix_nodes;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_PROCESS_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATION_PROCESS_H_
diff --git a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h
similarity index 88%
rename from ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h
rename to ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h
index ac0db72057ef66eb48e90e3f5ad967fe260d3291..11897648224afb872724aa7618d8a6ad319d8cdc 100644
--- a/ProcessLib/SmallDeformationWithLIE/SmallDeformationProcessData.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONPROCESSDATA_H_
-#define PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONPROCESSDATA_H_
+#ifndef PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONPROCESSDATA_H_
+#define PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONPROCESSDATA_H_
 
 #include <memory>
 
@@ -17,7 +17,7 @@
 #include "MaterialLib/SolidModels/MechanicsBase.h"
 #include "MaterialLib/FractureModels/FractureModelBase.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/FractureProperty.h"
+#include "ProcessLib/LIE/Common/FractureProperty.h"
 
 namespace MeshLib
 {
@@ -26,8 +26,11 @@ class Element;
 
 namespace ProcessLib
 {
-namespace SmallDeformationWithLIE
+namespace LIE
 {
+namespace SmallDeformation
+{
+
 template <int DisplacementDim>
 struct SmallDeformationProcessData
 {
@@ -81,7 +84,8 @@ struct SmallDeformationProcessData
     MeshLib::PropertyVector<double>* _mesh_prop_b = nullptr;
 };
 
-}  // namespace SmallDeformationWithLIE
+}  // namespace SmallDeformation
+}  // namespace LIE
 }  // namespace ProcessLib
 
-#endif  // PROCESSLIB_SMALLDEFORMATION_WITH_LIE_SMALLDEFORMATIONPROCESSDATA_H_
+#endif  // PROCESSLIB_LIE_SMALLDEFORMATION_SMALLDEFORMATIONPROCESSDATA_H_
diff --git a/Tests/ProcessLib/TestLIE.cpp b/Tests/ProcessLib/TestLIE.cpp
index 0d93292990206a12f5697d725a4631faaa7572d7..306d2c61eeeec26d73f485430836c2e0705596b9 100644
--- a/Tests/ProcessLib/TestLIE.cpp
+++ b/Tests/ProcessLib/TestLIE.cpp
@@ -16,7 +16,7 @@
 #include "MeshLib/Elements/Line.h"
 #include "MeshLib/Mesh.h"
 
-#include "ProcessLib/SmallDeformationWithLIE/Common/Utils.h"
+#include "ProcessLib/LIE/Common/Utils.h"
 
 
 namespace
@@ -62,13 +62,13 @@ TEST(LIE, rotationMatrixX)
     auto msh(createX());
     auto e(msh->getElement(0));
     Eigen::Vector3d nv;
-    ProcessLib::SmallDeformationWithLIE::computeNormalVector(*e, nv);
+    ProcessLib::LIE::computeNormalVector(*e, nv);
     ASSERT_EQ(0., nv[0]);
     ASSERT_EQ(1., nv[1]);
     ASSERT_EQ(0., nv[2]);
 
     Eigen::MatrixXd R(2,2);
-    ProcessLib::SmallDeformationWithLIE::computeRotationMatrix(nv, 2, R);
+    ProcessLib::LIE::computeRotationMatrix(nv, 2, R);
 
     ASSERT_NEAR(1., R(0,0), eps);
     ASSERT_NEAR(0., R(0,1), eps);
@@ -81,13 +81,13 @@ TEST(LIE, rotationMatrixY)
     auto msh(createY());
     auto e(msh->getElement(0));
     Eigen::Vector3d nv;
-    ProcessLib::SmallDeformationWithLIE::computeNormalVector(*e, nv);
+    ProcessLib::LIE::computeNormalVector(*e, nv);
     ASSERT_EQ(-1., nv[0]);
     ASSERT_EQ(0., nv[1]);
     ASSERT_EQ(0., nv[2]);
 
     Eigen::MatrixXd R(2,2);
-    ProcessLib::SmallDeformationWithLIE::computeRotationMatrix(nv, 2, R);
+    ProcessLib::LIE::computeRotationMatrix(nv, 2, R);
 
     ASSERT_NEAR(0., R(0,0), eps);
     ASSERT_NEAR(1., R(0,1), eps);
@@ -100,13 +100,13 @@ TEST(LIE, rotationMatrixXY)
     auto msh(createXY());
     auto e(msh->getElement(0));
     Eigen::Vector3d nv;
-    ProcessLib::SmallDeformationWithLIE::computeNormalVector(*e, nv);
+    ProcessLib::LIE::computeNormalVector(*e, nv);
     ASSERT_NEAR(-1./sqrt(2), nv[0], eps);
     ASSERT_NEAR(1./sqrt(2), nv[1], eps);
     ASSERT_EQ(0., nv[2]);
 
     Eigen::MatrixXd R(2,2);
-    ProcessLib::SmallDeformationWithLIE::computeRotationMatrix(nv, 2, R);
+    ProcessLib::LIE::computeRotationMatrix(nv, 2, R);
 
     ASSERT_NEAR(1./sqrt(2), R(0,0), eps);
     ASSERT_NEAR(1./sqrt(2), R(0,1), eps);