diff --git a/YuppleMayham/CMakeLists.txt b/YuppleMayham/CMakeLists.txt
index cfb9ab1..818b00e 100644
--- a/YuppleMayham/CMakeLists.txt
+++ b/YuppleMayham/CMakeLists.txt
@@ -5,7 +5,7 @@
 find_package(SDL2 REQUIRED)
 find_package(SDL2_IMAGE REQUIRED)
 
-include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/YuppleMayham")
+include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/YuppleMayham/include")
 include_directories(SYSTEM "c:/sdks/glad/include")
 include_directories(SYSTEM "c:/sdks/tinyxml2-10.0.0/debug/include")
 include_directories(SYSTEM "c:/sdks/glm")
@@ -16,13 +16,58 @@ link_directories(SYSTEM "C:/sdks/freetype-2.13.2/objs")
 link_directories(SYSTEM "c:/sdks/tinyxml2-10.0.0/debug/lib")
 link_directories(SYSTEM "c:/sdks/lua-5.4.6/lib")
 
-include_directories(${PROJECT_SOURCE_DIR}/YupplyMayham/gameplay)
-include_directories(${PROJECT_SOURCE_DIR}/YupplyMayham/graphics)
-include_directories(${PROJECT_SOURCE_DIR}/YupplyMayham/gameplay/weapons)
-include_directories(${PROJECT_SOURCE_DIR}/YupplyMayham)
+include_directories("${PROJECT_SOURCE_DIR}/YuppleMayham/include")
 
 # Add source to this project's executable.
-add_executable (YuppleMayham  "src/main.cpp" "c:/sdks/glad/src/glad.c" "graphics/glwindow.h" "src/graphics/sprite.cpp" "src/graphics/mesh.cpp" "src/gameplay/entity.cpp" "src/gameplay/gameactor.cpp" "src/graphics/shader.cpp" "src/util.cpp" "gameplay/camera.h" "src/gameplay/camera.cpp"  "src/utility/command.cpp" "src/gameplay/input.cpp" "utility/mousestate.h" "src/gameplay/weapons/bullet.cpp"  "gameplay/weapons/bulletmanager.h" "src/gameplay/weapons/bulletmanager.cpp" "src/gameplay/scene.cpp" "gameplay/scene.h" "graphics/tile.h"  "graphics/texture.h" "src/graphics/texture.cpp" "src/graphics/tile.cpp" "graphics/tiletype.h" "utility/resourcemanager.h" "src/utility/resourcemanager.cpp" "utility/xmlloader.h" "src/utility/xmlloader.cpp" "gameplay/game.h" "src/gameplay/game.cpp" "src/graphics/instancedraw.cpp" "gameplay/map.h" "src/gameplay/map.cpp" "src/gameplay/weapons/weapon.cpp"  "gameplay/physics.h" "src/gameplay/physics.cpp" "utility/events.h" "utility/debugdraw.h" "src/utility/debugdraw.cpp" "utility/script.h" "src/utility/script.cpp" "gameplay/ai.h" "utility/raycaster.h" "src/gameplay/ai.cpp" "utility/ftfont.h" "src/utility/ftfont.cpp" "utility/direction.h")
+add_executable (YuppleMayham  
+	"src/main.cpp" 
+	"c:/sdks/glad/src/glad.c" 
+	"src/graphics/sprite.cpp" 
+	"src/graphics/mesh.cpp" 
+	"src/gameplay/entity.cpp" 
+	"src/gameplay/gameactor.cpp" 
+	"src/graphics/shader.cpp" 
+	"src/util.cpp" 
+	"src/gameplay/camera.cpp"  
+	"src/utility/command.cpp" 
+	"src/gameplay/input.cpp" 
+	"src/gameplay/weapons/bullet.cpp"  
+	"src/gameplay/weapons/bulletmanager.cpp" 
+	"src/gameplay/scene.cpp" 
+	"src/graphics/texture.cpp" 
+	"src/graphics/tile.cpp" 
+	"src/utility/resourcemanager.cpp" 
+	"src/utility/xmlloader.cpp" 
+	"src/gameplay/game.cpp" 
+	"src/graphics/instancedraw.cpp" 
+	"src/gameplay/map.cpp" 
+	"src/gameplay/weapons/weapon.cpp"  
+	"src/gameplay/physics.cpp" 
+	"src/utility/debugdraw.cpp" 
+	"src/utility/script.cpp" 
+	"src/gameplay/ai.cpp" 
+	"src/utility/ftfont.cpp" 
+	"include/graphics/glwindow.h" 
+	"include/gameplay/camera.h" 
+	"include/utility/mousestate.h" 
+	"include/gameplay/weapons/bulletmanager.h" 
+	"include/gameplay/scene.h" 
+	"include/graphics/tile.h"  
+	"include/graphics/texture.h" 
+	"include/graphics/tiletype.h" 
+	"include/utility/resourcemanager.h" 
+	"include/utility/xmlloader.h" 
+	"include/gameplay/game.h" 
+	"include/gameplay/map.h" 
+	"include/gameplay/physics.h" 
+	"include/utility/events.h" 
+	"include/utility/debugdraw.h" 
+	"include/utility/script.h" 
+	"include/gameplay/ai.h" 
+	"include/utility/raycaster.h" 
+	"include/utility/ftfont.h" 
+	"include/utility/direction.h"
+)
 
 add_custom_command(TARGET YuppleMayham PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Resources/ $<TARGET_FILE_DIR:YuppleMayham>)
 
