diff --git a/FileIO/CMakeLists.txt b/FileIO/CMakeLists.txt
index 2e92adfc54c4042660b3e8fde7b7a07263890218..cd5708b75b70e94c5fe58e8213e49fec8c398782 100644
--- a/FileIO/CMakeLists.txt
+++ b/FileIO/CMakeLists.txt
@@ -3,20 +3,24 @@
 SET( SOURCES
 	GMSInterface.h
 	GMSInterface.cpp
+	GMSHInterface.h
+	GMSHInterface.cpp
 	PetrelInterface.h
 	PetrelInterface.cpp
 	readMeshFromFile.h
 	readMeshFromFile.cpp
 	SHPInterface.h
 	SHPInterface.cpp
+	TetGenInterface.h
+	TetGenInterface.cpp
 	Writer.h
 	Writer.cpp
 )
 
 GET_SOURCE_FILES(SOURCES_LEGACY Legacy)
-GET_SOURCE_FILES(SOURCES_MESHIO MeshIO)
+GET_SOURCE_FILES(SOURCES_GMSHIO GmshIO)
 GET_SOURCE_FILES(SOURCES_RAPID_XML RapidXmlIO)
-SET ( SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_MESHIO} ${SOURCES_RAPID_XML})
+SET ( SOURCES ${SOURCES} ${SOURCES_LEGACY} ${SOURCES_GMSHIO} ${SOURCES_RAPID_XML})
 
 GET_SOURCE_FILES(SOURCES_BASE_XML XmlIO)
 SET (SOURCES ${SOURCES} ${SOURCES_BASE_XML})
diff --git a/FileIO/MeshIO/GMSHInterface.cpp b/FileIO/GMSHInterface.cpp
similarity index 98%
rename from FileIO/MeshIO/GMSHInterface.cpp
rename to FileIO/GMSHInterface.cpp
index 15d22afb0a88dac42abeb12a43d46f237a562015..29a05f44bd0e4c3964eeaa066abede7127a71af5 100644
--- a/FileIO/MeshIO/GMSHInterface.cpp
+++ b/FileIO/GMSHInterface.cpp
@@ -28,10 +28,10 @@
 #include "StringTools.h"
 
 // FileIO
-#include "GMSHAdaptiveMeshDensity.h"
-#include "GMSHFixedMeshDensity.h"
 #include "GMSHInterface.h"
-#include "GMSHNoMeshDensity.h"
+#include "GmshIO/GMSHAdaptiveMeshDensity.h"
+#include "GmshIO/GMSHFixedMeshDensity.h"
+#include "GmshIO/GMSHNoMeshDensity.h"
 
 // GeoLib
 #include "Point.h"
diff --git a/FileIO/MeshIO/GMSHInterface.h b/FileIO/GMSHInterface.h
similarity index 96%
rename from FileIO/MeshIO/GMSHInterface.h
rename to FileIO/GMSHInterface.h
index 683481ae1b297eb409a63626904a8ecb44178944..19083e71ee913e13e703879de743393be382e173 100644
--- a/FileIO/MeshIO/GMSHInterface.h
+++ b/FileIO/GMSHInterface.h
@@ -20,9 +20,9 @@
 
 // FileIO
 #include "Writer.h"
-#include "GMSHPoint.h"
-#include "GMSHPolygonTree.h"
-#include "GMSHMeshDensityStrategy.h"
+#include "GmshIO/GMSHPoint.h"
+#include "GmshIO/GMSHPolygonTree.h"
+#include "GmshIO/GMSHMeshDensityStrategy.h"
 
 // GeoLib
 #include "GEOObjects.h"
