diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c4666fdb7e2f20fafeb1d136ac128af0d09e6a1..c62529345b6975043d9021cac0465bee94adcad2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,6 @@ ADD_SUBDIRECTORY( AssemblerLib )
 ADD_SUBDIRECTORY( BaseLib )
 # TODO This is a hack but we have to make sure that Boost is built first
 ADD_DEPENDENCIES(BaseLib Boost)
-ADD_SUBDIRECTORY( FemLib )
 ADD_SUBDIRECTORY( FileIO )
 ADD_SUBDIRECTORY( GeoLib )
 ADD_SUBDIRECTORY( MathLib )
diff --git a/FemLib/CMakeLists.txt b/FemLib/CMakeLists.txt
deleted file mode 100644
index fe18ccfa1257896539f52db03f27c4010c85d6e1..0000000000000000000000000000000000000000
--- a/FemLib/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Source files
-GET_SOURCE_FILES(SOURCES_FEMLIB)
-SET ( SOURCES ${SOURCES_FEMLIB})
-
-# Create the library
-ADD_LIBRARY(FemLib STATIC ${SOURCES})
-
-include_directories(
-	.
-	../BaseLib
-	../GeoLib
-	../MathLib
-)
-
-
-target_link_libraries (FemLib
-	BaseLib
-	GeoLib
-	MathLib
-)
-
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 4e5dd80bf2dffc124265bf49277644fba8288528..e22771dd5eac39807ba9d7bb4eaa04d035b06e09 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -34,7 +34,6 @@ ADD_LIBRARY(FileIO STATIC ${SOURCES})
 INCLUDE_DIRECTORIES(
 	.
 	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index eaa5a95920027f54e2c2708ff4812ece5d7929ff..8838120a178fdb1cd0db69c18b88e131b06b039d 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -39,7 +39,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}/../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLibGEOTOOLS
