diff --git a/src/core/impl.cpp b/src/core/core.cpp
similarity index 96%
rename from src/core/impl.cpp
rename to src/core/core.cpp
index 5aa5670b0f34823d3ebf5dfdb5214d77e16ef675..f145d38fc0e81bccec8bdbbdc99e7498f19c604f 100644
--- a/src/core/impl.cpp
+++ b/src/core/core.cpp
@@ -11,7 +11,7 @@
  *  --------------------------------------------------------------------------------------------
  */
 
-#include "impl.h"
+#include "core.h"
 
 IVAInterface* VACore::CreateCoreInstance( const CVAStruct& oArgs, std::ostream* pOutputStream )
 {
@@ -711,231 +711,6 @@ CVAStruct CVACoreImpl::GetFileList( const bool bRecursive, const std::string& sF
 	return oFileList;
 }
 
-int CVACoreImpl::CreateDirectivityFromParameters( const CVAStruct& oParams, const std::string& sName )
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		int iDirID = m_pDirectivityManager->CreateDirectivity( oParams, sName );
-
-		assert( iDirID != -1 );
-
-		CVAEvent ev;
-		ev.iEventType = CVAEvent::DIRECTIVITY_LOADED;
-		ev.pSender = this;
-		ev.iObjectID = iDirID;
-		m_pEventManager->BroadcastEvent( ev );
-
-		VA_INFO( "Core", "Directivity successfully created, assigned identifier " << iDirID );
-
-		return iDirID;
-
-	}
-	VA_RETHROW;
-}
-
-bool CVACoreImpl::DeleteDirectivity( const int iDirID )
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		bool bSuccess = m_pDirectivityManager->DeleteDirectivity( iDirID );
-		//assert( bSuccess );
-
-		// Ereignis generieren, wenn Operation erfolgreich
-		CVAEvent ev;
-		ev.iEventType = CVAEvent::DIRECTIVITY_DELETED;
-		ev.pSender = this;
-		ev.iObjectID = iDirID;
-		m_pEventManager->BroadcastEvent( ev );
-
-		VA_INFO( "Core", "FreeDirectivity successful, freed directivity " << iDirID );
-
-		return bSuccess;
-
-	} VA_RETHROW;
-}
-
-CVADirectivityInfo CVACoreImpl::GetDirectivityInfo( int iDirID ) const {
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY{
-		return m_pDirectivityManager->GetDirectivityInfo( iDirID );
-	} VA_RETHROW;
-}
-
-void CVACoreImpl::GetDirectivityInfos( std::vector<CVADirectivityInfo>& vdiDest ) const
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		m_pDirectivityManager->GetDirectivityInfos( vdiDest );
-	}
-	VA_RETHROW;
-}
-
-void CVACoreImpl::SetDirectivityName( const int iID, const std::string& sName )
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		VA_EXCEPT_NOT_IMPLEMENTED_NEXT_VERSION;
-		//m_pDirectivityManager->SetName( iID, sName );
-	}
-	VA_RETHROW;
-}
-
-std::string CVACoreImpl::GetDirectivityName( const int iID ) const
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		CVADirectivityInfo oInfo = m_pDirectivityManager->GetDirectivityInfo( iID );
-		return oInfo.sName;
-	}
-	VA_RETHROW;
-}
-
-void CVACoreImpl::SetDirectivityParameters( const int iID, const CVAStruct& oParams )
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		VA_EXCEPT_NOT_IMPLEMENTED_NEXT_VERSION;
-		//m_pDirectivityManager->SetParameters( iID, oParams );
-	}
-	VA_RETHROW;
-}
-
-CVAStruct CVACoreImpl::GetDirectivityParameters( const int iID, const CVAStruct& ) const
-{
-	VA_NO_REENTRANCE;
-	VA_CHECK_INITIALIZED;
-
-	VA_TRY
-	{
-		CVADirectivityInfo oInfo = m_pDirectivityManager->GetDirectivityInfo( iID );
-		return oInfo.oParams;
-
-		// @todo
-		//return m_pDirectivityManager->GetDirectivityParameters( iID, oParams );
-	}
-	VA_RETHROW;
-}
-
-int CVACoreImpl::CreateAcousticMaterial( const CVAAcousticMaterial& oMaterial, const std::string& sName )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-int CVACoreImpl::CreateAcousticMaterialFromParameters( const CVAStruct& oParams, const std::string& sName )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-bool CVACoreImpl::DeleteAcousticMaterial( const int iID )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-CVAAcousticMaterial CVACoreImpl::GetAcousticMaterialInfo( const int iID ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::GetAcousticMaterialInfos( std::vector< CVAAcousticMaterial >& voDest ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::SetAcousticMaterialName( const int iID, const std::string& sName )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-std::string CVACoreImpl::GetAcousticMaterialName( const int iID ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::SetAcousticMaterialParameters( const int iID, const CVAStruct& oParams )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-CVAStruct CVACoreImpl::GetAcousticMaterialParameters( const int iID, const CVAStruct& oParams ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-int CVACoreImpl::CreateGeometryMesh( const CVAGeometryMesh& oMesh, const std::string& sName )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-int CVACoreImpl::CreateGeometryMeshFromParameters( const CVAStruct& oParams, const std::string& sName )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-bool CVACoreImpl::DeleteGeometryMesh( const int iID )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-CVAGeometryMesh CVACoreImpl::GetGeometryMesh( const int iID ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::GetGeometryMeshIDs( std::vector< int >& viIDs ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::SetGeometryMeshName( const int iID, const std::string& sName )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-std::string CVACoreImpl::GetGeometryMeshName( const int iID ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::SetGeometryMeshParameters( const int iID, const CVAStruct& oParams )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-CVAStruct CVACoreImpl::GetGeometryMeshParameters( const int iID, const CVAStruct& oParams ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-void CVACoreImpl::SetGeometryMeshEnabled( const int iID, const bool bEnabled )
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
-bool CVACoreImpl::GetGeometryMeshEnabled( const int iID ) const
-{
-	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
-}
-
 std::string CVACoreImpl::CreateSignalSourceBufferFromParameters( const CVAStruct& oParams, const std::string& sName )
 {
 	VA_NO_REENTRANCE;
diff --git a/src/core/impl.h b/src/core/core.h
similarity index 100%
rename from src/core/impl.h
rename to src/core/core.h
diff --git a/src/core/directivity.cpp b/src/core/directivity.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8d8c52ec291e1fd4d45ba2dfe38e6b66777a22ac
--- /dev/null
+++ b/src/core/directivity.cpp
@@ -0,0 +1,139 @@
+/*
+ *  --------------------------------------------------------------------------------------------
+ *
+ *    VVV        VVV A           Virtual Acoustics (VA) | http://www.virtualacoustics.org
+ *     VVV      VVV AAA          Licensed under the Apache License, Version 2.0
+ *      VVV    VVV   AAA
+ *       VVV  VVV     AAA        Copyright 2015-2018
+ *        VVVVVV       AAA       Institute of Technical Acoustics (ITA)
+ *         VVVV         AAA      RWTH Aachen University
+ *
+ *  --------------------------------------------------------------------------------------------
+ */
+
+#include "core.h"
+
+int CVACoreImpl::CreateDirectivityFromParameters( const CVAStruct& oParams, const std::string& sName )
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		int iDirID = m_pDirectivityManager->CreateDirectivity( oParams, sName );
+
+		assert( iDirID != -1 );
+
+		CVAEvent ev;
+		ev.iEventType = CVAEvent::DIRECTIVITY_LOADED;
+		ev.pSender = this;
+		ev.iObjectID = iDirID;
+		m_pEventManager->BroadcastEvent( ev );
+
+		VA_INFO( "Core", "Directivity successfully created, assigned identifier " << iDirID );
+
+		return iDirID;
+
+	}
+	VA_RETHROW;
+}
+
+bool CVACoreImpl::DeleteDirectivity( const int iDirID )
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		bool bSuccess = m_pDirectivityManager->DeleteDirectivity( iDirID );
+		//assert( bSuccess );
+
+		// Ereignis generieren, wenn Operation erfolgreich
+		CVAEvent ev;
+		ev.iEventType = CVAEvent::DIRECTIVITY_DELETED;
+		ev.pSender = this;
+		ev.iObjectID = iDirID;
+		m_pEventManager->BroadcastEvent( ev );
+
+		VA_INFO( "Core", "FreeDirectivity successful, freed directivity " << iDirID );
+
+		return bSuccess;
+
+	} VA_RETHROW;
+}
+
+CVADirectivityInfo CVACoreImpl::GetDirectivityInfo( int iDirID ) const {
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY{
+		return m_pDirectivityManager->GetDirectivityInfo( iDirID );
+	} VA_RETHROW;
+}
+
+void CVACoreImpl::GetDirectivityInfos( std::vector<CVADirectivityInfo>& vdiDest ) const
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		m_pDirectivityManager->GetDirectivityInfos( vdiDest );
+	}
+	VA_RETHROW;
+}
+
+void CVACoreImpl::SetDirectivityName( const int iID, const std::string& sName )
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		VA_EXCEPT_NOT_IMPLEMENTED_NEXT_VERSION;
+		//m_pDirectivityManager->SetName( iID, sName );
+	}
+	VA_RETHROW;
+}
+
+std::string CVACoreImpl::GetDirectivityName( const int iID ) const
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		CVADirectivityInfo oInfo = m_pDirectivityManager->GetDirectivityInfo( iID );
+		return oInfo.sName;
+	}
+	VA_RETHROW;
+}
+
+void CVACoreImpl::SetDirectivityParameters( const int iID, const CVAStruct& oParams )
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		VA_EXCEPT_NOT_IMPLEMENTED_NEXT_VERSION;
+		//m_pDirectivityManager->SetParameters( iID, oParams );
+	}
+	VA_RETHROW;
+}
+
+CVAStruct CVACoreImpl::GetDirectivityParameters( const int iID, const CVAStruct& ) const
+{
+	VA_NO_REENTRANCE;
+	VA_CHECK_INITIALIZED;
+
+	VA_TRY
+	{
+		CVADirectivityInfo oInfo = m_pDirectivityManager->GetDirectivityInfo( iID );
+		return oInfo.oParams;
+
+		// @todo
+		//return m_pDirectivityManager->GetDirectivityParameters( iID, oParams );
+	}
+	VA_RETHROW;
+}
diff --git a/src/core/geometry.cpp b/src/core/geometry.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..75c5de2af1dfcaefaefb4a9d9f8e9e85dfb576d2
--- /dev/null
+++ b/src/core/geometry.cpp
@@ -0,0 +1,69 @@
+/*
+ *  --------------------------------------------------------------------------------------------
+ *
+ *    VVV        VVV A           Virtual Acoustics (VA) | http://www.virtualacoustics.org
+ *     VVV      VVV AAA          Licensed under the Apache License, Version 2.0
+ *      VVV    VVV   AAA
+ *       VVV  VVV     AAA        Copyright 2015-2018
+ *        VVVVVV       AAA       Institute of Technical Acoustics (ITA)
+ *         VVVV         AAA      RWTH Aachen University
+ *
+ *  --------------------------------------------------------------------------------------------
+ */
+
+#include "core.h"
+
+int CVACoreImpl::CreateGeometryMesh( const CVAGeometryMesh& oMesh, const std::string& sName )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+int CVACoreImpl::CreateGeometryMeshFromParameters( const CVAStruct& oParams, const std::string& sName )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+bool CVACoreImpl::DeleteGeometryMesh( const int iID )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+CVAGeometryMesh CVACoreImpl::GetGeometryMesh( const int iID ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::GetGeometryMeshIDs( std::vector< int >& viIDs ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::SetGeometryMeshName( const int iID, const std::string& sName )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+std::string CVACoreImpl::GetGeometryMeshName( const int iID ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::SetGeometryMeshParameters( const int iID, const CVAStruct& oParams )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+CVAStruct CVACoreImpl::GetGeometryMeshParameters( const int iID, const CVAStruct& oParams ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::SetGeometryMeshEnabled( const int iID, const bool bEnabled )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+bool CVACoreImpl::GetGeometryMeshEnabled( const int iID ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
diff --git a/src/core/init.cpp b/src/core/init.cpp
index 2a890c6d0029960a8ab356cf79c3d76187797778..c6991da8ab64912edb678fdfad63711e68458c00 100644
--- a/src/core/init.cpp
+++ b/src/core/init.cpp
@@ -11,7 +11,7 @@
  *  --------------------------------------------------------------------------------------------
  */
 
-#include "impl.h"
+#include "core.h"
 
 void CVACoreImpl::Initialize()
 {
diff --git a/src/core/material.cpp b/src/core/material.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..05d92e190a2104a489050a10a2773a5d82686b00
--- /dev/null
+++ b/src/core/material.cpp
@@ -0,0 +1,59 @@
+/*
+ *  --------------------------------------------------------------------------------------------
+ *
+ *    VVV        VVV A           Virtual Acoustics (VA) | http://www.virtualacoustics.org
+ *     VVV      VVV AAA          Licensed under the Apache License, Version 2.0
+ *      VVV    VVV   AAA
+ *       VVV  VVV     AAA        Copyright 2015-2018
+ *        VVVVVV       AAA       Institute of Technical Acoustics (ITA)
+ *         VVVV         AAA      RWTH Aachen University
+ *
+ *  --------------------------------------------------------------------------------------------
+ */
+
+#include "core.h"
+
+int CVACoreImpl::CreateAcousticMaterial( const CVAAcousticMaterial& oMaterial, const std::string& sName )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+int CVACoreImpl::CreateAcousticMaterialFromParameters( const CVAStruct& oParams, const std::string& sName )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+bool CVACoreImpl::DeleteAcousticMaterial( const int iID )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+CVAAcousticMaterial CVACoreImpl::GetAcousticMaterialInfo( const int iID ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::GetAcousticMaterialInfos( std::vector< CVAAcousticMaterial >& voDest ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::SetAcousticMaterialName( const int iID, const std::string& sName )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+std::string CVACoreImpl::GetAcousticMaterialName( const int iID ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+void CVACoreImpl::SetAcousticMaterialParameters( const int iID, const CVAStruct& oParams )
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}
+
+CVAStruct CVACoreImpl::GetAcousticMaterialParameters( const int iID, const CVAStruct& oParams ) const
+{
+	VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION;
+}