diff --git a/.qmake.cache b/.qmake.cache
index 66ceb488..20cb5b30 100644
--- a/.qmake.cache
+++ b/.qmake.cache
@@ -1,9 +1,9 @@
 unix {
-	TOPDIR = $$system( pwd )/../
+	TOPDIR = $$system( pwd )/
 }
 
 win32 {
-	TOPDIR = $$system( cd )/../
+	TOPDIR = $$system( cd )/
 }
 
 #use next qmake.cache if it exists
diff --git a/OpenMesh.pro b/OpenMesh.pro
index e3394fd0..f5e14c46 100644
--- a/OpenMesh.pro
+++ b/OpenMesh.pro
@@ -6,31 +6,13 @@ contains( OPENFLIPPER , OpenFlipper ){
 
 Subdirs()
 
-addSubdirs( Core )
-addSubdirs( Tools , Core )
-addSubdirs( OpenMesh/Apps/commandlineDecimater , Core Tools)
-addSubdirs( Apps/Decimating/DecimaterGui , Core Tools)
-addSubdirs( Apps/mconvert , Core Tools)
-addSubdirs( Apps/QtViewer , Core Tools)
-addSubdirs( Apps/Smoothing , Core Tools)
-addSubdirs( Apps/Subdivider/commandlineSubdivider , Core Tools)
-addSubdirs( Apps/Subdivider/commandlineAdaptiveSubdivider , Core Tools)
-addSubdirs( Apps/Subdivider/SubdividerGui , Core Tools)
-
-win32 {
-	!ReleaseBuild{
-		!DebugBuild {
-			MAKECMD = c:\qt4\bin\qmake.exe
-
- 			CORELIST += Core Tools Apps/Decimating/commandlineDecimater Apps/Decimating/DecimaterGui 
-                  CORELIST += Apps/mconvert Apps/QtViewer Apps/Smoothing
-			CORELIST += Apps/Subdivider/SubdividerGui Apps/Subdivider/commandlineSubdivider Apps/Subdivider/commandlineAdaptiveSubdivider 
-
-			for(entry, CORELIST ): {
-				message( $$entry )
-				system( cd $$entry && $$MAKECMD  )			
-			}
-		}
-	}
-}
-
+addSubdirs( src/OpenMesh/Core )
+addSubdirs( src/OpenMesh/Tools , src/OpenMesh/Core )
+addSubdirs( src/OpenMesh/Apps/commandlineDecimater , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/Decimating/DecimaterGui , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/mconvert , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/QtViewer , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/Smoothing , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/Subdivider/commandlineSubdivider , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider , src/OpenMesh/Core src/OpenMesh/Tools)
+addSubdirs( src/OpenMesh/Apps/Subdivider/SubdividerGui , src/OpenMesh/Core src/OpenMesh/Tools)
diff --git a/qmake/all.include b/qmake/all.include
index cff0ba66..551272e3 100644
--- a/qmake/all.include
+++ b/qmake/all.include
@@ -17,8 +17,8 @@ QT += opengl
 # TOPDIR has to be specified in a .qmake.cache file in your projects toplevel 
 # directory
 ################################################################################
-INCLUDEPATH = $$quote( $${TOPDIR} )
-DEPENDPATH  = $$quote( $${TOPDIR} )
+INCLUDEPATH = $$quote( $$TOPDIR/src )
+DEPENDPATH  = $$quote( $${TOPDIR}/src )
 
 ################################################################################
 # Define header Extension
@@ -82,39 +82,6 @@ UI_DIR = tmp/$$BUILDDIRECTORY
 # type definitions
 ################################################################################
 
-# This function sets all parameters required to build a plugin
-defineTest(Plugin) {
-	unix{
-		TEMPLATE = lib		
-	}	
-	win32 {
-		TEMPLATE = vclib
-		TARGET = $$replace(TARGET, - , _)
-		export(TARGET)
-		QMAKE_INCDIR += $${TOPDIR}/OpenFlipper/BasePlugin
-		export(QMAKE_INCDIR)       
-  		LIBS+= -L$${TOPDIR}/OpenFlipper/$${BUILDDIRECTORY} -lPluginLib		
-		export(LIBS)
-		DEPENDPATH += $${TOPDIR}/OpenFlipper/$${BUILDDIRECTORY} 
-		DEFINES += ACGDLL USEACG
-		export(DEFINES)
-		export(DEPENDPATH)
-		glut()
-	}
-        macx {
- 		glut()
-        }
-	export(TEMPLATE)
-	CONFIG *= plugin
-	export(CONFIG)
-	DESTDIR = $${TOPDIR}/OpenFlipper/Plugins/$${SYSTEMTYPE}/$${ARCHITECTURE}/$${MODE}	
-	export(DESTDIR)	
-	acg()
-	openmesh()
-	glew()
-	defineTargets()
-}
-
 defineTest(Library) {
 	unix{
 		TEMPLATE = lib
diff --git a/qmake/packages/packages.Darwin b/qmake/packages/packages.Darwin
index e69d8cb0..c9e97585 100644
--- a/qmake/packages/packages.Darwin
+++ b/qmake/packages/packages.Darwin
@@ -23,10 +23,16 @@ defineTest( glut ) {
 }
 
 defineTest( openmesh ) {
-  QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY}
-  QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
-  LIBS += -lTools
-  LIBS += -lCore
+  QMAKE_LIBDIR += $${TOPDIR}/lib/$${BUILDDIRECTORY}
+  QMAKE_LIBDIR += $${TOPDIR}/lib/$${BUILDDIRECTORY}
+ 
+  CONFIG( debug, debug|release ){
+    LIBS += -lOpenMeshToolsd
+    LIBS += -lOpenMeshCored
+  } else {
+    LIBS += -lOpenMeshTools
+    LIBS += -lOpenMeshCore
+  }
   export(QMAKE_LIBDIR)
   export(LIBS)
 }
diff --git a/qmake/packages/packages.Linux b/qmake/packages/packages.Linux
index d5b56641..a71bf22f 100644
--- a/qmake/packages/packages.Linux
+++ b/qmake/packages/packages.Linux
@@ -32,10 +32,17 @@ defineTest( glut ) {
 }
 
 defineTest( openmesh ) {
-  QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
-  QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY}
-  LIBS+= -Wl,-rpath=$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore
-  LIBS+= -Wl,-rpath=$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} -lTools
+  QMAKE_LIBDIR += $${TOPDIR}/lib/
+  QMAKE_LIBDIR += $${TOPDIR}/lib/
+
+  CONFIG( debug, debug|release ){
+    LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshCored
+    LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshToolsd
+  } else {
+    LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshCore
+    LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshTools   
+  }
+
   export(QMAKE_LIBDIR)
   export(LIBS)
 }
diff --git a/qmake/packages/packages.Windows b/qmake/packages/packages.Windows
index caa5939d..57e040d8 100644
--- a/qmake/packages/packages.Windows
+++ b/qmake/packages/packages.Windows
@@ -58,9 +58,18 @@ defineTest( openmp ) {
 
 defineTest( openmesh ) {
   DEFINES += _USE_MATH_DEFINES NOMINMAX
-  QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
-  LIBS+= -L$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore 
-  LIBS+= -L$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} -lTools 
+
+  QMAKE_LIBDIR += $${TOPDIR}/lib/
+  QMAKE_LIBDIR += $${TOPDIR}/lib/
+
+  CONFIG( debug, debug|release ){
+    LIBS+= -L$${TOPDIR}/lib -lOpenMeshCored
+    LIBS+= -L$${TOPDIR}/lib -lOpenMeshToolsd
+  } else {
+    LIBS+= -L$${TOPDIR}/lib -lOpenMeshCore
+    LIBS+= -L$${TOPDIR}/lib -lOpenMeshTools
+  }
+
   export(DEFINES)
   export(QMAKE_LIBDIR)
   export(LIBS)