diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index e482807c7..e81e06233 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -990,6 +990,7 @@ MESSAGE(STATUS "Disabled exporter formats:${ASSIMP_EXPORTERS_DISABLED}")
 SET( assimp_src
   # Assimp Files
   ${Core_SRCS}
+  ${CApi_SRCS}
   ${Common_SRCS}
   ${Logging_SRCS}
   ${Exporter_SRCS}
diff --git a/test/models/PLY/cube_test.ply b/test/models/PLY/cube_test.ply
index a86d022a5..068514afe 100644
--- a/test/models/PLY/cube_test.ply
+++ b/test/models/PLY/cube_test.ply
@@ -1,6 +1,6 @@
 ply
 format ascii 1.0
-comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.3297435427)
+comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.4151146389)
 element vertex 8
 property float x
 property float y
diff --git a/test/unit/utBatchLoader.cpp b/test/unit/utBatchLoader.cpp
index d38f83b35..36dcbf288 100644
--- a/test/unit/utBatchLoader.cpp
+++ b/test/unit/utBatchLoader.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include "UnitTestPCH.h"
-#include "Importer.h"
+#include "Common/Importer.h"
 #include "TestIOSystem.h"
 
 using namespace ::Assimp;
diff --git a/test/unit/utBlenderIntermediate.cpp b/test/unit/utBlenderIntermediate.cpp
index c1b53bbfd..30f29017d 100644
--- a/test/unit/utBlenderIntermediate.cpp
+++ b/test/unit/utBlenderIntermediate.cpp
@@ -41,11 +41,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include "UnitTestPCH.h"
-#include "BlenderIntermediate.h"
-#include "./../include/assimp/camera.h"
-#include "./../include/assimp/light.h"
-#include "./../include/assimp/mesh.h"
-#include "./../include/assimp/texture.h"
+#include "Blender/BlenderIntermediate.h"
+#include <assimp/camera.h>
+#include <assimp/light.h>
+#include <assimp/mesh.h>
+#include <assimp/texture.h>
 
 using namespace ::Assimp;
 using namespace ::Assimp::Blender;
diff --git a/test/unit/utD3MFImportExport.cpp b/test/unit/utD3MFImportExport.cpp
index 9d97f0f19..c9b17d898 100644
--- a/test/unit/utD3MFImportExport.cpp
+++ b/test/unit/utD3MFImportExport.cpp
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/scene.h>
 #include <assimp/postprocess.h>
 
-#include "D3MFExporter.h"
+#include "3MF/D3MFExporter.h"
 
 class utD3MFImporterExporter : public AbstractImportExportBase {
 public:
diff --git a/test/unit/utFindDegenerates.cpp b/test/unit/utFindDegenerates.cpp
index d6ef803fa..ea539df27 100644
--- a/test/unit/utFindDegenerates.cpp
+++ b/test/unit/utFindDegenerates.cpp
@@ -42,8 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 
-#include <FindDegenerates.h>
-
+#include "PostProcessing/FindDegenerates.h"
 
 using namespace std;
 using namespace Assimp;
diff --git a/test/unit/utFindInvalidData.cpp b/test/unit/utFindInvalidData.cpp
index 953c6728c..5b874a2a4 100644
--- a/test/unit/utFindInvalidData.cpp
+++ b/test/unit/utFindInvalidData.cpp
@@ -42,9 +42,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 
-#include <FindInvalidDataProcess.h>
-#include "../../include/assimp/mesh.h"
-
+#include "PostProcessing/FindInvalidDataProcess.h"
+#include <assimp/mesh.h>
 
 using namespace std;
 using namespace Assimp;
@@ -61,8 +60,7 @@ protected:
 };
 
 // ------------------------------------------------------------------------------------------------
