diff --git a/Spore ModAPI/SourceCode/Movie/MovieSystem.cpp b/Spore ModAPI/SourceCode/Movie/MovieSystem.cpp
index 509f69f5..06cd41b0 100644
--- a/Spore ModAPI/SourceCode/Movie/MovieSystem.cpp	
+++ b/Spore ModAPI/SourceCode/Movie/MovieSystem.cpp	
@@ -21,9 +21,9 @@ namespace Movie
 	{
 	}
 
-	auto_METHOD_VIRTUAL_VOID(MovieSystem, RenderWare::ILayer, DrawLayer,
-		Args(uint32_t flags, uint32_t layerNumber, const void* const* viewer, RenderWare::RenderStats* stats),
-		Args(flags, layerNumber, viewer, stats)
+	auto_METHOD_VIRTUAL_VOID(MovieSystem, Graphics::ILayer, DrawLayer,
+		Args(int flags, int layerIndex, App::cViewer** viewers, Graphics::RenderStatistics& statistics),
+		Args(flags, layerIndex, viewers, statistics)
 	);
 
 
diff --git a/Spore ModAPI/SourceCode/Object.cpp b/Spore ModAPI/SourceCode/Object.cpp
index a560835a..71d6fd37 100644
--- a/Spore ModAPI/SourceCode/Object.cpp	
+++ b/Spore ModAPI/SourceCode/Object.cpp	
@@ -228,8 +228,3 @@ int RefCountTemplateAtomic::Release()
 	}
 	return mnRefCount;
 }
-
-
-IRefCount::~IRefCount()
-{
-}
diff --git a/Spore ModAPI/SourceCode/RenderWare/RenderWare.cpp b/Spore ModAPI/SourceCode/RenderWare/RenderWare.cpp
index bc441676..a9d9cfc5 100644
--- a/Spore ModAPI/SourceCode/RenderWare/RenderWare.cpp	
+++ b/Spore ModAPI/SourceCode/RenderWare/RenderWare.cpp	
@@ -18,7 +18,6 @@
 ****************************************************************************/
 #include <Spore\RenderWare\RWHeader.h>
 #include <Spore\RenderWare\CompiledState.h>
-#include <Spore\RenderWare\ILayer.h>
 
 namespace RenderWare
 {
@@ -45,9 +44,4 @@ namespace RenderWare
 		}
 		return false;
 	}
-
-
-	ILayer::~ILayer()
-	{
-	}
 }
diff --git a/Spore ModAPI/Spore ModAPI.vcxproj b/Spore ModAPI/Spore ModAPI.vcxproj
index 63b2dbd2..b8dc8c9f 100644
--- a/Spore ModAPI/Spore ModAPI.vcxproj	
+++ b/Spore ModAPI/Spore ModAPI.vcxproj	
@@ -338,8 +338,6 @@
     <ClInclude Include="Spore\Movie\cMoviePlayInfo.h" />
     <ClInclude Include="Spore\Movie\cMovieRecordInfo.h" />
     <ClInclude Include="Spore\Movie\MovieSystem.h" />
-    <ClInclude Include="Spore\RenderWare\ILayer.h" />
-    <ClInclude Include="Spore\RenderWare\RenderStats.h" />
     <ClInclude Include="Spore\Swarm\cDecal.h" />
     <ClInclude Include="Spore\Terrain\cTerrainDecal.h" />
     <ClInclude Include="Spore\Terrain\cTerrainSphereDecal.h" />
diff --git a/Spore ModAPI/Spore ModAPI.vcxproj.filters b/Spore ModAPI/Spore ModAPI.vcxproj.filters
index c8d903f4..5cf0eeb0 100644
--- a/Spore ModAPI/Spore ModAPI.vcxproj.filters	
+++ b/Spore ModAPI/Spore ModAPI.vcxproj.filters	
@@ -2319,12 +2319,6 @@
     <ClInclude Include="Spore\Movie\MovieSystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Spore\RenderWare\ILayer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Spore\RenderWare\RenderStats.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceCode\Allocator.cpp">