diff --git a/YuppleMayham/gameplay/ai.h b/YuppleMayham/include/gameplay/ai.h
similarity index 82%
rename from YuppleMayham/gameplay/ai.h
rename to YuppleMayham/include/gameplay/ai.h
index 4712010..ac04ff7 100644
--- a/YuppleMayham/gameplay/ai.h
+++ b/YuppleMayham/include/gameplay/ai.h
@@ -6,7 +6,7 @@
 
 class GameActor;
 class Raycaster;
-class Script;
+class AIScript;
 
 enum class AIState {
 	Idle,
@@ -20,7 +20,7 @@ public:
 	void update();
 
 	void setTarget(const std::shared_ptr<GameActor>& target) { this->target = target; }
-	void attachBehaviourScript(const std::shared_ptr<Script>& behaviour);
+	void attachBehaviourScript(const std::shared_ptr<AIScript>& behaviour);
 
 	AIState getState() const { return state; }
 	void setState(AIState state) { this->state = state; }
@@ -30,7 +30,7 @@ public:
 private:
 	AIState						state;
 	std::shared_ptr<Raycaster>	raycaster;
-	std::shared_ptr<Script>		behaviour;
+	std::shared_ptr<AIScript>		behaviour;
 	std::shared_ptr<GameActor>	actor;
 	std::shared_ptr<GameActor>	target;
 };