-void FindInvalidDataProcessTest::SetUp()
-{
+void FindInvalidDataProcessTest::SetUp() {
     ASSERT_TRUE( AI_MAX_NUMBER_OF_TEXTURECOORDS >= 3);
 
     piProcess = new FindInvalidDataProcess();
diff --git a/test/unit/utGenNormals.cpp b/test/unit/utGenNormals.cpp
index 65ab7c833..36f0b18bc 100644
--- a/test/unit/utGenNormals.cpp
+++ b/test/unit/utGenNormals.cpp
@@ -41,7 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include "UnitTestPCH.h"
-#include <GenVertexNormalsProcess.h>
+
+#include "PostProcessing/GenVertexNormalsProcess.h"
 
 using namespace ::std;
 using namespace ::Assimp;
diff --git a/test/unit/utJoinVertices.cpp b/test/unit/utJoinVertices.cpp
index 067c0558c..6b832b73d 100644
--- a/test/unit/utJoinVertices.cpp
+++ b/test/unit/utJoinVertices.cpp
@@ -43,14 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <JoinVerticesProcess.h>
 
+#include "PostProcessing/JoinVerticesProcess.h"
 
 using namespace std;
 using namespace Assimp;
 
-class JoinVerticesTest : public ::testing::Test
-{
+class JoinVerticesTest : public ::testing::Test {
 public:
     virtual void SetUp();
     virtual void TearDown();
diff --git a/test/unit/utLimitBoneWeights.cpp b/test/unit/utLimitBoneWeights.cpp
index 48da66df0..5172976b4 100644
--- a/test/unit/utLimitBoneWeights.cpp
+++ b/test/unit/utLimitBoneWeights.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <LimitBoneWeightsProcess.h>
+#include "PostProcessing/LimitBoneWeightsProcess.h"
 
 using namespace std;
 using namespace Assimp;
diff --git a/test/unit/utMaterialSystem.cpp b/test/unit/utMaterialSystem.cpp
index c2a9b520b..701b933e7 100644
--- a/test/unit/utMaterialSystem.cpp
+++ b/test/unit/utMaterialSystem.cpp
@@ -43,13 +43,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <MaterialSystem.h>
+#include "Material/MaterialSystem.h"
 
 using namespace ::std;
 using namespace ::Assimp;
 
-class MaterialSystemTest : public ::testing::Test
-{
+class MaterialSystemTest : public ::testing::Test {
 public:
     virtual void SetUp() { this->pcMat = new aiMaterial(); }
     virtual void TearDown() { delete this->pcMat; }
diff --git a/test/unit/utObjTools.cpp b/test/unit/utObjTools.cpp
index e08b5de79..2de45d962 100644
--- a/test/unit/utObjTools.cpp
+++ b/test/unit/utObjTools.cpp
@@ -41,8 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include "UnitTestPCH.h"
-#include "ObjTools.h"
-#include "ObjFileParser.h"
+#include "Obj/ObjTools.h"
+#include "Obj/ObjFileParser.h"
 
 using namespace ::Assimp;
 
diff --git a/test/unit/utPMXImporter.cpp b/test/unit/utPMXImporter.cpp
index 3a1ce1f6a..62d3b0707 100644
--- a/test/unit/utPMXImporter.cpp
+++ b/test/unit/utPMXImporter.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 #include "SceneDiffer.h"
 #include "AbstractImportExportBase.h"
-#include "MMDImporter.h"
+#include "MMD/MMDImporter.h"
 
 #include <assimp/Importer.hpp>
 
diff --git a/test/unit/utPretransformVertices.cpp b/test/unit/utPretransformVertices.cpp
index 0bf6245c6..22d1b28b4 100644
--- a/test/unit/utPretransformVertices.cpp
+++ b/test/unit/utPretransformVertices.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <PretransformVertices.h>
+#include "PostProcessing/PretransformVertices.h"
 
 
 using namespace std;
diff --git a/test/unit/utRemoveComponent.cpp b/test/unit/utRemoveComponent.cpp
index 1b13989dd..a1ae7ef47 100644
--- a/test/unit/utRemoveComponent.cpp
+++ b/test/unit/utRemoveComponent.cpp
@@ -43,22 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <RemoveVCProcess.h>
-#include <MaterialSystem.h>
-
+#include "PostProcessing/RemoveVCProcess.h"
+#include "Material/MaterialSystem.h"
 
 using namespace std;
 using namespace Assimp;
 
-class RemoveVCProcessTest : public ::testing::Test
-{
+class RemoveVCProcessTest : public ::testing::Test {
 public:
-
     virtual void SetUp();
     virtual void TearDown();
 
 protected:
-
     RemoveVCProcess* piProcess;
     aiScene* pScene;
 };
diff --git a/test/unit/utRemoveRedundantMaterials.cpp b/test/unit/utRemoveRedundantMaterials.cpp
index c3497595b..7810afbef 100644
--- a/test/unit/utRemoveRedundantMaterials.cpp
+++ b/test/unit/utRemoveRedundantMaterials.cpp
@@ -43,24 +43,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <RemoveRedundantMaterials.h>
-#include <MaterialSystem.h>
-
+#include "PostProcessing/RemoveRedundantMaterials.h"
+#include "Material/MaterialSystem.h"
 
 using namespace std;
 using namespace Assimp;
 
-class RemoveRedundantMatsTest : public ::testing::Test
-{
+class RemoveRedundantMatsTest : public ::testing::Test {
 public:
-
     virtual void SetUp();
     virtual void TearDown();
 
 protected:
-
     RemoveRedundantMatsProcess* piProcess;
-
     aiScene* pcScene1;
 };
 
diff --git a/test/unit/utRemoveVCProcess.cpp b/test/unit/utRemoveVCProcess.cpp
index 1eedf9842..8db5941d0 100644
--- a/test/unit/utRemoveVCProcess.cpp
+++ b/test/unit/utRemoveVCProcess.cpp
@@ -41,7 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include "UnitTestPCH.h"
-#include "code/RemoveVCProcess.h"
+#include "PostProcessing/RemoveVCProcess.h"
+
 #include <assimp/mesh.h>
 #include <assimp/scene.h>
 
diff --git a/test/unit/utSIBImporter.cpp b/test/unit/utSIBImporter.cpp
index 4d6a09783..582baef64 100644
--- a/test/unit/utSIBImporter.cpp
+++ b/test/unit/utSIBImporter.cpp
@@ -42,9 +42,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 
-#include "SIBImporter.h"
+#include "SIB/SIBImporter.h"
+
 #include <assimp/Importer.hpp>
 #include <assimp/postprocess.h>
+
 #include "AbstractImportExportBase.h"
 
 using namespace ::Assimp;
diff --git a/test/unit/utSMDImportExport.cpp b/test/unit/utSMDImportExport.cpp
index 500277099..dae490508 100644
--- a/test/unit/utSMDImportExport.cpp
+++ b/test/unit/utSMDImportExport.cpp
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 
-#include "SMDLoader.h"
+#include "SMD/SMDLoader.h"
 #include <assimp/Importer.hpp>
 #include <assimp/postprocess.h>
 #include "AbstractImportExportBase.h"
diff --git a/test/unit/utScaleProcess.cpp b/test/unit/utScaleProcess.cpp
index 13a184249..fe87daa8d 100644
--- a/test/unit/utScaleProcess.cpp
+++ b/test/unit/utScaleProcess.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
 #include "UnitTestPCH.h"
-#include "ScaleProcess.h"
+#include "PostProcessing/ScaleProcess.h"
 #include "TestModelFactory.h"
 
 namespace Assimp {
diff --git a/test/unit/utScenePreprocessor.cpp b/test/unit/utScenePreprocessor.cpp
index 5e1af334c..2c181a90f 100644
--- a/test/unit/utScenePreprocessor.cpp
+++ b/test/unit/utScenePreprocessor.cpp
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/mesh.h>
 #include <assimp/scene.h>
 #include <assimp/Importer.hpp>
-#include <ScenePreprocessor.h>
+#include "Common/ScenePreprocessor.h"
 
 using namespace std;
 using namespace Assimp;
diff --git a/test/unit/utSharedPPData.cpp b/test/unit/utSharedPPData.cpp
index 380235c58..53008a27a 100644
--- a/test/unit/utSharedPPData.cpp
+++ b/test/unit/utSharedPPData.cpp
@@ -43,21 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <BaseProcess.h>
 
+#include "Common/BaseProcess.h"
 
 using namespace std;
 using namespace Assimp;
 
-class SharedPPDataTest : public ::testing::Test
-{
+class SharedPPDataTest : public ::testing::Test {
 public:
-
     virtual void SetUp();
     virtual void TearDown();
 
 protected:
-
     SharedPostProcessInfo* shared;
 };
 
diff --git a/test/unit/utSimd.cpp b/test/unit/utSimd.cpp
index e7779a0ee..d6bd9fe90 100644
--- a/test/unit/utSimd.cpp
+++ b/test/unit/utSimd.cpp
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "UnitTestPCH.h"
 
-#include "simd.h"
+#include "Common/simd.h"
 
 using namespace ::Assimp;
 
diff --git a/test/unit/utSortByPType.cpp b/test/unit/utSortByPType.cpp
index 4d9240c93..1aa9dad0a 100644
--- a/test/unit/utSortByPType.cpp
+++ b/test/unit/utSortByPType.cpp
@@ -43,29 +43,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <ScenePreprocessor.h>
-#include <SortByPTypeProcess.h>
+#include "Common/ScenePreprocessor.h"
+#include "PostProcessing/SortByPTypeProcess.h"
 
 using namespace std;
 using namespace Assimp;
 
 
-class SortByPTypeProcessTest : public ::testing::Test
-{
+class SortByPTypeProcessTest : public ::testing::Test {
 public:
-
     virtual void SetUp();
     virtual void TearDown();
 
 protected:
-
     SortByPTypeProcess* process1;
     aiScene* scene;
 };
 
 // ------------------------------------------------------------------------------------------------
-static unsigned int num[10][4] =
-    {
+static unsigned int num[10][4] = {
         {0,0,0,1000},
         {0,0,1000,0},
         {0,1000,0,0},
diff --git a/test/unit/utSplitLargeMeshes.cpp b/test/unit/utSplitLargeMeshes.cpp
index fced5df4b..fb3f2a037 100644
--- a/test/unit/utSplitLargeMeshes.cpp
+++ b/test/unit/utSplitLargeMeshes.cpp
@@ -43,16 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <SplitLargeMeshes.h>
-
+#include "PostProcessing/SplitLargeMeshes.h"
 
 using namespace std;
 using namespace Assimp;
 
-class SplitLargeMeshesTest : public ::testing::Test
-{
+class SplitLargeMeshesTest : public ::testing::Test {
 public:
-
     virtual void SetUp();
     virtual void TearDown();
 
diff --git a/test/unit/utTriangulate.cpp b/test/unit/utTriangulate.cpp
index 8c42000cd..c65e24a95 100644
--- a/test/unit/utTriangulate.cpp
+++ b/test/unit/utTriangulate.cpp
@@ -43,7 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include <assimp/scene.h>
-#include <TriangulateProcess.h>
+
+#include "PostProcessing/TriangulateProcess.h"
 
 
 using namespace std;
diff --git a/test/unit/utVertexTriangleAdjacency.cpp b/test/unit/utVertexTriangleAdjacency.cpp
index f15b0d21f..e48d3521e 100644
--- a/test/unit/utVertexTriangleAdjacency.cpp
+++ b/test/unit/utVertexTriangleAdjacency.cpp
@@ -42,19 +42,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "UnitTestPCH.h"
 
-#include "assimp/types.h"
-#include "assimp/mesh.h"
-
-#include <VertexTriangleAdjacency.h>
+#include <assimp/types.h>
+#include <assimp/mesh.h>
 
+#include "Common/VertexTriangleAdjacency.h"
 
 using namespace std;
 using namespace Assimp;
 
-class VTAdjacencyTest : public ::testing::Test
-{
+class VTAdjacencyTest : public ::testing::Test {
 protected:
-
     void checkMesh(const aiMesh& mesh);
 };
 
diff --git a/tools/assimp_cmd/CompareDump.cpp b/tools/assimp_cmd/CompareDump.cpp
index 0ea0893f9..db7e3aada 100644
--- a/tools/assimp_cmd/CompareDump.cpp
+++ b/tools/assimp_cmd/CompareDump.cpp
@@ -53,7 +53,7 @@ const char* AICMD_MSG_CMPDUMP_HELP =
 "\tCompare two short dumps produced with \'assimp dump <..> -s\' for equality.\n"
 ;
 
-#include "../../code/assbin_chunks.h"
+#include "Common/assbin_chunks.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #include "generic_inserter.hpp"
@@ -62,7 +62,7 @@ const char* AICMD_MSG_CMPDUMP_HELP =
 #include <stack>
 #include <sstream>
 #include <iostream>
-#include "../../include/assimp/ai_assert.h"
+#include <assimp/ai_assert.h>
 
 // get << for aiString
 template <typename char_t, typename traits_t>
diff --git a/tools/assimp_cmd/WriteDumb.cpp b/tools/assimp_cmd/WriteDumb.cpp
index 0d6f58c60..559bf08c6 100644
--- a/tools/assimp_cmd/WriteDumb.cpp
+++ b/tools/assimp_cmd/WriteDumb.cpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "Main.h"
-#include "../code/ProcessHelper.h"
+#include "PostProcessing/ProcessHelper.h"
 
 const char* AICMD_MSG_DUMP_HELP = 
 "assimp dump <model> [<out>] [-b] [-s] [-z] [common parameters]\n"
@@ -59,7 +59,7 @@ const char* AICMD_MSG_DUMP_HELP =
 "\t -cfull    Fires almost all post processing steps \n"
 ;
 
-#include "../../code/assbin_chunks.h"
+#include "Common/assbin_chunks.h"
 
 FILE* out = NULL;
 bool shortened = false;
diff --git a/tools/assimp_view/Normals.cpp b/tools/assimp_view/Normals.cpp
index 4ce706c6a..0ebd3dd5b 100644
--- a/tools/assimp_view/Normals.cpp
+++ b/tools/assimp_view/Normals.cpp
@@ -41,11 +41,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "assimp_view.h"
 
-#include "GenFaceNormalsProcess.h"
-#include "GenVertexNormalsProcess.h"
-#include "JoinVerticesProcess.h"
-#include "CalcTangentsProcess.h"
-#include "MakeVerboseFormat.h"
+#include "PostProcessing/GenFaceNormalsProcess.h"
+#include "PostProcessing/GenVertexNormalsProcess.h"
+#include "PostProcessing/JoinVerticesProcess.h"
+#include "PostProcessing/CalcTangentsProcess.h"
+#include "PostProcessing/MakeVerboseFormat.h"
 
 namespace AssimpView {
 
diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h
index bed4c64c3..a32a62d04 100644
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@@ -72,9 +72,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/LogStream.hpp>
 #include <assimp/DefaultLogger.hpp>
 
-
-#include "../../code/MaterialSystem.h"   // aiMaterial class
-#include <assimp/StringComparison.h> // ASSIMP_stricmp and ASSIMP_strincmp
+#include "Material/MaterialSystem.h"   // aiMaterial class
+#include <assimp/StringComparison.h>   // ASSIMP_stricmp and ASSIMP_strincmp
 
 #include <time.h>