diff --git a/Spore ModAPI/Spore/Graphics/RenderStatistics.h b/Spore ModAPI/Spore/Graphics/RenderStatistics.h
index 73dbf0bc..863d8703 100644
--- a/Spore ModAPI/Spore/Graphics/RenderStatistics.h	
+++ b/Spore ModAPI/Spore/Graphics/RenderStatistics.h	
@@ -7,14 +7,14 @@ namespace Graphics
 	struct RenderStatistics
 	{
 		// related with total render time
-		/* 00h */	float field_0;
-		/* 04h */	float field_4;
-		/* 08h */	float field_8;
-		/* 0Ch */	float field_C;
-		/* 10h */	float field_10;
+		/* 00h */	float msPerFrame;
+		/* 04h */	float fps;
+		/* 08h */	float msPerFrameSmoothed;
+		/* 0Ch */	float fpsSmoothed;
+		/* 10h */	float renderTime;
 		/* 14h */	int numLayersRendered;
-		/* 18h */	int field_18;
-		/* 1Ch */	int field_1C;
+		/* 18h */	int numJobs;
+		/* 1Ch */	int numJobsQueued;
 		/* 20h */	int numVerticesRendered;
 		/* 24h */	int numIndicesRendered;
 		/* 28h */	int numDrawCalls;
diff --git a/Spore ModAPI/Spore/Movie/MovieSystem.h b/Spore ModAPI/Spore/Movie/MovieSystem.h
index 1ed88f2c..bdb2ab6e 100644
--- a/Spore ModAPI/Spore/Movie/MovieSystem.h	
+++ b/Spore ModAPI/Spore/Movie/MovieSystem.h	
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <Spore\Internal.h>
-#include <Spore\RenderWare\ILayer.h>
+#include <Spore\ResourceKey.h>
+#include <Spore\Graphics\ILayer.h>
+#include <Spore\Graphics\RenderStatistics.h>
 #include <Spore\Movie\cMoviePlayInfo.h>
 #include <Spore\Movie\cMovieRecordInfo.h>
 
@@ -33,7 +35,7 @@ namespace Movie
 	ASSERT_SIZE(IMovieSystem, 0x4);
 
 	class MovieSystem
-		: public RenderWare::ILayer
+		: public Graphics::ILayer
 		, public IMovieSystem
 	{
 	public:
@@ -44,7 +46,7 @@ namespace Movie
 		virtual int AddRef() override;
 		virtual int Release() override;
 
-		virtual void DrawLayer(uint32_t flags, uint32_t layerNumber, const void* const* viewer, RenderWare::RenderStats* stats) override;
+		virtual void DrawLayer(int flags, int layerIndex, App::cViewer** viewers, Graphics::RenderStatistics& statistics) override;
 
 		virtual bool Init() override;
 		virtual bool Shutdown() override;
diff --git a/Spore ModAPI/Spore/Object.h b/Spore ModAPI/Spore/Object.h
index 356dc8b7..6211b44b 100644
--- a/Spore ModAPI/Spore/Object.h	
+++ b/Spore ModAPI/Spore/Object.h	
@@ -175,16 +175,6 @@ class RefCountTemplateAtomic
 	int mnRefCount;
 };
 
-class IRefCount
-{
-public:
-	virtual int AddRef() = 0;
-	virtual int Release() = 0;
-	virtual ~IRefCount();
-
-	static const uint32_t TYPE = 0xAE9CB0FA;
-};
-
 ///////////////////////////////////
 //// INTERNAL IMPLEMENENTATION ////
 ///////////////////////////////////
diff --git a/Spore ModAPI/Spore/RenderWare/ILayer.h b/Spore ModAPI/Spore/RenderWare/ILayer.h
deleted file mode 100644
index 8be30a89..00000000
--- a/Spore ModAPI/Spore/RenderWare/ILayer.h	
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <Spore\Object.h>
-#include <Spore\RenderWare\RenderStats.h>
-
-namespace RenderWare
-{
-	class ILayer
-		: public IRefCount
-	{
-	public:
-		virtual ~ILayer();
-
-		// viewer = const cViewer* const*.
-		virtual void DrawLayer(uint32_t flags, uint32_t layerNumber, const void* const* viewer, RenderStats* stats) = 0;
-	};
-	ASSERT_SIZE(ILayer, 0x4);
-}
diff --git a/Spore ModAPI/Spore/RenderWare/RenderStats.h b/Spore ModAPI/Spore/RenderWare/RenderStats.h
deleted file mode 100644
index 9bf74f09..00000000
--- a/Spore ModAPI/Spore/RenderWare/RenderStats.h	
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <Spore\Internal.h>
-
-namespace RenderWare
-{
-	struct RenderStats
-	{
-		float mMsPerFrame;
-		float mFPS;
-		float mSmoothedMsPerFrame;
-		float mSmoothedFPS;
-		float mRenderTime;
-		int mLayers;
-		int mJobs;
-		int mJobsQueued;
-		int mVertices;
-		int mIndices;
-		int mPrimitives;
-	};
-	ASSERT_SIZE(RenderStats, 0x2c);
-}