diff --git a/.gitmodules b/.gitmodules
index 5388e8e9ec3dc79076b07a550b31eedf82ac8ca4..9c5e83b0b17bb9e41f6f3b8b8019e20e6b695e39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "libs_required/OpenMesh"]
-	path = libs_required/OpenMesh
+	path = OpenFlipper/libs_required/OpenMesh
 	url = https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh.git
 	branch = master
 [submodule "libs_required/OpenVolumeMesh"]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc4ecb293ca48f3a63f77c2c4f9d82b05a755d61..28f06d1f2c91676c7678c777714b2ce37562ae3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,6 +215,9 @@ enable_testing()
 # Build all additional libraries
 # ========================================================================
 
+add_subdirectory (OpenFlipper/libs_required/OpenMesh)
+add_subdirectory (OpenFlipper/libs_required/ACG)
+
 # search all libs in the libs directory
 # (required and optional libraries
 file (
@@ -286,7 +289,6 @@ endif()
 # ========================================================================
 # Core Library Components (Except the Core application)
 # ========================================================================
-add_subdirectory (OpenFlipper/libs_required/ACG)
 add_subdirectory (OpenFlipper/PluginLib)
 
 # ========================================================================
diff --git a/OpenFlipper/PluginLib/CMakeLists.txt b/OpenFlipper/PluginLib/CMakeLists.txt
index a2663228a62a72be58e0a8a5dda96acbb2948017..2b3a0cd801168a8fb505a686342961d20971f8ba 100644
--- a/OpenFlipper/PluginLib/CMakeLists.txt
+++ b/OpenFlipper/PluginLib/CMakeLists.txt
@@ -33,7 +33,6 @@ file (
       "${CMAKE_SOURCE_DIR}/Package-*"
 )
 
-
 include_directories (
   ..
   ${PACKAGE_DIRS}
diff --git a/OpenFlipper/cmake/FindOpenMesh.cmake b/OpenFlipper/cmake/FindOpenMesh.cmake
index ef7fdcf38bbb3b8c73a85126e598cb9fa8d9ddfb..82d7150fd9158db434f1c4292ff101b3d9cea69d 100644
--- a/OpenFlipper/cmake/FindOpenMesh.cmake
+++ b/OpenFlipper/cmake/FindOpenMesh.cmake
@@ -55,7 +55,7 @@ IF (NOT OPENMESH_FOUND)
     /usr/
     "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
     "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh"
-    "${CMAKE_SOURCE_DIR}/OpenFlipper/libs_required/OpenMesh/src/OpenMesh"
+    "${CMAKE_SOURCE_DIR}/OpenFlipper/libs_required/OpenMesh/src"
     "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh"
     "C:/Program Files/OpenMesh 3.2"
     "C:/Program Files/OpenMesh 3.1"
diff --git a/libs_required/OpenMesh b/OpenFlipper/libs_required/OpenMesh
similarity index 100%
rename from libs_required/OpenMesh
rename to OpenFlipper/libs_required/OpenMesh
diff --git a/Readme.md b/Readme.md
index 0fbe173f673cc1c8a1a7e302e14c1a72269c7476..4c2dc06eaf4a3fef689ef1459adbdc7c02137001 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,6 +21,7 @@ http://openflipper.org/Documentation/latest/buildingOpenFlipper.html
 Latest NEWS
 ===========
 
+- 12/09/2016: Moved OpenMesh directory into OpenFlipper subdirectory OpenFlipper/libs_required/OpenMesh
 - 12/09/2016: Moved ACG directory into OpenFlipper subdirectory OpenFlipper/libs_required/ACG
 - 12/08/2016: Moved CI directory into OpenFlipper subdirectory to remove toplevel dir count
 - 12/08/2016: Moved the cmake directory contents into OpenFlipper/cmake (First steps to reduce number of toplevel dirs and get more modular than before)