diff --git a/Apps/Decimating/CmdOption.hh b/src/OpenMesh/Apps/Decimating/CmdOption.hh
similarity index 100%
rename from Apps/Decimating/CmdOption.hh
rename to src/OpenMesh/Apps/Decimating/CmdOption.hh
diff --git a/Apps/Decimating/DecimaterGui/DecimaterGui.pro b/src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro
similarity index 100%
rename from Apps/Decimating/DecimaterGui/DecimaterGui.pro
rename to src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro
diff --git a/Apps/Decimating/DecimaterViewerWidget.cc b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc
similarity index 100%
rename from Apps/Decimating/DecimaterViewerWidget.cc
rename to src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc
diff --git a/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
similarity index 100%
rename from Apps/Decimating/DecimaterViewerWidget.hh
rename to src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
diff --git a/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro b/src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro
similarity index 100%
rename from Apps/Decimating/commandlineDecimater/commandlineDecimater.pro
rename to src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro
diff --git a/Apps/Decimating/decimater.cc b/src/OpenMesh/Apps/Decimating/decimater.cc
similarity index 100%
rename from Apps/Decimating/decimater.cc
rename to src/OpenMesh/Apps/Decimating/decimater.cc
diff --git a/Apps/Decimating/decimaterviewer.cc b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc
similarity index 100%
rename from Apps/Decimating/decimaterviewer.cc
rename to src/OpenMesh/Apps/Decimating/decimaterviewer.cc
diff --git a/Apps/QtViewer/MeshViewerWidget.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
similarity index 100%
rename from Apps/QtViewer/MeshViewerWidget.hh
rename to src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
diff --git a/Apps/QtViewer/MeshViewerWidgetT.cc b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.cc
similarity index 100%
rename from Apps/QtViewer/MeshViewerWidgetT.cc
rename to src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.cc
diff --git a/Apps/QtViewer/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh
similarity index 100%
rename from Apps/QtViewer/MeshViewerWidgetT.hh
rename to src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh
diff --git a/Apps/QtViewer/QGLViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
similarity index 100%
rename from Apps/QtViewer/QGLViewerWidget.cc
rename to src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
diff --git a/Apps/QtViewer/QGLViewerWidget.hh b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh
similarity index 100%
rename from Apps/QtViewer/QGLViewerWidget.hh
rename to src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh
diff --git a/Apps/QtViewer/QtViewer.pro b/src/OpenMesh/Apps/QtViewer/QtViewer.pro
similarity index 100%
rename from Apps/QtViewer/QtViewer.pro
rename to src/OpenMesh/Apps/QtViewer/QtViewer.pro
diff --git a/Apps/QtViewer/meshviewer.cc b/src/OpenMesh/Apps/QtViewer/meshviewer.cc
similarity index 100%
rename from Apps/QtViewer/meshviewer.cc
rename to src/OpenMesh/Apps/QtViewer/meshviewer.cc
diff --git a/Apps/Smoothing/Smoothing.pro b/src/OpenMesh/Apps/Smoothing/Smoothing.pro
similarity index 100%
rename from Apps/Smoothing/Smoothing.pro
rename to src/OpenMesh/Apps/Smoothing/Smoothing.pro
diff --git a/Apps/Smoothing/smooth.cc b/src/OpenMesh/Apps/Smoothing/smooth.cc
similarity index 100%
rename from Apps/Smoothing/smooth.cc
rename to src/OpenMesh/Apps/Smoothing/smooth.cc
diff --git a/Apps/Subdivider/MeshViewerWidget.hh b/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh
similarity index 100%
rename from Apps/Subdivider/MeshViewerWidget.hh
rename to src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh
diff --git a/Apps/Subdivider/SubdivideWidget.cc b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
similarity index 100%
rename from Apps/Subdivider/SubdivideWidget.cc
rename to src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
diff --git a/Apps/Subdivider/SubdivideWidget.hh b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh
similarity index 100%
rename from Apps/Subdivider/SubdivideWidget.hh
rename to src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh
diff --git a/Apps/Subdivider/SubdividerGui/SubdividerGui.pro b/src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro
similarity index 100%
rename from Apps/Subdivider/SubdividerGui/SubdividerGui.pro
rename to src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro
diff --git a/Apps/Subdivider/adaptive_subdivider.cc b/src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc
similarity index 100%
rename from Apps/Subdivider/adaptive_subdivider.cc
rename to src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc
diff --git a/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro
similarity index 100%
rename from Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro
rename to src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro
diff --git a/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro
similarity index 100%
rename from Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro
rename to src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro
diff --git a/Apps/Subdivider/qtsubdivider.cc b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc
similarity index 100%
rename from Apps/Subdivider/qtsubdivider.cc
rename to src/OpenMesh/Apps/Subdivider/qtsubdivider.cc
diff --git a/Apps/Subdivider/subdivider.cc b/src/OpenMesh/Apps/Subdivider/subdivider.cc
similarity index 100%
rename from Apps/Subdivider/subdivider.cc
rename to src/OpenMesh/Apps/Subdivider/subdivider.cc
diff --git a/Apps/Unsupported/IvViewer/ACGMakefile b/src/OpenMesh/Apps/Unsupported/IvViewer/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/IvViewer/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/IvViewer/ACGMakefile
diff --git a/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc
similarity index 100%
rename from Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc
rename to src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc
diff --git a/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh
similarity index 100%
rename from Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh
rename to src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh
diff --git a/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh
similarity index 100%
rename from Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh
rename to src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh
diff --git a/Apps/Unsupported/IvViewer/ivviewer.cc b/src/OpenMesh/Apps/Unsupported/IvViewer/ivviewer.cc
similarity index 100%
rename from Apps/Unsupported/IvViewer/ivviewer.cc
rename to src/OpenMesh/Apps/Unsupported/IvViewer/ivviewer.cc
diff --git a/Apps/Unsupported/OsgViewer/ACGMakefile b/src/OpenMesh/Apps/Unsupported/OsgViewer/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/OsgViewer/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/OsgViewer/ACGMakefile
diff --git a/Apps/Unsupported/OsgViewer/README b/src/OpenMesh/Apps/Unsupported/OsgViewer/README
similarity index 100%
rename from Apps/Unsupported/OsgViewer/README
rename to src/OpenMesh/Apps/Unsupported/OsgViewer/README
diff --git a/Apps/Unsupported/OsgViewer/meshviewer.cc b/src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc
similarity index 100%
rename from Apps/Unsupported/OsgViewer/meshviewer.cc
rename to src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc
diff --git a/Apps/Unsupported/OsgViewer/osgviewer.cc b/src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
similarity index 100%
rename from Apps/Unsupported/OsgViewer/osgviewer.cc
rename to src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
diff --git a/Apps/Unsupported/ProgViewer/ACGMakefile b/src/OpenMesh/Apps/Unsupported/ProgViewer/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/ProgViewer/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/ProgViewer/ACGMakefile
diff --git a/Apps/Unsupported/ProgViewer/OpenMesh_Apps_ProgViewer.vcproj b/src/OpenMesh/Apps/Unsupported/ProgViewer/OpenMesh_Apps_ProgViewer.vcproj
similarity index 100%
rename from Apps/Unsupported/ProgViewer/OpenMesh_Apps_ProgViewer.vcproj
rename to src/OpenMesh/Apps/Unsupported/ProgViewer/OpenMesh_Apps_ProgViewer.vcproj
diff --git a/Apps/Unsupported/ProgViewer/ProgViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/ProgViewer/ProgViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/ProgViewer/ProgViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/ProgViewer/ProgViewerWidget.cc
diff --git a/Apps/Unsupported/ProgViewer/ProgViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/ProgViewer/ProgViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/ProgViewer/ProgViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/ProgViewer/ProgViewerWidget.hh
diff --git a/Apps/Unsupported/ProgViewer/progviewer.cc b/src/OpenMesh/Apps/Unsupported/ProgViewer/progviewer.cc
similarity index 100%
rename from Apps/Unsupported/ProgViewer/progviewer.cc
rename to src/OpenMesh/Apps/Unsupported/ProgViewer/progviewer.cc
diff --git a/Apps/Unsupported/Streaming-qt4/ACGMakefile b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/ACGMakefile
diff --git a/Apps/Unsupported/Streaming-qt4/Client/ACGMakefile b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/ACGMakefile
diff --git a/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Client/MyMesh.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MyMesh.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/MyMesh.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MyMesh.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Client/VDPMStreamingClient.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMStreamingClient.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/VDPMStreamingClient.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMStreamingClient.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Client/camera.cmr b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/camera.cmr
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Client/camera.cmr
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/camera.cmr
diff --git a/Apps/Unsupported/Streaming-qt4/Server/ACGMakefile b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ACGMakefile
diff --git a/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSocket.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSocket.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMServerSocket.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSocket.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.cc
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.cc
diff --git a/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.hh
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.hh
diff --git a/Apps/Unsupported/Streaming-qt4/Server/bunny.pm b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/bunny.pm
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/bunny.pm
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/bunny.pm
diff --git a/Apps/Unsupported/Streaming-qt4/Server/bunny.spm b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/bunny.spm
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/bunny.spm
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/bunny.spm
diff --git a/Apps/Unsupported/Streaming-qt4/Server/rockerArm.pm b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/rockerArm.pm
similarity index 100%
rename from Apps/Unsupported/Streaming-qt4/Server/rockerArm.pm
rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/rockerArm.pm
diff --git a/Apps/Unsupported/Streaming/ACGMakefile b/src/OpenMesh/Apps/Unsupported/Streaming/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/Streaming/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/Streaming/ACGMakefile
diff --git a/Apps/Unsupported/Streaming/Client/ACGMakefile b/src/OpenMesh/Apps/Unsupported/Streaming/Client/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/ACGMakefile
diff --git a/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc
diff --git a/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh
diff --git a/Apps/Unsupported/Streaming/Client/MyMesh.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Client/MyMesh.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/MyMesh.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/MyMesh.hh
diff --git a/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc
diff --git a/Apps/Unsupported/Streaming/Client/QGLViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/QGLViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.hh
diff --git a/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
diff --git a/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.hh
diff --git a/Apps/Unsupported/Streaming/Client/VDPMStreamingClient.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMStreamingClient.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Client/VDPMStreamingClient.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMStreamingClient.cc
diff --git a/Apps/Unsupported/Streaming/Server/ACGMakefile b/src/OpenMesh/Apps/Unsupported/Streaming/Server/ACGMakefile
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/ACGMakefile
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/ACGMakefile
diff --git a/Apps/Unsupported/Streaming/Server/ServerSideVDPM.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/ServerSideVDPM.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.cc
diff --git a/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh
diff --git a/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMServerSession.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc
diff --git a/Apps/Unsupported/Streaming/Server/VDPMServerSession.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMServerSession.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.hh
diff --git a/Apps/Unsupported/Streaming/Server/VDPMServerSocket.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSocket.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMServerSocket.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSocket.hh
diff --git a/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc
diff --git a/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.hh
diff --git a/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.cc
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMStreamingServer.cc
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.cc
diff --git a/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.hh
similarity index 100%
rename from Apps/Unsupported/Streaming/Server/VDPMStreamingServer.hh
rename to src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.hh
diff --git a/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro
diff --git a/Apps/Unsupported/VDProgMesh/Analyzer/vdpmanalyzer.cc b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/vdpmanalyzer.cc
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/Analyzer/vdpmanalyzer.cc
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/vdpmanalyzer.cc
diff --git a/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro
diff --git a/Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc
diff --git a/Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh
diff --git a/Apps/Unsupported/VDProgMesh/Synthesizer/vdpmsynthesizer.cc b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/vdpmsynthesizer.cc
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/Synthesizer/vdpmsynthesizer.cc
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/vdpmsynthesizer.cc
diff --git a/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.cc b/src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
diff --git a/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro b/src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro
similarity index 100%
rename from Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro
rename to src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro
diff --git a/Apps/mconvert/VS2008mconvert.vcproj b/src/OpenMesh/Apps/mconvert/VS2008mconvert.vcproj
similarity index 100%
rename from Apps/mconvert/VS2008mconvert.vcproj
rename to src/OpenMesh/Apps/mconvert/VS2008mconvert.vcproj
diff --git a/Apps/mconvert/mconvert.cc b/src/OpenMesh/Apps/mconvert/mconvert.cc
similarity index 100%
rename from Apps/mconvert/mconvert.cc
rename to src/OpenMesh/Apps/mconvert/mconvert.cc
diff --git a/Apps/mconvert/mconvert.pro b/src/OpenMesh/Apps/mconvert/mconvert.pro
similarity index 100%
rename from Apps/mconvert/mconvert.pro
rename to src/OpenMesh/Apps/mconvert/mconvert.pro
diff --git a/Core/ACGMakefile b/src/OpenMesh/Core/ACGMakefile
similarity index 100%
rename from Core/ACGMakefile
rename to src/OpenMesh/Core/ACGMakefile
diff --git a/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt
similarity index 100%
rename from Core/CMakeLists.txt
rename to src/OpenMesh/Core/CMakeLists.txt
diff --git a/Core/Core.pro b/src/OpenMesh/Core/Core.pro
similarity index 86%
rename from Core/Core.pro
rename to src/OpenMesh/Core/Core.pro
index 33d7959a..25edd840 100644
--- a/Core/Core.pro
+++ b/src/OpenMesh/Core/Core.pro
@@ -15,6 +15,15 @@ DIRECTORIES = . Geometry IO IO/exporter IO/importer IO/reader IO/writer \
 
 INCLUDEPATH += ../..
 