diff --git a/FileIO/MeshIO/GMSHAdaptiveMeshDensity.cpp b/FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
similarity index 100%
rename from FileIO/MeshIO/GMSHAdaptiveMeshDensity.cpp
rename to FileIO/GmshIO/GMSHAdaptiveMeshDensity.cpp
diff --git a/FileIO/MeshIO/GMSHAdaptiveMeshDensity.h b/FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
similarity index 100%
rename from FileIO/MeshIO/GMSHAdaptiveMeshDensity.h
rename to FileIO/GmshIO/GMSHAdaptiveMeshDensity.h
diff --git a/FileIO/MeshIO/GMSHFixedMeshDensity.cpp b/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
similarity index 95%
rename from FileIO/MeshIO/GMSHFixedMeshDensity.cpp
rename to FileIO/GmshIO/GMSHFixedMeshDensity.cpp
index 39de89e7c308bedc0d9cc799c47ac4467114d31a..8727aca1ec8c5d9f6feb47b51539ca7fb0aa066a 100644
--- a/FileIO/MeshIO/GMSHFixedMeshDensity.cpp
+++ b/FileIO/GmshIO/GMSHFixedMeshDensity.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MeshIO/GMSHFixedMeshDensity.h"
+#include "GmshIO/GMSHFixedMeshDensity.h"
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHFixedMeshDensity.h b/FileIO/GmshIO/GMSHFixedMeshDensity.h
similarity index 100%
rename from FileIO/MeshIO/GMSHFixedMeshDensity.h
rename to FileIO/GmshIO/GMSHFixedMeshDensity.h
diff --git a/FileIO/MeshIO/GMSHLine.cpp b/FileIO/GmshIO/GMSHLine.cpp
similarity index 96%
rename from FileIO/MeshIO/GMSHLine.cpp
rename to FileIO/GmshIO/GMSHLine.cpp
index 4869c64df6832d4a4cbb8ced6c086902eab81d38..c4a5ecf731ed15cee5a4ca9ce46f36ad72602231 100644
--- a/FileIO/MeshIO/GMSHLine.cpp
+++ b/FileIO/GmshIO/GMSHLine.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include <MeshIO/GMSHLine.h>
+#include <GmshIO/GMSHLine.h>
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHLine.h b/FileIO/GmshIO/GMSHLine.h
similarity index 100%
rename from FileIO/MeshIO/GMSHLine.h
rename to FileIO/GmshIO/GMSHLine.h
diff --git a/FileIO/MeshIO/GMSHLineLoop.cpp b/FileIO/GmshIO/GMSHLineLoop.cpp
similarity index 97%
rename from FileIO/MeshIO/GMSHLineLoop.cpp
rename to FileIO/GmshIO/GMSHLineLoop.cpp
index ac7b735ffe045688f5bd933bd04ca3e94aba0165..884db9dd57eec36600d13dca4a5a43dd5fa0fd64 100644
--- a/FileIO/MeshIO/GMSHLineLoop.cpp
+++ b/FileIO/GmshIO/GMSHLineLoop.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MeshIO/GMSHLineLoop.h"
+#include "GmshIO/GMSHLineLoop.h"
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHLineLoop.h b/FileIO/GmshIO/GMSHLineLoop.h
similarity index 100%
rename from FileIO/MeshIO/GMSHLineLoop.h
rename to FileIO/GmshIO/GMSHLineLoop.h
diff --git a/FileIO/MeshIO/GMSHMeshDensityStrategy.h b/FileIO/GmshIO/GMSHMeshDensityStrategy.h
similarity index 100%
rename from FileIO/MeshIO/GMSHMeshDensityStrategy.h
rename to FileIO/GmshIO/GMSHMeshDensityStrategy.h
diff --git a/FileIO/MeshIO/GMSHNoMeshDensity.h b/FileIO/GmshIO/GMSHNoMeshDensity.h
similarity index 100%
rename from FileIO/MeshIO/GMSHNoMeshDensity.h
rename to FileIO/GmshIO/GMSHNoMeshDensity.h
diff --git a/FileIO/MeshIO/GMSHPoint.cpp b/FileIO/GmshIO/GMSHPoint.cpp
similarity index 97%
rename from FileIO/MeshIO/GMSHPoint.cpp
rename to FileIO/GmshIO/GMSHPoint.cpp
index 8f4649ec2026d909fd3a25483d9aca9c05f58f51..997a614d5b4be0b93b839521d5d0233ccb3762d1 100644
--- a/FileIO/MeshIO/GMSHPoint.cpp
+++ b/FileIO/GmshIO/GMSHPoint.cpp
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <limits>
 