-	${CMAKE_CURRENT_SOURCE_DIR}/../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../OGS
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/Base
@@ -82,7 +81,6 @@ TARGET_LINK_LIBRARIES( ogs-gui
 	FileIO
 	MeshLib
 	#MSHGEOTOOLS
-	FemLib
 	OgsLib
 	QtBase
 	QtDataView
diff --git a/Gui/DataView/CMakeLists.txt b/Gui/DataView/CMakeLists.txt
index cd9b5018bd883ec3bab23162c5e83d30470b07d7..7dd895ea377f62f933771e5ecc8cab5239894129 100644
--- a/Gui/DataView/CMakeLists.txt
+++ b/Gui/DataView/CMakeLists.txt
@@ -145,7 +145,6 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../OGS
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
@@ -184,7 +183,6 @@ add_library( QtDataView STATIC
 # Link Qt library
 target_link_libraries( QtDataView
 	${QT_LIBRARIES}
-	FemLib
 	FileIO
 	GeoLib
 	MeshLib
diff --git a/Gui/VtkAct/CMakeLists.txt b/Gui/VtkAct/CMakeLists.txt
index 37fb60092a676cb56ff32e1c587033a1869f667c..61b1c800e77095dd00f4e7698c159a52ab4b5c4a 100644
--- a/Gui/VtkAct/CMakeLists.txt
+++ b/Gui/VtkAct/CMakeLists.txt
@@ -33,7 +33,6 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/MeshIO
diff --git a/Gui/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
index 78ec17d0c48dc2fc0aab32aa9196bf6cba0f2467..10032078621d614892b2f027fc5802e70fd27625 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Gui/VtkVis/CMakeLists.txt
@@ -135,7 +135,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_BINARY_DIR}/../../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
diff --git a/FemLib/BoundaryCondition.cpp b/OGS/BoundaryCondition.cpp
similarity index 100%
rename from FemLib/BoundaryCondition.cpp
rename to OGS/BoundaryCondition.cpp
diff --git a/FemLib/BoundaryCondition.h b/OGS/BoundaryCondition.h
similarity index 100%
rename from FemLib/BoundaryCondition.h
rename to OGS/BoundaryCondition.h
diff --git a/OGS/CMakeLists.txt b/OGS/CMakeLists.txt
index fab12a825d904fd44746d9903f25dbdadc3f462e..588316e6c37afe09f047c8c88544320caff5ad08 100644
--- a/OGS/CMakeLists.txt
+++ b/OGS/CMakeLists.txt
@@ -8,7 +8,6 @@ ADD_LIBRARY(OgsLib STATIC ${SOURCES})
 include_directories(
 	.
 	${CMAKE_CURRENT_SOURCE_DIR}/../BaseLib
-	${CMAKE_CURRENT_SOURCE_DIR}/../FemLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../MeshLib
@@ -17,7 +16,6 @@ include_directories(
 
 target_link_libraries (OgsLib
 	BaseLib
-	FemLib
 	GeoLib
 	MeshLib
 )
diff --git a/FemLib/DistributionInfo.cpp b/OGS/DistributionInfo.cpp
similarity index 100%
rename from FemLib/DistributionInfo.cpp
rename to OGS/DistributionInfo.cpp
diff --git a/FemLib/DistributionInfo.h b/OGS/DistributionInfo.h
similarity index 100%
rename from FemLib/DistributionInfo.h
rename to OGS/DistributionInfo.h
diff --git a/FemLib/FEMCondition.cpp b/OGS/FEMCondition.cpp
similarity index 100%
rename from FemLib/FEMCondition.cpp
rename to OGS/FEMCondition.cpp
diff --git a/FemLib/FEMCondition.h b/OGS/FEMCondition.h
similarity index 100%
rename from FemLib/FEMCondition.h
rename to OGS/FEMCondition.h
diff --git a/FemLib/FEMEnums.cpp b/OGS/FEMEnums.cpp
similarity index 100%
rename from FemLib/FEMEnums.cpp
rename to OGS/FEMEnums.cpp
diff --git a/FemLib/FEMEnums.h b/OGS/FEMEnums.h
similarity index 100%
rename from FemLib/FEMEnums.h
rename to OGS/FEMEnums.h
diff --git a/FemLib/GeoInfo.cpp b/OGS/GeoInfo.cpp
similarity index 100%
rename from FemLib/GeoInfo.cpp
rename to OGS/GeoInfo.cpp
diff --git a/FemLib/GeoInfo.h b/OGS/GeoInfo.h
similarity index 100%
rename from FemLib/GeoInfo.h
rename to OGS/GeoInfo.h
diff --git a/FemLib/InitialCondition.cpp b/OGS/InitialCondition.cpp
similarity index 100%
rename from FemLib/InitialCondition.cpp
rename to OGS/InitialCondition.cpp
diff --git a/FemLib/InitialCondition.h b/OGS/InitialCondition.h
similarity index 100%
rename from FemLib/InitialCondition.h
rename to OGS/InitialCondition.h
diff --git a/FemLib/ProcessInfo.cpp b/OGS/ProcessInfo.cpp
similarity index 100%
rename from FemLib/ProcessInfo.cpp
rename to OGS/ProcessInfo.cpp
diff --git a/FemLib/ProcessInfo.h b/OGS/ProcessInfo.h
similarity index 100%
rename from FemLib/ProcessInfo.h
rename to OGS/ProcessInfo.h
diff --git a/FemLib/SourceTerm.cpp b/OGS/SourceTerm.cpp
similarity index 100%
rename from FemLib/SourceTerm.cpp
rename to OGS/SourceTerm.cpp
diff --git a/FemLib/SourceTerm.h b/OGS/SourceTerm.h
similarity index 100%
rename from FemLib/SourceTerm.h
rename to OGS/SourceTerm.h
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 14335f8df9e4c58f0bba31f7e90cd1e0cef0d46d..2a2cbbc424ece2c8f8eaf63c7be1f0a57aed1c1a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -18,7 +18,6 @@ ENDIF()
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/AssemblerLib
 	${CMAKE_SOURCE_DIR}/BaseLib
-	${CMAKE_SOURCE_DIR}/FemLib
 	${CMAKE_SOURCE_DIR}/FileIO
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/MathLib
@@ -37,7 +36,6 @@ TARGET_LINK_LIBRARIES(testrunner
 	GTest
 	AssemblerLib
 	BaseLib
-	FemLib
 	FileIO
 	GeoLib
 	MathLib
diff --git a/Utils/FileConverter/CMakeLists.txt b/Utils/FileConverter/CMakeLists.txt
index 5a33d093c22e77379a25cfa9dfeeb70344f1aa9b..69e7e947d2854d104beafe91aaf3a41b8f045340 100644
--- a/Utils/FileConverter/CMakeLists.txt
+++ b/Utils/FileConverter/CMakeLists.txt
@@ -5,7 +5,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/FileIO
 	${CMAKE_SOURCE_DIR}/MathLib
-	${CMAKE_SOURCE_DIR}/FemLib
 	${CMAKE_SOURCE_DIR}/MeshLib
 	${CMAKE_SOURCE_DIR}/Gui/OpenSG
 )