diff --git a/include/Engine/Rendering/Util/FrameBuffer.h b/include/Engine/Rendering/FrameBuffer.h
similarity index 96%
rename from include/Engine/Rendering/Util/FrameBuffer.h
rename to include/Engine/Rendering/FrameBuffer.h
index 5c9e0c3f..cf63b6c6 100644
--- a/include/Engine/Rendering/Util/FrameBuffer.h
+++ b/include/Engine/Rendering/FrameBuffer.h
@@ -1,8 +1,8 @@
 #ifndef FrameBuffer_h__
 #define FrameBuffer_h__
 
-#include "OpenGL.h"
-#include "GLError.h"
+#include "../OpenGL.h"
+#include "Util/GLError.h"
 
 class BufferResource
 {
diff --git a/include/Engine/Rendering/RenderQueue.h b/include/Engine/Rendering/RenderQueue.h
index 6d8962a9..982b1813 100644
--- a/include/Engine/Rendering/RenderQueue.h
+++ b/include/Engine/Rendering/RenderQueue.h
@@ -94,18 +94,6 @@ struct PointLightJob : RenderJob
 	}
 };
 
-struct FrameJob : SpriteJob
-{
-	Rectangle Scissor;
-	Rectangle Viewport;
-	std::string Name;
-
-	void CalculateHash() override
-	{
-		Hash = 0;
-	}
-};
-
 class RenderQueue
 {
 public:
@@ -149,20 +137,17 @@ struct RenderQueueCollection
 {
 	RenderQueue Forward;
 	RenderQueue Lights;
-	RenderQueue Sprites;
 
 	void Clear()
 	{
 		Forward.Clear();
 		Lights.Clear();
-        Sprites.Clear();
 	}
 
 	void Sort()
 	{
 		Forward.Sort();
 		Lights.Sort();
-        Sprites.Sort();
 	}
 };
 
diff --git a/include/Engine/Rendering/RenderQueueFactory.h b/include/Engine/Rendering/RenderQueueFactory.h
index 0064693f..918692ac 100644
--- a/include/Engine/Rendering/RenderQueueFactory.h
+++ b/include/Engine/Rendering/RenderQueueFactory.h
@@ -19,7 +19,6 @@ private:
     RenderQueueCollection m_RenderQueues;
 
     void FillModels(World* world, RenderQueue* renderQueue);
-    void FillSprites(World* world, RenderQueue* renderQueue);
     void FillLights(World* world, RenderQueue* renderQueue);
 
     glm::mat4 ModelMatrix(World* world, EntityID entity);
diff --git a/include/Engine/Rendering/Renderer.h b/include/Engine/Rendering/Renderer.h
index 387651db..b1b76468 100644
--- a/include/Engine/Rendering/Renderer.h
+++ b/include/Engine/Rendering/Renderer.h
@@ -8,7 +8,7 @@
 //TODO: Temp resourceManager
 #include "../Core/ResourceManager.h"
 #include "Util/UnorderedMapVec2.h"
-#include "Util/FrameBuffer.h"
+#include "FrameBuffer.h"
 #include "../Core/World.h"
 
 class Renderer : public IRenderer
diff --git a/include/Engine/Rendering/Util/ScreenCoords.h b/include/Engine/Rendering/Util/ScreenCoords.h
index 83fd7c0f..22c5b9e0 100644
--- a/include/Engine/Rendering/Util/ScreenCoords.h
+++ b/include/Engine/Rendering/Util/ScreenCoords.h
@@ -5,7 +5,7 @@
 #include "../../OpenGL.h"
 #include "../../GLM.h"
 #include "../../Core/Util/Rectangle.h"
-#include "FrameBuffer.h"
+#include "../FrameBuffer.h"
 
 class ScreenCoords 
 {
diff --git a/src/Engine/Rendering/Util/FrameBuffer.cpp b/src/Engine/Rendering/FrameBuffer.cpp
similarity index 98%
rename from src/Engine/Rendering/Util/FrameBuffer.cpp
rename to src/Engine/Rendering/FrameBuffer.cpp
index b8d3e078..1b53d868 100644
--- a/src/Engine/Rendering/Util/FrameBuffer.cpp
+++ b/src/Engine/Rendering/FrameBuffer.cpp
@@ -1,5 +1,5 @@
 
-#include "Rendering/Util/FrameBuffer.h"
+#include "Rendering/FrameBuffer.h"
 
 
 BufferResource::BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment)
diff --git a/src/Engine/Rendering/RenderQueueFactory.cpp b/src/Engine/Rendering/RenderQueueFactory.cpp
index f781f5d2..9a7d89a1 100644
--- a/src/Engine/Rendering/RenderQueueFactory.cpp
+++ b/src/Engine/Rendering/RenderQueueFactory.cpp
@@ -10,7 +10,6 @@ void RenderQueueFactory::Update(World* world)
 {
     m_RenderQueues.Clear();
     FillModels(world, &m_RenderQueues.Forward);
-    FillSprites(world, &m_RenderQueues.Sprites);
     FillLights(world, &m_RenderQueues.Lights);
 }
 
@@ -61,11 +60,6 @@ void RenderQueueFactory::FillModels(World* world, RenderQueue* renderQueue)
    }
 }
 
-void RenderQueueFactory::FillSprites(World* world, RenderQueue* renderQueue)
-{
-    
-}
-
 void RenderQueueFactory::FillLights(World* world, RenderQueue* renderQueue)
 {