diff --git a/YuppleMayham/gameplay/camera.h b/YuppleMayham/include/gameplay/camera.h
similarity index 100%
rename from YuppleMayham/gameplay/camera.h
rename to YuppleMayham/include/gameplay/camera.h
diff --git a/YuppleMayham/gameplay/entity.h b/YuppleMayham/include/gameplay/entity.h
similarity index 100%
rename from YuppleMayham/gameplay/entity.h
rename to YuppleMayham/include/gameplay/entity.h
diff --git a/YuppleMayham/gameplay/game.h b/YuppleMayham/include/gameplay/game.h
similarity index 100%
rename from YuppleMayham/gameplay/game.h
rename to YuppleMayham/include/gameplay/game.h
diff --git a/YuppleMayham/gameplay/gameactor.h b/YuppleMayham/include/gameplay/gameactor.h
similarity index 100%
rename from YuppleMayham/gameplay/gameactor.h
rename to YuppleMayham/include/gameplay/gameactor.h
diff --git a/YuppleMayham/gameplay/input.h b/YuppleMayham/include/gameplay/input.h
similarity index 100%
rename from YuppleMayham/gameplay/input.h
rename to YuppleMayham/include/gameplay/input.h
diff --git a/YuppleMayham/gameplay/map.h b/YuppleMayham/include/gameplay/map.h
similarity index 100%
rename from YuppleMayham/gameplay/map.h
rename to YuppleMayham/include/gameplay/map.h
diff --git a/YuppleMayham/gameplay/physics.h b/YuppleMayham/include/gameplay/physics.h
similarity index 100%
rename from YuppleMayham/gameplay/physics.h
rename to YuppleMayham/include/gameplay/physics.h
diff --git a/YuppleMayham/gameplay/scene.h b/YuppleMayham/include/gameplay/scene.h
similarity index 100%
rename from YuppleMayham/gameplay/scene.h
rename to YuppleMayham/include/gameplay/scene.h
diff --git a/YuppleMayham/gameplay/weapons/bullet.h b/YuppleMayham/include/gameplay/weapons/bullet.h
similarity index 100%
rename from YuppleMayham/gameplay/weapons/bullet.h
rename to YuppleMayham/include/gameplay/weapons/bullet.h
diff --git a/YuppleMayham/gameplay/weapons/bulletmanager.h b/YuppleMayham/include/gameplay/weapons/bulletmanager.h
similarity index 100%
rename from YuppleMayham/gameplay/weapons/bulletmanager.h
rename to YuppleMayham/include/gameplay/weapons/bulletmanager.h
diff --git a/YuppleMayham/gameplay/weapons/weapon.h b/YuppleMayham/include/gameplay/weapons/weapon.h
similarity index 100%
rename from YuppleMayham/gameplay/weapons/weapon.h
rename to YuppleMayham/include/gameplay/weapons/weapon.h
diff --git a/YuppleMayham/gameplay/weapons/weapons.h b/YuppleMayham/include/gameplay/weapons/weapons.h
similarity index 100%
rename from YuppleMayham/gameplay/weapons/weapons.h
rename to YuppleMayham/include/gameplay/weapons/weapons.h
diff --git a/YuppleMayham/graphics/glwindow.h b/YuppleMayham/include/graphics/glwindow.h
similarity index 100%
rename from YuppleMayham/graphics/glwindow.h
rename to YuppleMayham/include/graphics/glwindow.h
diff --git a/YuppleMayham/graphics/instancedraw.h b/YuppleMayham/include/graphics/instancedraw.h
similarity index 100%
rename from YuppleMayham/graphics/instancedraw.h
rename to YuppleMayham/include/graphics/instancedraw.h
diff --git a/YuppleMayham/graphics/mesh.h b/YuppleMayham/include/graphics/mesh.h
similarity index 100%
rename from YuppleMayham/graphics/mesh.h
rename to YuppleMayham/include/graphics/mesh.h
diff --git a/YuppleMayham/graphics/shader.h b/YuppleMayham/include/graphics/shader.h
similarity index 100%
rename from YuppleMayham/graphics/shader.h
rename to YuppleMayham/include/graphics/shader.h
diff --git a/YuppleMayham/graphics/sprite.h b/YuppleMayham/include/graphics/sprite.h
similarity index 100%
rename from YuppleMayham/graphics/sprite.h
rename to YuppleMayham/include/graphics/sprite.h
diff --git a/YuppleMayham/graphics/texture.h b/YuppleMayham/include/graphics/texture.h
similarity index 100%
rename from YuppleMayham/graphics/texture.h
rename to YuppleMayham/include/graphics/texture.h
diff --git a/YuppleMayham/graphics/tile.h b/YuppleMayham/include/graphics/tile.h
similarity index 100%
rename from YuppleMayham/graphics/tile.h
rename to YuppleMayham/include/graphics/tile.h
diff --git a/YuppleMayham/graphics/tiletype.h b/YuppleMayham/include/graphics/tiletype.h
similarity index 100%
rename from YuppleMayham/graphics/tiletype.h
rename to YuppleMayham/include/graphics/tiletype.h
diff --git a/YuppleMayham/util.h b/YuppleMayham/include/util.h
similarity index 100%
rename from YuppleMayham/util.h
rename to YuppleMayham/include/util.h
diff --git a/YuppleMayham/utility/command.h b/YuppleMayham/include/utility/command.h
similarity index 100%
rename from YuppleMayham/utility/command.h
rename to YuppleMayham/include/utility/command.h
diff --git a/YuppleMayham/utility/component.h b/YuppleMayham/include/utility/component.h
similarity index 100%
rename from YuppleMayham/utility/component.h
rename to YuppleMayham/include/utility/component.h
diff --git a/YuppleMayham/utility/debugdraw.h b/YuppleMayham/include/utility/debugdraw.h
similarity index 100%
rename from YuppleMayham/utility/debugdraw.h
rename to YuppleMayham/include/utility/debugdraw.h
diff --git a/YuppleMayham/utility/direction.h b/YuppleMayham/include/utility/direction.h
similarity index 100%
rename from YuppleMayham/utility/direction.h
rename to YuppleMayham/include/utility/direction.h
diff --git a/YuppleMayham/utility/events.h b/YuppleMayham/include/utility/events.h
similarity index 100%
rename from YuppleMayham/utility/events.h
rename to YuppleMayham/include/utility/events.h
diff --git a/YuppleMayham/utility/ftfont.h b/YuppleMayham/include/utility/ftfont.h
similarity index 100%
rename from YuppleMayham/utility/ftfont.h
rename to YuppleMayham/include/utility/ftfont.h
diff --git a/YuppleMayham/utility/mousestate.h b/YuppleMayham/include/utility/mousestate.h
similarity index 100%
rename from YuppleMayham/utility/mousestate.h
rename to YuppleMayham/include/utility/mousestate.h
diff --git a/YuppleMayham/utility/raycaster.h b/YuppleMayham/include/utility/raycaster.h
similarity index 100%
rename from YuppleMayham/utility/raycaster.h
rename to YuppleMayham/include/utility/raycaster.h
diff --git a/YuppleMayham/utility/resourcemanager.h b/YuppleMayham/include/utility/resourcemanager.h
similarity index 61%
rename from YuppleMayham/utility/resourcemanager.h
rename to YuppleMayham/include/utility/resourcemanager.h
index 9d21e52..09b9f15 100644
--- a/YuppleMayham/utility/resourcemanager.h
+++ b/YuppleMayham/include/utility/resourcemanager.h
@@ -12,6 +12,7 @@ class Sprite;
 class Shader;
 class Weapon;
 class Script;
