diff --git a/include/Engine/Collision/TriggerSystem.h b/include/Engine/Collision/TriggerSystem.h
index 94084ee3..a7b2122f 100644
--- a/include/Engine/Collision/TriggerSystem.h
+++ b/include/Engine/Collision/TriggerSystem.h
@@ -1,7 +1,8 @@
-#ifndef PlayerSystem_h__
-#define PlayerSystem_h__
+#ifndef TriggerSystem_h__
+#define TriggerSystem_h__
 
 #include <glm/common.hpp>
+#include <unordered_set>
 
 #include "Core/System.h"
 #include "Core/EventBroker.h"
@@ -17,7 +18,7 @@ public:
     virtual void Update(World* world, ComponentWrapper& collision, double dt) override;
 
 private:
-    
+    std::unordered_map<EntityID, std::unordered_set<EntityID>> m_EntitiesInTrigger;
 };
 
 #endif
\ No newline at end of file
diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt
index de24b9cf..915cdee2 100644
--- a/src/Engine/CMakeLists.txt
+++ b/src/Engine/CMakeLists.txt
@@ -70,6 +70,12 @@ file(GLOB SOURCE_FILES_GUI
 )
 source_group(GUI FILES ${SOURCE_FILES_GUI})
 
+file(GLOB SOURCE_FILES_Collision
+    "${INCLUDE_PATH}/Collision/*.h"
+    "Collision/*.cpp"
+)
+source_group(Collision FILES ${SOURCE_FILES_Collision})
+
 set(SOURCE_FILES
     ${SOURCE_FILES_Core}
     ${SOURCE_FILES_Core_Util}
@@ -78,6 +84,7 @@ set(SOURCE_FILES
     ${SOURCE_FILES_GUI}
     ${SOURCE_FILES_Rendering}
     ${SOURCE_FILES_Rendering_Util}
+    ${SOURCE_FILES_Collision}
 )
 
 set(LIBRARIES
diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp
index 44875aa4..f8dfedcb 100644
--- a/src/Engine/Collision/Collision.cpp
+++ b/src/Engine/Collision/Collision.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include "Core/Collision.h"
+#include "Collision/Collision.h"
 #include "Engine/GLM.h"
 
 namespace Collision
diff --git a/src/Engine/Core/OctTree.cpp b/src/Engine/Core/OctTree.cpp
index e41a1692..b5fed86b 100644
--- a/src/Engine/Core/OctTree.cpp
+++ b/src/Engine/Core/OctTree.cpp
@@ -3,7 +3,7 @@
 #include <bitset>
 
 #include "Core/OctTree.h"
-#include "Core/Collision.h"
+#include "Collision/Collision.h"
 #include "Core/World.h"
 #include "Rendering/Camera.h"
 
diff --git a/src/Tests/CollisionTest.cpp b/src/Tests/CollisionTest.cpp
index 497812a3..21b2ef20 100644
--- a/src/Tests/CollisionTest.cpp
+++ b/src/Tests/CollisionTest.cpp
@@ -3,7 +3,7 @@
 #include <boost/test/execution_monitor.hpp>
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
-#include "Engine\Core\Collision.h"
+#include "Engine/Collision/Collision.h"
 #include "Engine/Core/AABB.h"
 #include "Engine/Core/Ray.h"
 #include <stdlib.h>//srand
diff --git a/src/Tests/OctTreeTestGameClass.cpp b/src/Tests/OctTreeTestGameClass.cpp
index 735d3ee8..1a7deb3f 100644
--- a/src/Tests/OctTreeTestGameClass.cpp
+++ b/src/Tests/OctTreeTestGameClass.cpp
@@ -15,7 +15,7 @@ Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worl
     m_RenderQueueFactory = new RenderQueueFactory();
 
     // Create the renderer
-    m_Renderer = new Renderer();
+    m_Renderer = new Renderer(m_EventBroker);
     m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
     m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
     m_Renderer->SetResolution(Rectangle(
diff --git a/src/Tests/OctTreeTestGameClass.h b/src/Tests/OctTreeTestGameClass.h
index 38aaab66..985d34d4 100644
--- a/src/Tests/OctTreeTestGameClass.h
+++ b/src/Tests/OctTreeTestGameClass.h
@@ -11,7 +11,7 @@
 #include "Rendering/RenderQueueFactory.h"
 
 #include "OctTreeTestHardCodedTestWorld.h"
-#include "Core\Collision.h"
+#include "Collision/Collision.h"
 
 
 class Game
diff --git a/src/Tests/OctTreeTestGameMain.cpp b/src/Tests/OctTreeTestGameMain.cpp
index 5dd23cf2..43789cea 100644
--- a/src/Tests/OctTreeTestGameMain.cpp
+++ b/src/Tests/OctTreeTestGameMain.cpp
@@ -3,7 +3,7 @@
 #include <boost/test/execution_monitor.hpp>
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
-#include <Engine\Core\Collision.h>
+#include "Engine/Collision/Collision.h"
 #include "Engine/Core/AABB.h"
 #include "Engine/Core/Ray.h"
 #include <stdlib.h>//srand
diff --git a/src/Tests/OldOctTree.cpp b/src/Tests/OldOctTree.cpp
index 72decd4d..4aabf9ed 100644
--- a/src/Tests/OldOctTree.cpp
+++ b/src/Tests/OldOctTree.cpp
@@ -3,7 +3,7 @@
 #include <bitset>
 
 #include "OldOctTree.h"
-#include "Core/Collision.h"
+#include "Collision/Collision.h"
 #include "Core/World.h"
 #include "Rendering/Camera.h"