diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 4c5d2a0433b109fba1ba4747c1d793256380192c..222f9f36ff5df6cd08206a187be17cf492904443 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
     ${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
     ${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/GmshIO
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/Gmsh
     ${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
     ${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
     ${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index db380c501d905930383273699bcdf2af2f62ecde..c639b24f648db028fa8c4c46121ed8c744c7f844 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -65,10 +65,10 @@
 #include "MeshLib/IO/Legacy/MeshIO.h"
 #include "MeshLib/IO/readMeshFromFile.h"
 #include "MeshLib/IO/GmshReader.h"
-#include "FileIO/GMSHInterface.h"
 #include "FileIO/TetGenInterface.h"
 #include "PetrelInterface.h"
 #include "XmlIO/Qt/XmlGspInterface.h"
+#include "GeoLib/IO/GMSHInterface.h"
 #include "GeoLib/IO/FEFLOW/FEFLOWGeoInterface.h"
 #include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
 #include "GeoLib/IO/XmlIO/Qt/XmlStnInterface.h"
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 498254606b643858aac0b03bf7fbbed6b805be07..0d90cbe2f2f61c890558679275a274b47cb803df 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/BaseLib
     ${CMAKE_SOURCE_DIR}/GeoLib
     ${CMAKE_SOURCE_DIR}/FileIO
-    ${CMAKE_SOURCE_DIR}/FileIO/GmshIO
+    ${CMAKE_SOURCE_DIR}/FileIO/Gmsh
     ${CMAKE_SOURCE_DIR}/MathLib
     ${CMAKE_SOURCE_DIR}/MeshLib
 )
diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 6a6117542348ea7c4adf4d1853bc35b98d99190a..7f536a633106301d214dc118de1b5050c3437bb9 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -1,7 +1,5 @@
 GET_SOURCE_FILES(SOURCES_FileIO)
 set(SOURCES ${SOURCES_FileIO})
-GET_SOURCE_FILES(SOURCES_GMSHIO GmshIO)
-set(SOURCES ${SOURCES} ${SOURCES_GMSHIO})
 
 # Create the library
 add_library(FileIO ${SOURCES})
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 8b6cc0586753a94b9ea8afd912174faa68e283de..64bb24741980bc1d0059f19c8f4fdf68661f364e 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -18,6 +18,9 @@ if(QT4_FOUND)
     SET(SOURCES ${SOURCES} ${SOURCES_IO_FEFLOW})
 endif()
 
+GET_SOURCE_FILES(SOURCES_IO_GMSHIO IO/Gmsh)
+set(SOURCES ${SOURCES} ${SOURCES_IO_GMSHIO})
+
 # Create the library
 add_library(GeoLib STATIC ${SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/tetgen/predicates.cxx
diff --git a/FileIO/GMSHInterface.cpp b/GeoLib/IO/GMSHInterface.cpp
similarity index 96%
rename from FileIO/GMSHInterface.cpp
rename to GeoLib/IO/GMSHInterface.cpp
index e059eab4e6d12e5242049b876ee38051bc32e583..65a9b5020682fa3ac3491ed09c5096649c29f114 100644
--- a/FileIO/GMSHInterface.cpp
+++ b/GeoLib/IO/GMSHInterface.cpp
@@ -16,12 +16,12 @@
 #include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
 
-#include "FileIO/GMSHInterface.h"
-#include "FileIO/GmshIO/GMSHAdaptiveMeshDensity.h"
-#include "FileIO/GmshIO/GMSHFixedMeshDensity.h"
-#include "FileIO/GmshIO/GMSHPoint.h"
-#include "FileIO/GmshIO/GMSHPolygonTree.h"
-#include "FileIO/GmshIO/GMSHMeshDensityStrategy.h"
+#include "GeoLib/IO/GMSHInterface.h"
+#include "GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h"
+#include "GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h"
+#include "GeoLib/IO/Gmsh/GMSHPoint.h"
+#include "GeoLib/IO/Gmsh/GMSHPolygonTree.h"
+#include "GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h"
 
 #include "GeoLib/AnalyticalGeometry.h"
 #include "GeoLib/GEOObjects.h"
diff --git a/FileIO/GMSHInterface.h b/GeoLib/IO/GMSHInterface.h
similarity index 100%
rename from FileIO/GMSHInterface.h
rename to GeoLib/IO/GMSHInterface.h
diff --git a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
similarity index 97%
rename from FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
rename to GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
index 21cdc00dde2dad9bf1ec6e6feff6a75e7abffcc3..f7a61eebfc540981d3f3e7cd95cdcb4b6897f12c 100644
--- a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
+++ b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2012-03-05
- * \brief  Implementation of the GMSHAdaptiveMeshDensity class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.h b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
similarity index 93%
rename from FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
rename to GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
index d2d878a006189f5547e6322fbf9e7497ede0a706..831a7e9ea8ec4a760d15e04bccf3428fca1ef11c 100644
--- a/FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
+++ b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2012-03-05
- * \brief  Definition of the GMSHAdaptiveMeshDensity class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHFixedMeshDensity.cpp b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
similarity index 83%
rename from FileIO/GmshIO/GMSHFixedMeshDensity.cpp
rename to GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
index 59d6fbc682a79218389d407bdcf321f87d73ee47..707486ae809e06f81b8f4f974045aae673c1dafe 100644
--- a/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
+++ b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2012-03-05
- * \brief  Implementation of the GMSHFixedMeshDensity class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
@@ -12,7 +8,7 @@
  *
  */
 
-#include "GmshIO/GMSHFixedMeshDensity.h"
+#include "GMSHFixedMeshDensity.h"
 
 namespace FileIO
 {
diff --git a/FileIO/GmshIO/GMSHFixedMeshDensity.h b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
similarity index 88%
rename from FileIO/GmshIO/GMSHFixedMeshDensity.h
rename to GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
index 8644b636fe14bc44b0196a61636e6e1854ecdd1a..3bef0bc0c02142f590a3efe55501ec13651e8159 100644
--- a/FileIO/GmshIO/GMSHFixedMeshDensity.h
+++ b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2012-03-05
- * \brief  Definition of the GMSHFixedMeshDensity class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLine.cpp b/GeoLib/IO/Gmsh/GMSHLine.cpp
similarity index 88%
rename from FileIO/GmshIO/GMSHLine.cpp
rename to GeoLib/IO/Gmsh/GMSHLine.cpp
index 59b0e0bc46b211072079f1ed99a258ea93513916..8bcb94c0709225dd5fd3de35a61444d2e669ae67 100644
--- a/FileIO/GmshIO/GMSHLine.cpp
+++ b/GeoLib/IO/Gmsh/GMSHLine.cpp
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   Mar 22, 2012
- * \brief  Implementation of the GMSHLine class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLine.h b/GeoLib/IO/Gmsh/GMSHLine.h
similarity index 87%
rename from FileIO/GmshIO/GMSHLine.h
rename to GeoLib/IO/Gmsh/GMSHLine.h
index 939ea4b93523078bdd2f423cccc87a12a8cf3462..0c7748fdbe857f1a3b43c8add2170de2f46dd3c1 100644
--- a/FileIO/GmshIO/GMSHLine.h
+++ b/GeoLib/IO/Gmsh/GMSHLine.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   Mar 22, 2012
- * \brief  Definition of the GMSHLine class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLineLoop.cpp b/GeoLib/IO/Gmsh/GMSHLineLoop.cpp
similarity index 92%
rename from FileIO/GmshIO/GMSHLineLoop.cpp
rename to GeoLib/IO/Gmsh/GMSHLineLoop.cpp
index 5a5d803c477bc1171850d27d3c644ea8d2691792..d448c96b26ee2432426b2972bfa817e6ebe7b36c 100644
--- a/FileIO/GmshIO/GMSHLineLoop.cpp
+++ b/GeoLib/IO/Gmsh/GMSHLineLoop.cpp
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   Mar 22, 2012
- * \brief  Implementation of the GMSHLineLoop class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHLineLoop.h b/GeoLib/IO/Gmsh/GMSHLineLoop.h
similarity index 88%
rename from FileIO/GmshIO/GMSHLineLoop.h
rename to GeoLib/IO/Gmsh/GMSHLineLoop.h
index b1cad96d57966726d35e2ba1d56d55fa611aa9f3..480ec8025237f7d60312a50a2a76de8de22fbd28 100644
--- a/FileIO/GmshIO/GMSHLineLoop.h
+++ b/GeoLib/IO/Gmsh/GMSHLineLoop.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   Mar 22, 2012
- * \brief  Definition of the GMSHLineLoop class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHMeshDensityStrategy.h b/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
similarity index 88%
rename from FileIO/GmshIO/GMSHMeshDensityStrategy.h
rename to GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
index ff908199926e116917801c09497b558a43b04da5..21675e2bb61314994b221587c4258671ed2edc73 100644
--- a/FileIO/GmshIO/GMSHMeshDensityStrategy.h
+++ b/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2010-03-05
- * \brief  Definition of the GMSHMeshDensityStrategy class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHPoint.cpp b/GeoLib/IO/Gmsh/GMSHPoint.cpp
similarity index 87%
rename from FileIO/GmshIO/GMSHPoint.cpp
rename to GeoLib/IO/Gmsh/GMSHPoint.cpp
index 1e0d13d6c47574ee36ba8a35d5031d656166bdf8..f936a45bc0362b95b4bb4159753c22413992ccaf 100644
--- a/FileIO/GmshIO/GMSHPoint.cpp
+++ b/GeoLib/IO/Gmsh/GMSHPoint.cpp
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2012-03-21
- * \brief  Implementation of the GMSHPoint class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
@@ -15,7 +11,7 @@
 #include <cmath>
 #include <limits>
 
-#include "GmshIO/GMSHPoint.h"
+#include "GMSHPoint.h"
 
 namespace FileIO
 {
diff --git a/FileIO/GmshIO/GMSHPoint.h b/GeoLib/IO/Gmsh/GMSHPoint.h
similarity index 88%
rename from FileIO/GmshIO/GMSHPoint.h
rename to GeoLib/IO/Gmsh/GMSHPoint.h
index b2788802e8615b183079f55811115cec2c4000ff..792b4ab46cbd192437ecdc29e08df9224cf2957c 100644
--- a/FileIO/GmshIO/GMSHPoint.h
+++ b/GeoLib/IO/Gmsh/GMSHPoint.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2012-03-21
- * \brief  Definition of the GMSHPoint class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHPolygonTree.cpp b/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
similarity index 99%
rename from FileIO/GmshIO/GMSHPolygonTree.cpp
rename to GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
index be35d891e14795e569229e9b61081c852c508927..afed2c4aec6a4910befe1597dd21689639027382 100644
--- a/FileIO/GmshIO/GMSHPolygonTree.cpp
+++ b/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   Mar 27, 2012
- * \brief  Implementation of the GMSHPolygonTree class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/FileIO/GmshIO/GMSHPolygonTree.h b/GeoLib/IO/Gmsh/GMSHPolygonTree.h
similarity index 97%
rename from FileIO/GmshIO/GMSHPolygonTree.h
rename to GeoLib/IO/Gmsh/GMSHPolygonTree.h
index b234fbb64e51dfe3a1d62898d49d189efb39a6de..8fdc5b4abb130040e4d18b8d7e2019230e607329 100644
--- a/FileIO/GmshIO/GMSHPolygonTree.h
+++ b/GeoLib/IO/Gmsh/GMSHPolygonTree.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   Mar 27 2012
- * \brief  Definition of the GMSHPolygonTree class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)