-#include "MeshIO/GMSHPoint.h"
+#include "GmshIO/GMSHPoint.h"
 
 namespace FileIO 
 {
diff --git a/FileIO/MeshIO/GMSHPoint.h b/FileIO/GmshIO/GMSHPoint.h
similarity index 100%
rename from FileIO/MeshIO/GMSHPoint.h
rename to FileIO/GmshIO/GMSHPoint.h
diff --git a/FileIO/MeshIO/GMSHPolygonTree.cpp b/FileIO/GmshIO/GMSHPolygonTree.cpp
similarity index 99%
rename from FileIO/MeshIO/GMSHPolygonTree.cpp
rename to FileIO/GmshIO/GMSHPolygonTree.cpp
index a32045c1e93d85a60bb884afe35cb742de495644..a560c1c97640cf19021fc447f7d4b7284d4e7387 100644
--- a/FileIO/MeshIO/GMSHPolygonTree.cpp
+++ b/FileIO/GmshIO/GMSHPolygonTree.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "MeshIO/GMSHPolygonTree.h"
+#include "GmshIO/GMSHPolygonTree.h"
 
 #include "GMSHNoMeshDensity.h"
 #include "GMSHFixedMeshDensity.h"
diff --git a/FileIO/MeshIO/GMSHPolygonTree.h b/FileIO/GmshIO/GMSHPolygonTree.h
similarity index 100%
rename from FileIO/MeshIO/GMSHPolygonTree.h
rename to FileIO/GmshIO/GMSHPolygonTree.h
diff --git a/FileIO/MeshIO/TetGenInterface.cpp b/FileIO/TetGenInterface.cpp
similarity index 100%
rename from FileIO/MeshIO/TetGenInterface.cpp
rename to FileIO/TetGenInterface.cpp
diff --git a/FileIO/MeshIO/TetGenInterface.h b/FileIO/TetGenInterface.h
similarity index 100%
rename from FileIO/MeshIO/TetGenInterface.h
rename to FileIO/TetGenInterface.h
diff --git a/Gui/VtkAct/CMakeLists.txt b/Gui/VtkAct/CMakeLists.txt
index 610367bf465a7aa1fadf9f8bfed583b0d2a24fab..d5f79ed551f31caacb8e393e85becce3dbeee4e4 100644
--- a/Gui/VtkAct/CMakeLists.txt
+++ b/Gui/VtkAct/CMakeLists.txt
@@ -35,7 +35,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
-	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/MeshIO
+	${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO/GmshIO
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MeshLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../MathLib
 	${CMAKE_CURRENT_SOURCE_DIR}/../VtkVis
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index 13fa4976ca87564e3e69b4c729cc77ca75047e86..57c1a2502e57358ac22eac44096941da1bf93876 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -34,7 +34,6 @@
 #include "DataExplorerSettingsDialog.h"
 #include "DiagramPrefsDialog.h"
 #include "FEMConditionSetupDialog.h"
-//TODO6 #include "OGSFileConverter.h"
 #include "GeoOnMeshMappingDialog.h"
 #include "GMSHPrefsDialog.h"
 #include "LicenseDialog.h"
@@ -71,8 +70,8 @@
 #include "GMSInterface.h"
 #include "Legacy/MeshIO.h"
 #include "Legacy/OGSIOVer4.h"
-#include "MeshIO/GMSHInterface.h"
-#include "MeshIO/TetGenInterface.h"
+#include "GMSHInterface.h"
+#include "TetGenInterface.h"
 #include "PetrelInterface.h"
 #include "XmlIO/Qt/XmlCndInterface.h"
 #include "XmlIO/Qt/XmlGmlInterface.h"
diff --git a/Utils/FileConverter/GMSH2OGS.cpp b/Utils/FileConverter/GMSH2OGS.cpp
index 687a8f9e1e2b9a3721b73aad41c2db3dfbe8bc20..fdb73d18a3c814c6b2c2f2671de42d5a802d98cd 100644
--- a/Utils/FileConverter/GMSH2OGS.cpp
+++ b/Utils/FileConverter/GMSH2OGS.cpp
@@ -17,7 +17,7 @@
 
 // FileIO
 #include "Legacy/MeshIO.h"
-#include "MeshIO/GMSHInterface.h"
+#include "GMSHInterface.h"
 
 // MeshLib
 #include "Mesh.h"
diff --git a/Utils/MeshEdit/CMakeLists.txt b/Utils/MeshEdit/CMakeLists.txt
index 6f93a8be815daff2020eb484137775d49a6ca420..908626e2986f94bb6adec1db1153f353395089cd 100644
--- a/Utils/MeshEdit/CMakeLists.txt
+++ b/Utils/MeshEdit/CMakeLists.txt
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/FileIO
-	${CMAKE_SOURCE_DIR}/FileIO/MeshIO
+	${CMAKE_SOURCE_DIR}/FileIO/GmshIO
 	${CMAKE_SOURCE_DIR}/MathLib
 	${CMAKE_SOURCE_DIR}/MeshLib
 )