+class AIScript;
 class TileSet;
 class SpriteComponent;
 
@@ -25,15 +26,15 @@ public:
 		xmlLoader->loadScenes("scenes"); 
 	};
 
-	std::shared_ptr<Sprite> loadSpriteAnimated(const std::string& path, float frameSize);
-	std::shared_ptr<Sprite> loadSpriteDirAnimated(const std::string& path, float frameSize);
-	std::shared_ptr<Sprite> loadSpriteStatic(const std::string& path);
-	std::shared_ptr<Script> loadScript(const std::string& path);
-	std::shared_ptr<TileSet> loadTileSet(const std::string& path, float frameSize);
+	std::shared_ptr<Sprite>		loadSpriteAnimated		(const std::string& path, float frameSize);
+	std::shared_ptr<Sprite>		loadSpriteDirAnimated	(const std::string& path, float frameSize);
+	std::shared_ptr<Sprite>		loadSpriteStatic		(const std::string& path);
+	std::shared_ptr<AIScript>	loadAIScript			(const std::string& path);
+	std::shared_ptr<TileSet>	loadTileSet				(const std::string& path, float frameSize);
 
-	std::shared_ptr<Shader> loadShader(const std::string& name, const std::string& vertexPath, const std::string& fragPath);
-	std::shared_ptr<Weapon> loadWeapon(const std::string& name, std::shared_ptr<Shader> weaponShader, std::shared_ptr<Shader> bulletShader);
-	std::shared_ptr<SceneData> loadScene(const std::string& id);
+	std::shared_ptr<Shader>		loadShader	(const std::string& name, const std::string& vertexPath, const std::string& fragPath);
+	std::shared_ptr<Weapon>		loadWeapon	(const std::string& name, std::shared_ptr<Shader> weaponShader, std::shared_ptr<Shader> bulletShader);
+	std::shared_ptr<SceneData>	loadScene	(const std::string& id);
 
 	void clearResources();
 
diff --git a/YuppleMayham/utility/script.h b/YuppleMayham/include/utility/script.h
similarity index 67%
rename from YuppleMayham/utility/script.h
rename to YuppleMayham/include/utility/script.h
index acf18e9..fbe4c77 100644
--- a/YuppleMayham/utility/script.h
+++ b/YuppleMayham/include/utility/script.h
@@ -10,7 +10,6 @@ class Script {
 public:
 	sol::state lua;
 	Script(const std::string& path);
-	Script(const Script& script);
 	virtual ~Script() {};
 private:
 	bool loadScript(const std::string& path) {
@@ -22,7 +21,16 @@ private:
 		}
 		return result.valid();
 	}
-	void registerUserTypes();
+	virtual void registerUserTypes() {};
+};
+
+class AIScript : public Script {
+public:
+	AIScript(const std::string& path) : Script(path) { registerUserTypes(); }
+
+private:
+
+	virtual void registerUserTypes() override;
 };
 
 #endif // _H_SCRIPT_H