+
+DESTDIR = $${TOPDIR}/lib
+
+CONFIG( debug, debug|release ){
+        TARGET    = OpenMeshCored
+} else {
+	TARGET    = OpenMeshCore
+}
+
 win32 {
  DEFINES += _USE_MATH_DEFINES NOMINMAX
  CONFIG  += static
diff --git a/Core/Geometry/ACGMakefile b/src/OpenMesh/Core/Geometry/ACGMakefile
similarity index 100%
rename from Core/Geometry/ACGMakefile
rename to src/OpenMesh/Core/Geometry/ACGMakefile
diff --git a/Core/Geometry/Config.hh b/src/OpenMesh/Core/Geometry/Config.hh
similarity index 100%
rename from Core/Geometry/Config.hh
rename to src/OpenMesh/Core/Geometry/Config.hh
diff --git a/Core/Geometry/LoopSchemeMaskT.hh b/src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh
similarity index 100%
rename from Core/Geometry/LoopSchemeMaskT.hh
rename to src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh
diff --git a/Core/Geometry/MathDefs.hh b/src/OpenMesh/Core/Geometry/MathDefs.hh
similarity index 100%
rename from Core/Geometry/MathDefs.hh
rename to src/OpenMesh/Core/Geometry/MathDefs.hh
diff --git a/Core/Geometry/Plane3d.hh b/src/OpenMesh/Core/Geometry/Plane3d.hh
similarity index 100%
rename from Core/Geometry/Plane3d.hh
rename to src/OpenMesh/Core/Geometry/Plane3d.hh
diff --git a/Core/Geometry/QuadricT.hh b/src/OpenMesh/Core/Geometry/QuadricT.hh
similarity index 100%
rename from Core/Geometry/QuadricT.hh
rename to src/OpenMesh/Core/Geometry/QuadricT.hh
diff --git a/Core/Geometry/VectorT.hh b/src/OpenMesh/Core/Geometry/VectorT.hh
similarity index 100%
rename from Core/Geometry/VectorT.hh
rename to src/OpenMesh/Core/Geometry/VectorT.hh
diff --git a/Core/Geometry/VectorT_inc.hh b/src/OpenMesh/Core/Geometry/VectorT_inc.hh
similarity index 100%
rename from Core/Geometry/VectorT_inc.hh
rename to src/OpenMesh/Core/Geometry/VectorT_inc.hh
diff --git a/Core/IO/ACGMakefile b/src/OpenMesh/Core/IO/ACGMakefile
similarity index 100%
rename from Core/IO/ACGMakefile
rename to src/OpenMesh/Core/IO/ACGMakefile
diff --git a/Core/IO/BinaryHelper.cc b/src/OpenMesh/Core/IO/BinaryHelper.cc
similarity index 100%
rename from Core/IO/BinaryHelper.cc
rename to src/OpenMesh/Core/IO/BinaryHelper.cc
diff --git a/Core/IO/BinaryHelper.hh b/src/OpenMesh/Core/IO/BinaryHelper.hh
similarity index 100%
rename from Core/IO/BinaryHelper.hh
rename to src/OpenMesh/Core/IO/BinaryHelper.hh
diff --git a/Core/IO/IOInstances.hh b/src/OpenMesh/Core/IO/IOInstances.hh
similarity index 100%
rename from Core/IO/IOInstances.hh
rename to src/OpenMesh/Core/IO/IOInstances.hh
diff --git a/Core/IO/IOManager.cc b/src/OpenMesh/Core/IO/IOManager.cc
similarity index 100%
rename from Core/IO/IOManager.cc
rename to src/OpenMesh/Core/IO/IOManager.cc
diff --git a/Core/IO/IOManager.hh b/src/OpenMesh/Core/IO/IOManager.hh
similarity index 100%
rename from Core/IO/IOManager.hh
rename to src/OpenMesh/Core/IO/IOManager.hh
diff --git a/Core/IO/MeshIO.hh b/src/OpenMesh/Core/IO/MeshIO.hh
similarity index 100%
rename from Core/IO/MeshIO.hh
rename to src/OpenMesh/Core/IO/MeshIO.hh
diff --git a/Core/IO/OFFFormat.hh b/src/OpenMesh/Core/IO/OFFFormat.hh
similarity index 100%
rename from Core/IO/OFFFormat.hh
rename to src/OpenMesh/Core/IO/OFFFormat.hh
diff --git a/Core/IO/OMFormat.cc b/src/OpenMesh/Core/IO/OMFormat.cc
similarity index 100%
rename from Core/IO/OMFormat.cc
rename to src/OpenMesh/Core/IO/OMFormat.cc
diff --git a/Core/IO/OMFormat.hh b/src/OpenMesh/Core/IO/OMFormat.hh
similarity index 100%
rename from Core/IO/OMFormat.hh
rename to src/OpenMesh/Core/IO/OMFormat.hh
diff --git a/Core/IO/OMFormatT.cc b/src/OpenMesh/Core/IO/OMFormatT.cc
similarity index 100%
rename from Core/IO/OMFormatT.cc
rename to src/OpenMesh/Core/IO/OMFormatT.cc
diff --git a/Core/IO/Options.hh b/src/OpenMesh/Core/IO/Options.hh
similarity index 100%
rename from Core/IO/Options.hh
rename to src/OpenMesh/Core/IO/Options.hh
diff --git a/Core/IO/SR_binary.hh b/src/OpenMesh/Core/IO/SR_binary.hh
similarity index 100%
rename from Core/IO/SR_binary.hh
rename to src/OpenMesh/Core/IO/SR_binary.hh
diff --git a/Core/IO/SR_binary_spec.hh b/src/OpenMesh/Core/IO/SR_binary_spec.hh
similarity index 100%
rename from Core/IO/SR_binary_spec.hh
rename to src/OpenMesh/Core/IO/SR_binary_spec.hh
diff --git a/Core/IO/SR_binary_vector_of_bool.inl b/src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl
similarity index 100%
rename from Core/IO/SR_binary_vector_of_bool.inl
rename to src/OpenMesh/Core/IO/SR_binary_vector_of_bool.inl
diff --git a/Core/IO/SR_binary_vector_of_fundamentals.inl b/src/OpenMesh/Core/IO/SR_binary_vector_of_fundamentals.inl
similarity index 100%
rename from Core/IO/SR_binary_vector_of_fundamentals.inl
rename to src/OpenMesh/Core/IO/SR_binary_vector_of_fundamentals.inl
diff --git a/Core/IO/SR_binary_vector_of_string.inl b/src/OpenMesh/Core/IO/SR_binary_vector_of_string.inl
similarity index 100%
rename from Core/IO/SR_binary_vector_of_string.inl
rename to src/OpenMesh/Core/IO/SR_binary_vector_of_string.inl
diff --git a/Core/IO/SR_rbo.hh b/src/OpenMesh/Core/IO/SR_rbo.hh
similarity index 100%
rename from Core/IO/SR_rbo.hh
rename to src/OpenMesh/Core/IO/SR_rbo.hh
diff --git a/Core/IO/SR_store.hh b/src/OpenMesh/Core/IO/SR_store.hh
similarity index 100%
rename from Core/IO/SR_store.hh
rename to src/OpenMesh/Core/IO/SR_store.hh
diff --git a/Core/IO/SR_types.hh b/src/OpenMesh/Core/IO/SR_types.hh
similarity index 100%
rename from Core/IO/SR_types.hh
rename to src/OpenMesh/Core/IO/SR_types.hh
diff --git a/Core/IO/StoreRestore.hh b/src/OpenMesh/Core/IO/StoreRestore.hh
similarity index 100%
rename from Core/IO/StoreRestore.hh
rename to src/OpenMesh/Core/IO/StoreRestore.hh
diff --git a/Core/IO/exporter/ACGMakefile b/src/OpenMesh/Core/IO/exporter/ACGMakefile
similarity index 100%
rename from Core/IO/exporter/ACGMakefile
rename to src/OpenMesh/Core/IO/exporter/ACGMakefile
diff --git a/Core/IO/exporter/BaseExporter.hh b/src/OpenMesh/Core/IO/exporter/BaseExporter.hh
similarity index 100%
rename from Core/IO/exporter/BaseExporter.hh
rename to src/OpenMesh/Core/IO/exporter/BaseExporter.hh
diff --git a/Core/IO/exporter/ExporterT.hh b/src/OpenMesh/Core/IO/exporter/ExporterT.hh
similarity index 100%
rename from Core/IO/exporter/ExporterT.hh
rename to src/OpenMesh/Core/IO/exporter/ExporterT.hh
diff --git a/Core/IO/importer/ACGMakefile b/src/OpenMesh/Core/IO/importer/ACGMakefile
similarity index 100%
rename from Core/IO/importer/ACGMakefile
rename to src/OpenMesh/Core/IO/importer/ACGMakefile
diff --git a/Core/IO/importer/BaseImporter.hh b/src/OpenMesh/Core/IO/importer/BaseImporter.hh
similarity index 100%
rename from Core/IO/importer/BaseImporter.hh
rename to src/OpenMesh/Core/IO/importer/BaseImporter.hh
diff --git a/Core/IO/importer/ImporterT.hh b/src/OpenMesh/Core/IO/importer/ImporterT.hh
similarity index 100%
rename from Core/IO/importer/ImporterT.hh
rename to src/OpenMesh/Core/IO/importer/ImporterT.hh
diff --git a/Core/IO/reader/ACGMakefile b/src/OpenMesh/Core/IO/reader/ACGMakefile
similarity index 100%
rename from Core/IO/reader/ACGMakefile
rename to src/OpenMesh/Core/IO/reader/ACGMakefile
diff --git a/Core/IO/reader/BaseReader.cc b/src/OpenMesh/Core/IO/reader/BaseReader.cc
similarity index 100%
rename from Core/IO/reader/BaseReader.cc
rename to src/OpenMesh/Core/IO/reader/BaseReader.cc
diff --git a/Core/IO/reader/BaseReader.hh b/src/OpenMesh/Core/IO/reader/BaseReader.hh
similarity index 100%
rename from Core/IO/reader/BaseReader.hh
rename to src/OpenMesh/Core/IO/reader/BaseReader.hh
diff --git a/Core/IO/reader/OBJReader.cc b/src/OpenMesh/Core/IO/reader/OBJReader.cc
similarity index 100%
rename from Core/IO/reader/OBJReader.cc
rename to src/OpenMesh/Core/IO/reader/OBJReader.cc
diff --git a/Core/IO/reader/OBJReader.hh b/src/OpenMesh/Core/IO/reader/OBJReader.hh
similarity index 100%
rename from Core/IO/reader/OBJReader.hh
rename to src/OpenMesh/Core/IO/reader/OBJReader.hh
diff --git a/Core/IO/reader/OFFReader.cc b/src/OpenMesh/Core/IO/reader/OFFReader.cc
similarity index 100%
rename from Core/IO/reader/OFFReader.cc
rename to src/OpenMesh/Core/IO/reader/OFFReader.cc
diff --git a/Core/IO/reader/OFFReader.hh b/src/OpenMesh/Core/IO/reader/OFFReader.hh
similarity index 100%
rename from Core/IO/reader/OFFReader.hh
rename to src/OpenMesh/Core/IO/reader/OFFReader.hh
diff --git a/Core/IO/reader/OMReader.cc b/src/OpenMesh/Core/IO/reader/OMReader.cc
similarity index 100%
rename from Core/IO/reader/OMReader.cc
rename to src/OpenMesh/Core/IO/reader/OMReader.cc
diff --git a/Core/IO/reader/OMReader.hh b/src/OpenMesh/Core/IO/reader/OMReader.hh
similarity index 100%
rename from Core/IO/reader/OMReader.hh
rename to src/OpenMesh/Core/IO/reader/OMReader.hh
diff --git a/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc
similarity index 100%
rename from Core/IO/reader/PLYReader.cc
rename to src/OpenMesh/Core/IO/reader/PLYReader.cc
diff --git a/Core/IO/reader/PLYReader.hh b/src/OpenMesh/Core/IO/reader/PLYReader.hh
similarity index 100%
rename from Core/IO/reader/PLYReader.hh
rename to src/OpenMesh/Core/IO/reader/PLYReader.hh
diff --git a/Core/IO/reader/STLReader.cc b/src/OpenMesh/Core/IO/reader/STLReader.cc
similarity index 100%
rename from Core/IO/reader/STLReader.cc
rename to src/OpenMesh/Core/IO/reader/STLReader.cc
diff --git a/Core/IO/reader/STLReader.hh b/src/OpenMesh/Core/IO/reader/STLReader.hh
similarity index 100%
rename from Core/IO/reader/STLReader.hh
rename to src/OpenMesh/Core/IO/reader/STLReader.hh
diff --git a/Core/IO/writer/ACGMakefile b/src/OpenMesh/Core/IO/writer/ACGMakefile
similarity index 100%
rename from Core/IO/writer/ACGMakefile
rename to src/OpenMesh/Core/IO/writer/ACGMakefile
diff --git a/Core/IO/writer/BaseWriter.cc b/src/OpenMesh/Core/IO/writer/BaseWriter.cc
similarity index 100%
rename from Core/IO/writer/BaseWriter.cc
rename to src/OpenMesh/Core/IO/writer/BaseWriter.cc
diff --git a/Core/IO/writer/BaseWriter.hh b/src/OpenMesh/Core/IO/writer/BaseWriter.hh
similarity index 100%
rename from Core/IO/writer/BaseWriter.hh
rename to src/OpenMesh/Core/IO/writer/BaseWriter.hh
diff --git a/Core/IO/writer/OBJWriter.cc b/src/OpenMesh/Core/IO/writer/OBJWriter.cc
similarity index 100%
rename from Core/IO/writer/OBJWriter.cc
rename to src/OpenMesh/Core/IO/writer/OBJWriter.cc
diff --git a/Core/IO/writer/OBJWriter.hh b/src/OpenMesh/Core/IO/writer/OBJWriter.hh
similarity index 100%
rename from Core/IO/writer/OBJWriter.hh
rename to src/OpenMesh/Core/IO/writer/OBJWriter.hh
diff --git a/Core/IO/writer/OFFWriter.cc b/src/OpenMesh/Core/IO/writer/OFFWriter.cc
similarity index 100%
rename from Core/IO/writer/OFFWriter.cc
rename to src/OpenMesh/Core/IO/writer/OFFWriter.cc
diff --git a/Core/IO/writer/OFFWriter.hh b/src/OpenMesh/Core/IO/writer/OFFWriter.hh
similarity index 100%
rename from Core/IO/writer/OFFWriter.hh
rename to src/OpenMesh/Core/IO/writer/OFFWriter.hh
diff --git a/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc
similarity index 100%
rename from Core/IO/writer/OMWriter.cc
rename to src/OpenMesh/Core/IO/writer/OMWriter.cc
diff --git a/Core/IO/writer/OMWriter.hh b/src/OpenMesh/Core/IO/writer/OMWriter.hh
similarity index 100%
rename from Core/IO/writer/OMWriter.hh
rename to src/OpenMesh/Core/IO/writer/OMWriter.hh
diff --git a/Core/IO/writer/PLYWriter.cc b/src/OpenMesh/Core/IO/writer/PLYWriter.cc
similarity index 100%
rename from Core/IO/writer/PLYWriter.cc
rename to src/OpenMesh/Core/IO/writer/PLYWriter.cc
diff --git a/Core/IO/writer/PLYWriter.hh b/src/OpenMesh/Core/IO/writer/PLYWriter.hh
similarity index 100%
rename from Core/IO/writer/PLYWriter.hh
rename to src/OpenMesh/Core/IO/writer/PLYWriter.hh
diff --git a/Core/IO/writer/STLWriter.cc b/src/OpenMesh/Core/IO/writer/STLWriter.cc
similarity index 100%
rename from Core/IO/writer/STLWriter.cc
rename to src/OpenMesh/Core/IO/writer/STLWriter.cc
diff --git a/Core/IO/writer/STLWriter.hh b/src/OpenMesh/Core/IO/writer/STLWriter.hh
similarity index 100%
rename from Core/IO/writer/STLWriter.hh
rename to src/OpenMesh/Core/IO/writer/STLWriter.hh
diff --git a/Core/Mesh/ACGMakefile b/src/OpenMesh/Core/Mesh/ACGMakefile
similarity index 100%
rename from Core/Mesh/ACGMakefile
rename to src/OpenMesh/Core/Mesh/ACGMakefile
diff --git a/Core/Mesh/ArrayItems.hh b/src/OpenMesh/Core/Mesh/ArrayItems.hh
similarity index 100%
rename from Core/Mesh/ArrayItems.hh
rename to src/OpenMesh/Core/Mesh/ArrayItems.hh
diff --git a/Core/Mesh/ArrayKernel.cc b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
similarity index 100%
rename from Core/Mesh/ArrayKernel.cc
rename to src/OpenMesh/Core/Mesh/ArrayKernel.cc
diff --git a/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
similarity index 100%
rename from Core/Mesh/ArrayKernel.hh
rename to src/OpenMesh/Core/Mesh/ArrayKernel.hh
diff --git a/Core/Mesh/AttribKernelT.hh b/src/OpenMesh/Core/Mesh/AttribKernelT.hh
similarity index 100%
rename from Core/Mesh/AttribKernelT.hh
rename to src/OpenMesh/Core/Mesh/AttribKernelT.hh
diff --git a/Core/Mesh/Attributes.hh b/src/OpenMesh/Core/Mesh/Attributes.hh
similarity index 100%
rename from Core/Mesh/Attributes.hh
rename to src/OpenMesh/Core/Mesh/Attributes.hh
diff --git a/Core/Mesh/BaseKernel.cc b/src/OpenMesh/Core/Mesh/BaseKernel.cc
similarity index 100%
rename from Core/Mesh/BaseKernel.cc
rename to src/OpenMesh/Core/Mesh/BaseKernel.cc
diff --git a/Core/Mesh/BaseKernel.hh b/src/OpenMesh/Core/Mesh/BaseKernel.hh
similarity index 100%
rename from Core/Mesh/BaseKernel.hh
rename to src/OpenMesh/Core/Mesh/BaseKernel.hh
diff --git a/Core/Mesh/BaseMesh.hh b/src/OpenMesh/Core/Mesh/BaseMesh.hh
similarity index 100%
rename from Core/Mesh/BaseMesh.hh
rename to src/OpenMesh/Core/Mesh/BaseMesh.hh
diff --git a/Core/Mesh/Casts.hh b/src/OpenMesh/Core/Mesh/Casts.hh
similarity index 100%
rename from Core/Mesh/Casts.hh
rename to src/OpenMesh/Core/Mesh/Casts.hh
diff --git a/Core/Mesh/CirculatorsT.hh b/src/OpenMesh/Core/Mesh/CirculatorsT.hh
similarity index 100%
rename from Core/Mesh/CirculatorsT.hh
rename to src/OpenMesh/Core/Mesh/CirculatorsT.hh
diff --git a/Core/Mesh/FinalMeshItemsT.hh b/src/OpenMesh/Core/Mesh/FinalMeshItemsT.hh
similarity index 100%
rename from Core/Mesh/FinalMeshItemsT.hh
rename to src/OpenMesh/Core/Mesh/FinalMeshItemsT.hh
diff --git a/Core/Mesh/Handles.hh b/src/OpenMesh/Core/Mesh/Handles.hh
similarity index 100%
rename from Core/Mesh/Handles.hh
rename to src/OpenMesh/Core/Mesh/Handles.hh
diff --git a/Core/Mesh/IteratorsT.hh b/src/OpenMesh/Core/Mesh/IteratorsT.hh
similarity index 100%
rename from Core/Mesh/IteratorsT.hh
rename to src/OpenMesh/Core/Mesh/IteratorsT.hh
diff --git a/Core/Mesh/PolyConnectivity.cc b/src/OpenMesh/Core/Mesh/PolyConnectivity.cc
similarity index 100%
rename from Core/Mesh/PolyConnectivity.cc
rename to src/OpenMesh/Core/Mesh/PolyConnectivity.cc
diff --git a/Core/Mesh/PolyConnectivity.hh b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh
similarity index 100%
rename from Core/Mesh/PolyConnectivity.hh
rename to src/OpenMesh/Core/Mesh/PolyConnectivity.hh
diff --git a/Core/Mesh/PolyMeshT.cc b/src/OpenMesh/Core/Mesh/PolyMeshT.cc
similarity index 100%
rename from Core/Mesh/PolyMeshT.cc
rename to src/OpenMesh/Core/Mesh/PolyMeshT.cc
diff --git a/Core/Mesh/PolyMeshT.hh b/src/OpenMesh/Core/Mesh/PolyMeshT.hh
similarity index 100%
rename from Core/Mesh/PolyMeshT.hh
rename to src/OpenMesh/Core/Mesh/PolyMeshT.hh
diff --git a/Core/Mesh/PolyMesh_ArrayKernelT.hh b/src/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh
similarity index 100%
rename from Core/Mesh/PolyMesh_ArrayKernelT.hh
rename to src/OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh
diff --git a/Core/Mesh/Status.hh b/src/OpenMesh/Core/Mesh/Status.hh
similarity index 100%
rename from Core/Mesh/Status.hh
rename to src/OpenMesh/Core/Mesh/Status.hh
diff --git a/Core/Mesh/Traits.hh b/src/OpenMesh/Core/Mesh/Traits.hh
similarity index 100%
rename from Core/Mesh/Traits.hh
rename to src/OpenMesh/Core/Mesh/Traits.hh
diff --git a/Core/Mesh/TriConnectivity.cc b/src/OpenMesh/Core/Mesh/TriConnectivity.cc
similarity index 100%
rename from Core/Mesh/TriConnectivity.cc
rename to src/OpenMesh/Core/Mesh/TriConnectivity.cc
diff --git a/Core/Mesh/TriConnectivity.hh b/src/OpenMesh/Core/Mesh/TriConnectivity.hh
similarity index 100%
rename from Core/Mesh/TriConnectivity.hh
rename to src/OpenMesh/Core/Mesh/TriConnectivity.hh
diff --git a/Core/Mesh/TriMeshT.cc b/src/OpenMesh/Core/Mesh/TriMeshT.cc
similarity index 100%
rename from Core/Mesh/TriMeshT.cc
rename to src/OpenMesh/Core/Mesh/TriMeshT.cc
diff --git a/Core/Mesh/TriMeshT.hh b/src/OpenMesh/Core/Mesh/TriMeshT.hh
similarity index 100%
rename from Core/Mesh/TriMeshT.hh
rename to src/OpenMesh/Core/Mesh/TriMeshT.hh
diff --git a/Core/Mesh/TriMesh_ArrayKernelT.hh b/src/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh
similarity index 100%
rename from Core/Mesh/TriMesh_ArrayKernelT.hh
rename to src/OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh
diff --git a/Core/Mesh/gen/circulators_header.hh b/src/OpenMesh/Core/Mesh/gen/circulators_header.hh
similarity index 100%
rename from Core/Mesh/gen/circulators_header.hh
rename to src/OpenMesh/Core/Mesh/gen/circulators_header.hh
diff --git a/Core/Mesh/gen/circulators_template.hh b/src/OpenMesh/Core/Mesh/gen/circulators_template.hh
similarity index 100%
rename from Core/Mesh/gen/circulators_template.hh
rename to src/OpenMesh/Core/Mesh/gen/circulators_template.hh
diff --git a/Core/Mesh/gen/footer.hh b/src/OpenMesh/Core/Mesh/gen/footer.hh
similarity index 100%
rename from Core/Mesh/gen/footer.hh
rename to src/OpenMesh/Core/Mesh/gen/footer.hh
diff --git a/Core/Mesh/gen/generate.sh b/src/OpenMesh/Core/Mesh/gen/generate.sh
similarity index 100%
rename from Core/Mesh/gen/generate.sh
rename to src/OpenMesh/Core/Mesh/gen/generate.sh
diff --git a/Core/Mesh/gen/iterators_header.hh b/src/OpenMesh/Core/Mesh/gen/iterators_header.hh
similarity index 100%
rename from Core/Mesh/gen/iterators_header.hh
rename to src/OpenMesh/Core/Mesh/gen/iterators_header.hh
diff --git a/Core/Mesh/gen/iterators_template.hh b/src/OpenMesh/Core/Mesh/gen/iterators_template.hh
similarity index 100%
rename from Core/Mesh/gen/iterators_template.hh
rename to src/OpenMesh/Core/Mesh/gen/iterators_template.hh
diff --git a/Core/System/ACGMakefile b/src/OpenMesh/Core/System/ACGMakefile
similarity index 100%
rename from Core/System/ACGMakefile
rename to src/OpenMesh/Core/System/ACGMakefile
diff --git a/Core/System/compiler.hh b/src/OpenMesh/Core/System/compiler.hh
similarity index 100%
rename from Core/System/compiler.hh
rename to src/OpenMesh/Core/System/compiler.hh
diff --git a/Core/System/config.h b/src/OpenMesh/Core/System/config.h
similarity index 100%
rename from Core/System/config.h
rename to src/OpenMesh/Core/System/config.h
diff --git a/Core/System/config.hh b/src/OpenMesh/Core/System/config.hh
similarity index 100%
rename from Core/System/config.hh
rename to src/OpenMesh/Core/System/config.hh
diff --git a/Core/System/mostream.hh b/src/OpenMesh/Core/System/mostream.hh
similarity index 100%
rename from Core/System/mostream.hh
rename to src/OpenMesh/Core/System/mostream.hh
diff --git a/Core/System/omstream.cc b/src/OpenMesh/Core/System/omstream.cc
similarity index 100%
rename from Core/System/omstream.cc
rename to src/OpenMesh/Core/System/omstream.cc
diff --git a/Core/System/omstream.hh b/src/OpenMesh/Core/System/omstream.hh
similarity index 100%
rename from Core/System/omstream.hh
rename to src/OpenMesh/Core/System/omstream.hh
diff --git a/Core/Templates/newClass.cc b/src/OpenMesh/Core/Templates/newClass.cc
similarity index 100%
rename from Core/Templates/newClass.cc
rename to src/OpenMesh/Core/Templates/newClass.cc
diff --git a/Core/Templates/newClass.hh b/src/OpenMesh/Core/Templates/newClass.hh
similarity index 100%
rename from Core/Templates/newClass.hh
rename to src/OpenMesh/Core/Templates/newClass.hh
diff --git a/Core/Templates/newClass.sh b/src/OpenMesh/Core/Templates/newClass.sh
similarity index 100%
rename from Core/Templates/newClass.sh
rename to src/OpenMesh/Core/Templates/newClass.sh
diff --git a/Core/Templates/newClassT.cc b/src/OpenMesh/Core/Templates/newClassT.cc
similarity index 100%
rename from Core/Templates/newClassT.cc
rename to src/OpenMesh/Core/Templates/newClassT.cc
diff --git a/Core/Templates/newClassT.hh b/src/OpenMesh/Core/Templates/newClassT.hh
similarity index 100%
rename from Core/Templates/newClassT.hh
rename to src/OpenMesh/Core/Templates/newClassT.hh
diff --git a/Core/Templates/newClassT.sh b/src/OpenMesh/Core/Templates/newClassT.sh
similarity index 100%
rename from Core/Templates/newClassT.sh
rename to src/OpenMesh/Core/Templates/newClassT.sh
diff --git a/Core/Utils/ACGMakefile b/src/OpenMesh/Core/Utils/ACGMakefile
similarity index 100%
rename from Core/Utils/ACGMakefile
rename to src/OpenMesh/Core/Utils/ACGMakefile
diff --git a/Core/Utils/AutoPropertyHandleT.hh b/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh
similarity index 100%
rename from Core/Utils/AutoPropertyHandleT.hh
rename to src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh
diff --git a/Core/Utils/BaseProperty.cc b/src/OpenMesh/Core/Utils/BaseProperty.cc
similarity index 100%
rename from Core/Utils/BaseProperty.cc
rename to src/OpenMesh/Core/Utils/BaseProperty.cc
diff --git a/Core/Utils/BaseProperty.hh b/src/OpenMesh/Core/Utils/BaseProperty.hh
similarity index 100%
rename from Core/Utils/BaseProperty.hh
rename to src/OpenMesh/Core/Utils/BaseProperty.hh
diff --git a/Core/Utils/Endian.cc b/src/OpenMesh/Core/Utils/Endian.cc
similarity index 100%
rename from Core/Utils/Endian.cc
rename to src/OpenMesh/Core/Utils/Endian.cc
diff --git a/Core/Utils/Endian.hh b/src/OpenMesh/Core/Utils/Endian.hh
similarity index 100%
rename from Core/Utils/Endian.hh
rename to src/OpenMesh/Core/Utils/Endian.hh
diff --git a/Core/Utils/GenProg.hh b/src/OpenMesh/Core/Utils/GenProg.hh
similarity index 100%
rename from Core/Utils/GenProg.hh
rename to src/OpenMesh/Core/Utils/GenProg.hh
diff --git a/Core/Utils/Noncopyable.hh b/src/OpenMesh/Core/Utils/Noncopyable.hh
similarity index 100%
rename from Core/Utils/Noncopyable.hh
rename to src/OpenMesh/Core/Utils/Noncopyable.hh
diff --git a/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh
similarity index 100%
rename from Core/Utils/Property.hh
rename to src/OpenMesh/Core/Utils/Property.hh
diff --git a/Core/Utils/PropertyContainer.hh b/src/OpenMesh/Core/Utils/PropertyContainer.hh
similarity index 100%
rename from Core/Utils/PropertyContainer.hh
rename to src/OpenMesh/Core/Utils/PropertyContainer.hh
diff --git a/Core/Utils/SingletonT.cc b/src/OpenMesh/Core/Utils/SingletonT.cc
similarity index 100%
rename from Core/Utils/SingletonT.cc
rename to src/OpenMesh/Core/Utils/SingletonT.cc
diff --git a/Core/Utils/SingletonT.hh b/src/OpenMesh/Core/Utils/SingletonT.hh
similarity index 100%
rename from Core/Utils/SingletonT.hh
rename to src/OpenMesh/Core/Utils/SingletonT.hh
diff --git a/Core/Utils/color_cast.hh b/src/OpenMesh/Core/Utils/color_cast.hh
similarity index 100%
rename from Core/Utils/color_cast.hh
rename to src/OpenMesh/Core/Utils/color_cast.hh
diff --git a/Core/Utils/vector_cast.hh b/src/OpenMesh/Core/Utils/vector_cast.hh
similarity index 100%
rename from Core/Utils/vector_cast.hh
rename to src/OpenMesh/Core/Utils/vector_cast.hh
diff --git a/Core/Utils/vector_traits.hh b/src/OpenMesh/Core/Utils/vector_traits.hh
similarity index 100%
rename from Core/Utils/vector_traits.hh
rename to src/OpenMesh/Core/Utils/vector_traits.hh
diff --git a/Core/VS2008Core.vcproj b/src/OpenMesh/Core/VS2008Core.vcproj
similarity index 100%
rename from Core/VS2008Core.vcproj
rename to src/OpenMesh/Core/VS2008Core.vcproj
diff --git a/Tools/ACGMakefile b/src/OpenMesh/Tools/ACGMakefile
similarity index 100%
rename from Tools/ACGMakefile
rename to src/OpenMesh/Tools/ACGMakefile
diff --git a/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt
similarity index 100%
rename from Tools/CMakeLists.txt
rename to src/OpenMesh/Tools/CMakeLists.txt
diff --git a/Tools/Decimater/ACGMakefile b/src/OpenMesh/Tools/Decimater/ACGMakefile
similarity index 100%
rename from Tools/Decimater/ACGMakefile
rename to src/OpenMesh/Tools/Decimater/ACGMakefile
diff --git a/Tools/Decimater/CollapseInfoT.hh b/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh
similarity index 100%
rename from Tools/Decimater/CollapseInfoT.hh
rename to src/OpenMesh/Tools/Decimater/CollapseInfoT.hh
diff --git a/Tools/Decimater/DecimaterT.cc b/src/OpenMesh/Tools/Decimater/DecimaterT.cc
similarity index 100%
rename from Tools/Decimater/DecimaterT.cc
rename to src/OpenMesh/Tools/Decimater/DecimaterT.cc
diff --git a/Tools/Decimater/DecimaterT.hh b/src/OpenMesh/Tools/Decimater/DecimaterT.hh
similarity index 100%
rename from Tools/Decimater/DecimaterT.hh
rename to src/OpenMesh/Tools/Decimater/DecimaterT.hh
diff --git a/Tools/Decimater/ModBaseT.hh b/src/OpenMesh/Tools/Decimater/ModBaseT.hh
similarity index 100%
rename from Tools/Decimater/ModBaseT.hh
rename to src/OpenMesh/Tools/Decimater/ModBaseT.hh
diff --git a/Tools/Decimater/ModIndependentSetsT.hh b/src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh
similarity index 100%
rename from Tools/Decimater/ModIndependentSetsT.hh
rename to src/OpenMesh/Tools/Decimater/ModIndependentSetsT.hh
diff --git a/Tools/Decimater/ModNormalFlippingT.hh b/src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh
similarity index 100%
rename from Tools/Decimater/ModNormalFlippingT.hh
rename to src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh
diff --git a/Tools/Decimater/ModProgMeshT.cc b/src/OpenMesh/Tools/Decimater/ModProgMeshT.cc
similarity index 100%
rename from Tools/Decimater/ModProgMeshT.cc
rename to src/OpenMesh/Tools/Decimater/ModProgMeshT.cc
diff --git a/Tools/Decimater/ModProgMeshT.hh b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh
similarity index 100%
rename from Tools/Decimater/ModProgMeshT.hh
rename to src/OpenMesh/Tools/Decimater/ModProgMeshT.hh
diff --git a/Tools/Decimater/ModQuadricT.cc b/src/OpenMesh/Tools/Decimater/ModQuadricT.cc
similarity index 100%
rename from Tools/Decimater/ModQuadricT.cc
rename to src/OpenMesh/Tools/Decimater/ModQuadricT.cc
diff --git a/Tools/Decimater/ModQuadricT.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh
similarity index 100%
rename from Tools/Decimater/ModQuadricT.hh
rename to src/OpenMesh/Tools/Decimater/ModQuadricT.hh
diff --git a/Tools/Decimater/ModRoundnessT.hh b/src/OpenMesh/Tools/Decimater/ModRoundnessT.hh
similarity index 100%
rename from Tools/Decimater/ModRoundnessT.hh
rename to src/OpenMesh/Tools/Decimater/ModRoundnessT.hh
diff --git a/Tools/Decimater/calc-roundness.m b/src/OpenMesh/Tools/Decimater/calc-roundness.m
similarity index 100%
rename from Tools/Decimater/calc-roundness.m
rename to src/OpenMesh/Tools/Decimater/calc-roundness.m
diff --git a/Tools/Decimater/roundness.m b/src/OpenMesh/Tools/Decimater/roundness.m
similarity index 100%
rename from Tools/Decimater/roundness.m
rename to src/OpenMesh/Tools/Decimater/roundness.m
diff --git a/Tools/Decimater/roundness.sh b/src/OpenMesh/Tools/Decimater/roundness.sh
similarity index 100%
rename from Tools/Decimater/roundness.sh
rename to src/OpenMesh/Tools/Decimater/roundness.sh
diff --git a/Tools/Kernel_OSG/ACGMakefile b/src/OpenMesh/Tools/Kernel_OSG/ACGMakefile
similarity index 100%
rename from Tools/Kernel_OSG/ACGMakefile
rename to src/OpenMesh/Tools/Kernel_OSG/ACGMakefile
diff --git a/Tools/Kernel_OSG/ArrayKernelT.hh b/src/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh
similarity index 100%
rename from Tools/Kernel_OSG/ArrayKernelT.hh
rename to src/OpenMesh/Tools/Kernel_OSG/ArrayKernelT.hh
diff --git a/Tools/Kernel_OSG/AttribKernelT.hh b/src/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh
similarity index 100%
rename from Tools/Kernel_OSG/AttribKernelT.hh
rename to src/OpenMesh/Tools/Kernel_OSG/AttribKernelT.hh
diff --git a/Tools/Kernel_OSG/PropertyKernel.hh b/src/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh
similarity index 100%
rename from Tools/Kernel_OSG/PropertyKernel.hh
rename to src/OpenMesh/Tools/Kernel_OSG/PropertyKernel.hh
diff --git a/Tools/Kernel_OSG/PropertyT.hh b/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh
similarity index 100%
rename from Tools/Kernel_OSG/PropertyT.hh
rename to src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh
diff --git a/Tools/Kernel_OSG/Traits.hh b/src/OpenMesh/Tools/Kernel_OSG/Traits.hh
similarity index 100%
rename from Tools/Kernel_OSG/Traits.hh
rename to src/OpenMesh/Tools/Kernel_OSG/Traits.hh
diff --git a/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh b/src/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh
similarity index 100%
rename from Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh
rename to src/OpenMesh/Tools/Kernel_OSG/TriMesh_OSGArrayKernelT.hh
diff --git a/Tools/Kernel_OSG/VectorAdapter.hh b/src/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh
similarity index 100%
rename from Tools/Kernel_OSG/VectorAdapter.hh
rename to src/OpenMesh/Tools/Kernel_OSG/VectorAdapter.hh
diff --git a/Tools/Kernel_OSG/bindT.hh b/src/OpenMesh/Tools/Kernel_OSG/bindT.hh
similarity index 100%
rename from Tools/Kernel_OSG/bindT.hh
rename to src/OpenMesh/Tools/Kernel_OSG/bindT.hh
diff --git a/Tools/Kernel_OSG/color_cast.hh b/src/OpenMesh/Tools/Kernel_OSG/color_cast.hh
similarity index 100%
rename from Tools/Kernel_OSG/color_cast.hh
rename to src/OpenMesh/Tools/Kernel_OSG/color_cast.hh
diff --git a/Tools/Smoother/JacobiLaplaceSmootherT.cc b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
similarity index 100%
rename from Tools/Smoother/JacobiLaplaceSmootherT.cc
rename to src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
diff --git a/Tools/Smoother/JacobiLaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh
similarity index 100%
rename from Tools/Smoother/JacobiLaplaceSmootherT.hh
rename to src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh
diff --git a/Tools/Smoother/LaplaceSmootherT.cc b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc
similarity index 100%
rename from Tools/Smoother/LaplaceSmootherT.cc
rename to src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc
diff --git a/Tools/Smoother/LaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh
similarity index 100%
rename from Tools/Smoother/LaplaceSmootherT.hh
rename to src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh
diff --git a/Tools/Smoother/SmootherT.cc b/src/OpenMesh/Tools/Smoother/SmootherT.cc
similarity index 100%
rename from Tools/Smoother/SmootherT.cc
rename to src/OpenMesh/Tools/Smoother/SmootherT.cc
diff --git a/Tools/Smoother/SmootherT.hh b/src/OpenMesh/Tools/Smoother/SmootherT.hh
similarity index 100%
rename from Tools/Smoother/SmootherT.hh
rename to src/OpenMesh/Tools/Smoother/SmootherT.hh
diff --git a/Tools/Smoother/smooth_mesh.hh b/src/OpenMesh/Tools/Smoother/smooth_mesh.hh
similarity index 100%
rename from Tools/Smoother/smooth_mesh.hh
rename to src/OpenMesh/Tools/Smoother/smooth_mesh.hh
diff --git a/Tools/Subdivider/ACGMakefile b/src/OpenMesh/Tools/Subdivider/ACGMakefile
similarity index 100%
rename from Tools/Subdivider/ACGMakefile
rename to src/OpenMesh/Tools/Subdivider/ACGMakefile
diff --git a/Tools/Subdivider/Adaptive/ACGMakefile b/src/OpenMesh/Tools/Subdivider/Adaptive/ACGMakefile
similarity index 100%
rename from Tools/Subdivider/Adaptive/ACGMakefile
rename to src/OpenMesh/Tools/Subdivider/Adaptive/ACGMakefile
diff --git a/Tools/Subdivider/Adaptive/Composite/ACGMakefile b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/ACGMakefile
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/ACGMakefile
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/ACGMakefile
diff --git a/Tools/Subdivider/Adaptive/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/CompositeT.cc
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc
diff --git a/Tools/Subdivider/Adaptive/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/CompositeT.hh
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh
diff --git a/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeTraits.hh
diff --git a/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh
diff --git a/Tools/Subdivider/Adaptive/Composite/RulesT.cc b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/RulesT.cc
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
diff --git a/Tools/Subdivider/Adaptive/Composite/RulesT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/RulesT.hh
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh
diff --git a/Tools/Subdivider/Adaptive/Composite/Traits.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh
similarity index 100%
rename from Tools/Subdivider/Adaptive/Composite/Traits.hh
rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/Traits.hh
diff --git a/Tools/Subdivider/Uniform/ACGMakefile b/src/OpenMesh/Tools/Subdivider/Uniform/ACGMakefile
similarity index 100%
rename from Tools/Subdivider/Uniform/ACGMakefile
rename to src/OpenMesh/Tools/Subdivider/Uniform/ACGMakefile
diff --git a/Tools/Subdivider/Uniform/Composite/ACGMakefile b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/ACGMakefile
similarity index 100%
rename from Tools/Subdivider/Uniform/Composite/ACGMakefile
rename to src/OpenMesh/Tools/Subdivider/Uniform/Composite/ACGMakefile
diff --git a/Tools/Subdivider/Uniform/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
similarity index 100%
rename from Tools/Subdivider/Uniform/Composite/CompositeT.cc
rename to src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
diff --git a/Tools/Subdivider/Uniform/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/Composite/CompositeT.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh
diff --git a/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/Composite/CompositeTraits.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh
diff --git a/Tools/Subdivider/Uniform/CompositeLoopT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/CompositeLoopT.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/CompositeLoopT.hh
diff --git a/Tools/Subdivider/Uniform/CompositeSqrt3T.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/CompositeSqrt3T.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/CompositeSqrt3T.hh
diff --git a/Tools/Subdivider/Uniform/LoopT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/LoopT.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/LoopT.hh
diff --git a/Tools/Subdivider/Uniform/Sqrt3T.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/Sqrt3T.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh
diff --git a/Tools/Subdivider/Uniform/SubdividerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh
similarity index 100%
rename from Tools/Subdivider/Uniform/SubdividerT.hh
rename to src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh
diff --git a/Tools/Tools.pro b/src/OpenMesh/Tools/Tools.pro
similarity index 81%
rename from Tools/Tools.pro
rename to src/OpenMesh/Tools/Tools.pro
index 76c2df6f..f540866f 100644
--- a/Tools/Tools.pro
+++ b/src/OpenMesh/Tools/Tools.pro
@@ -16,6 +16,16 @@ DIRECTORIES = . Decimater Smoother Subdivider/Adaptive/Composite \
 
 INCLUDEPATH += ../..
 
+DESTDIR = $${TOPDIR}/lib
+
+CONFIG( debug, debug|release ){
+        TARGET    = OpenMeshToolsd
+} else {
+        TARGET    = OpenMeshTools
+}
+
+
+
 win32 {
  DEFINES += _USE_MATH_DEFINES NOMINMAX
  CONFIG  += static
@@ -23,7 +33,7 @@ win32 {
 
 macx {
       # Set library binary header to the correct path
-      QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY}/
+      QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$${TOPDIR}/lib/$${BUILDDIRECTORY}/
       export(QMAKE_LFLAGS_SONAME)
 }
 
diff --git a/Tools/Utils/ACGMakefile b/src/OpenMesh/Tools/Utils/ACGMakefile
similarity index 100%
rename from Tools/Utils/ACGMakefile
rename to src/OpenMesh/Tools/Utils/ACGMakefile
diff --git a/Tools/Utils/Config.hh b/src/OpenMesh/Tools/Utils/Config.hh
similarity index 100%
rename from Tools/Utils/Config.hh
rename to src/OpenMesh/Tools/Utils/Config.hh
diff --git a/Tools/Utils/GLConstAsString.hh b/src/OpenMesh/Tools/Utils/GLConstAsString.hh
similarity index 100%
rename from Tools/Utils/GLConstAsString.hh
rename to src/OpenMesh/Tools/Utils/GLConstAsString.hh
diff --git a/Tools/Utils/Gnuplot.cc b/src/OpenMesh/Tools/Utils/Gnuplot.cc
similarity index 100%
rename from Tools/Utils/Gnuplot.cc
rename to src/OpenMesh/Tools/Utils/Gnuplot.cc
diff --git a/Tools/Utils/Gnuplot.hh b/src/OpenMesh/Tools/Utils/Gnuplot.hh
similarity index 100%
rename from Tools/Utils/Gnuplot.hh
rename to src/OpenMesh/Tools/Utils/Gnuplot.hh
diff --git a/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh
similarity index 100%
rename from Tools/Utils/HeapT.hh
rename to src/OpenMesh/Tools/Utils/HeapT.hh
diff --git a/Tools/Utils/MeshCheckerT.cc b/src/OpenMesh/Tools/Utils/MeshCheckerT.cc
similarity index 100%
rename from Tools/Utils/MeshCheckerT.cc
rename to src/OpenMesh/Tools/Utils/MeshCheckerT.cc
diff --git a/Tools/Utils/MeshCheckerT.hh b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh
similarity index 100%
rename from Tools/Utils/MeshCheckerT.hh
rename to src/OpenMesh/Tools/Utils/MeshCheckerT.hh
diff --git a/Tools/Utils/NumLimitsT.hh b/src/OpenMesh/Tools/Utils/NumLimitsT.hh
similarity index 100%
rename from Tools/Utils/NumLimitsT.hh
rename to src/OpenMesh/Tools/Utils/NumLimitsT.hh
diff --git a/Tools/Utils/StripifierT.cc b/src/OpenMesh/Tools/Utils/StripifierT.cc
similarity index 100%
rename from Tools/Utils/StripifierT.cc
rename to src/OpenMesh/Tools/Utils/StripifierT.cc
diff --git a/Tools/Utils/StripifierT.hh b/src/OpenMesh/Tools/Utils/StripifierT.hh
similarity index 100%
rename from Tools/Utils/StripifierT.hh
rename to src/OpenMesh/Tools/Utils/StripifierT.hh
diff --git a/Tools/Utils/TestingFramework.hh b/src/OpenMesh/Tools/Utils/TestingFramework.hh
similarity index 100%
rename from Tools/Utils/TestingFramework.hh
rename to src/OpenMesh/Tools/Utils/TestingFramework.hh
diff --git a/Tools/Utils/Timer.cc b/src/OpenMesh/Tools/Utils/Timer.cc
similarity index 100%
rename from Tools/Utils/Timer.cc
rename to src/OpenMesh/Tools/Utils/Timer.cc
diff --git a/Tools/Utils/Timer.hh b/src/OpenMesh/Tools/Utils/Timer.hh
similarity index 100%
rename from Tools/Utils/Timer.hh
rename to src/OpenMesh/Tools/Utils/Timer.hh
diff --git a/Tools/Utils/conio.cc b/src/OpenMesh/Tools/Utils/conio.cc
similarity index 100%
rename from Tools/Utils/conio.cc
rename to src/OpenMesh/Tools/Utils/conio.cc
diff --git a/Tools/Utils/conio.hh b/src/OpenMesh/Tools/Utils/conio.hh
similarity index 100%
rename from Tools/Utils/conio.hh
rename to src/OpenMesh/Tools/Utils/conio.hh
diff --git a/Tools/Utils/getopt.c b/src/OpenMesh/Tools/Utils/getopt.c
similarity index 100%
rename from Tools/Utils/getopt.c
rename to src/OpenMesh/Tools/Utils/getopt.c
diff --git a/Tools/Utils/getopt.h b/src/OpenMesh/Tools/Utils/getopt.h
similarity index 100%
rename from Tools/Utils/getopt.h
rename to src/OpenMesh/Tools/Utils/getopt.h
diff --git a/Tools/VDPM/ACGMakefile b/src/OpenMesh/Tools/VDPM/ACGMakefile
similarity index 100%
rename from Tools/VDPM/ACGMakefile
rename to src/OpenMesh/Tools/VDPM/ACGMakefile
diff --git a/Tools/VDPM/MeshTraits.hh b/src/OpenMesh/Tools/VDPM/MeshTraits.hh
similarity index 100%
rename from Tools/VDPM/MeshTraits.hh
rename to src/OpenMesh/Tools/VDPM/MeshTraits.hh
diff --git a/Tools/VDPM/StreamingDef.hh b/src/OpenMesh/Tools/VDPM/StreamingDef.hh
similarity index 100%
rename from Tools/VDPM/StreamingDef.hh
rename to src/OpenMesh/Tools/VDPM/StreamingDef.hh
diff --git a/Tools/VDPM/VFront.cc b/src/OpenMesh/Tools/VDPM/VFront.cc
similarity index 100%
rename from Tools/VDPM/VFront.cc
rename to src/OpenMesh/Tools/VDPM/VFront.cc
diff --git a/Tools/VDPM/VFront.hh b/src/OpenMesh/Tools/VDPM/VFront.hh
similarity index 100%
rename from Tools/VDPM/VFront.hh
rename to src/OpenMesh/Tools/VDPM/VFront.hh
diff --git a/Tools/VDPM/VHierarchy.cc b/src/OpenMesh/Tools/VDPM/VHierarchy.cc
similarity index 100%
rename from Tools/VDPM/VHierarchy.cc
rename to src/OpenMesh/Tools/VDPM/VHierarchy.cc
diff --git a/Tools/VDPM/VHierarchy.hh b/src/OpenMesh/Tools/VDPM/VHierarchy.hh
similarity index 100%
rename from Tools/VDPM/VHierarchy.hh
rename to src/OpenMesh/Tools/VDPM/VHierarchy.hh
diff --git a/Tools/VDPM/VHierarchyNode.hh b/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh
similarity index 100%
rename from Tools/VDPM/VHierarchyNode.hh
rename to src/OpenMesh/Tools/VDPM/VHierarchyNode.hh
diff --git a/Tools/VDPM/VHierarchyNodeIndex.cc b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.cc
similarity index 100%
rename from Tools/VDPM/VHierarchyNodeIndex.cc
rename to src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.cc
diff --git a/Tools/VDPM/VHierarchyNodeIndex.hh b/src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh
similarity index 100%
rename from Tools/VDPM/VHierarchyNodeIndex.hh
rename to src/OpenMesh/Tools/VDPM/VHierarchyNodeIndex.hh
diff --git a/Tools/VDPM/VHierarchyWindow.cc b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc
similarity index 100%
rename from Tools/VDPM/VHierarchyWindow.cc
rename to src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc
diff --git a/Tools/VDPM/VHierarchyWindow.hh b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh
similarity index 100%
rename from Tools/VDPM/VHierarchyWindow.hh
rename to src/OpenMesh/Tools/VDPM/VHierarchyWindow.hh
diff --git a/Tools/VDPM/ViewingParameters.cc b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc
similarity index 100%
rename from Tools/VDPM/ViewingParameters.cc
rename to src/OpenMesh/Tools/VDPM/ViewingParameters.cc
diff --git a/Tools/VDPM/ViewingParameters.hh b/src/OpenMesh/Tools/VDPM/ViewingParameters.hh
similarity index 100%
rename from Tools/VDPM/ViewingParameters.hh
rename to src/OpenMesh/Tools/VDPM/ViewingParameters.hh
diff --git a/Tools/VDPM/xpm/fileopen.xpm b/src/OpenMesh/Tools/VDPM/xpm/fileopen.xpm
similarity index 100%
rename from Tools/VDPM/xpm/fileopen.xpm
rename to src/OpenMesh/Tools/VDPM/xpm/fileopen.xpm
diff --git a/Tools/VDPM/xpm/fileprint.xpm b/src/OpenMesh/Tools/VDPM/xpm/fileprint.xpm
similarity index 100%
rename from Tools/VDPM/xpm/fileprint.xpm
rename to src/OpenMesh/Tools/VDPM/xpm/fileprint.xpm
diff --git a/Tools/VDPM/xpm/filesave.xpm b/src/OpenMesh/Tools/VDPM/xpm/filesave.xpm
similarity index 100%
rename from Tools/VDPM/xpm/filesave.xpm
rename to src/OpenMesh/Tools/VDPM/xpm/filesave.xpm
diff --git a/Tools/VS2008Tools.vcproj b/src/OpenMesh/Tools/VS2008Tools.vcproj
similarity index 100%
rename from Tools/VS2008Tools.vcproj
rename to src/OpenMesh/Tools/VS2008Tools.vcproj