\ No newline at end of file
diff --git a/YuppleMayham/utility/xmlloader.h b/YuppleMayham/include/utility/xmlloader.h
similarity index 100%
rename from YuppleMayham/utility/xmlloader.h
rename to YuppleMayham/include/utility/xmlloader.h
diff --git a/YuppleMayham/src/gameplay/ai.cpp b/YuppleMayham/src/gameplay/ai.cpp
index 5bf18b3..c63f57c 100644
--- a/YuppleMayham/src/gameplay/ai.cpp
+++ b/YuppleMayham/src/gameplay/ai.cpp
@@ -9,7 +9,7 @@ AI::AI(const std::shared_ptr<GameActor>& actor, const std::shared_ptr<Raycaster>
 	: actor(actor), raycaster(raycaster), state(AIState::Idle)
 {}
 
-void AI::attachBehaviourScript(const std::shared_ptr<Script>& behaviour)
+void AI::attachBehaviourScript(const std::shared_ptr<AIScript>& behaviour)
 {
 	// passing out instance of raycaster this Ai into our scripting api
 	// pay special attention each ai script has control of only their own instance of ai!
diff --git a/YuppleMayham/src/gameplay/scene.cpp b/YuppleMayham/src/gameplay/scene.cpp
index ed7c45f..e120575 100644
--- a/YuppleMayham/src/gameplay/scene.cpp
+++ b/YuppleMayham/src/gameplay/scene.cpp
@@ -95,7 +95,7 @@ void Scene::loadDebugShooterScene()
 			// attach ai
 			if (!entityData.script.empty())
 			{
-				auto behaviourScript = resourceManager->loadScript(entityData.script);
+				auto behaviourScript = resourceManager->loadAIScript(entityData.script);
 				auto rayCaster = std::make_shared<Raycaster>(40.f, 300.f, map->getCollisionMap(), mapData.tileSize);
 				auto ai = std::make_shared<AI>(entity, rayCaster);
 				ai->setTarget(player);
diff --git a/YuppleMayham/src/gameplay/weapons/weapon.cpp b/YuppleMayham/src/gameplay/weapons/weapon.cpp
index 503c2ea..f55923a 100644
--- a/YuppleMayham/src/gameplay/weapons/weapon.cpp
+++ b/YuppleMayham/src/gameplay/weapons/weapon.cpp
@@ -11,6 +11,7 @@
 #include "utility/debugdraw.h"
 
 // TODO: Regular clean up, make this mess readable!
+// TODO: Attach script to weapons, create custom shoot scripts, allowing the addition of shotguns and other whacky things
 
 Weapon::Weapon(const WeaponData* data, const std::shared_ptr<Shader>& weaponShader, const std::shared_ptr<Shader>& bulletShader, ResourceManager* resourceManager)
 	: 
@@ -44,7 +45,6 @@ void Weapon::addComponent(const std::shared_ptr<Component>& comp) {
 	components.push_back(comp);
 }
 
-// TODO: Fix this tangled web of garbage
 void Weapon::shoot()
 {
 	if (wielder)
diff --git a/YuppleMayham/src/utility/resourcemanager.cpp b/YuppleMayham/src/utility/resourcemanager.cpp
index 6596b06..acc4d3d 100644
--- a/YuppleMayham/src/utility/resourcemanager.cpp
+++ b/YuppleMayham/src/utility/resourcemanager.cpp
@@ -32,9 +32,9 @@ std::shared_ptr<Sprite> ResourceManager::loadSpriteStatic(const std::string& pat
 	return sprite;
 }
 
-std::shared_ptr<Script> ResourceManager::loadScript(const std::string& path)
+std::shared_ptr<AIScript> ResourceManager::loadAIScript(const std::string& path)
 {
-	return std::make_shared<Script>(path.c_str());
+	return std::make_shared<AIScript>(path.c_str());
 }
 
 std::shared_ptr<TileSet> ResourceManager::loadTileSet(const std::string& path, float frameSize)
diff --git a/YuppleMayham/src/utility/script.cpp b/YuppleMayham/src/utility/script.cpp
index bec2d4d..7957970 100644
--- a/YuppleMayham/src/utility/script.cpp
+++ b/YuppleMayham/src/utility/script.cpp
@@ -4,7 +4,7 @@
 #include "gameplay/ai.h"
 #include "utility/raycaster.h"
 
-void Script::registerUserTypes()
+void AIScript::registerUserTypes() 
 {
 	lua.new_usertype<glm::vec3>("vec3",
 		sol::constructors<glm::vec3(), glm::vec3(float, float, float)>(),
@@ -46,6 +46,5 @@ void Script::registerUserTypes()
 Script::Script(const std::string& path)
 {
 	lua.open_libraries(sol::lib::base, sol::lib::math);
-	registerUserTypes();
 	loadScript(path);
 }