diff --git a/conanfile.py b/conanfile.py
index a0fe0bf..c3bdaa5 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -24,7 +24,7 @@ class PkmnLibConan(ConanFile):
         cmake.build()
 
     def package(self):
-        self.copy("*.hpp", dst="include", src="src")
+        self.copy("*.hpp", dst="include/PkmnLib", src="src")
         self.copy("*.dll", dst="bin", keep_path=False)
         self.copy("*.so", dst="lib", keep_path=False)
 
@@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile):
                 self.options["AngelScript"].link_std_statically = True
 
     def requirements(self):
-            self.requires("CreatureLib/52d24922ff6dfbe0b9fb128bbfa0637d147c47cc@creaturelib/master")
+            self.requires("CreatureLib/3303dfd82de510d1bf7f978e1f996d4a9a297960@creaturelib/master")
             if self.options.script_handler == "angelscript":
                 self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
             else:
diff --git a/src/Battling/Library/BattleLibrary.hpp b/src/Battling/Library/BattleLibrary.hpp
index 00b0b02..6023aec 100644
--- a/src/Battling/Library/BattleLibrary.hpp
+++ b/src/Battling/Library/BattleLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_BATTLELIBRARY_HPP
 #define PKMNLIB_BATTLELIBRARY_HPP
 
-#include <Battling/Library/BattleLibrary.hpp>
+#include <CreatureLib/Battling/Library/BattleLibrary.hpp>
 #include "../../Library/PokemonLibrary.hpp"
 #include "DamageLibrary.hpp"
 #include "StatCalculator.hpp"
diff --git a/src/Battling/Library/DamageLibrary.hpp b/src/Battling/Library/DamageLibrary.hpp
index 7388be1..37ab41e 100644
--- a/src/Battling/Library/DamageLibrary.hpp
+++ b/src/Battling/Library/DamageLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_DAMAGELIBRARY_HPP
 #define PKMNLIB_DAMAGELIBRARY_HPP
 
-#include <Battling/Library/DamageLibrary.hpp>
+#include <CreatureLib/Battling/Library/DamageLibrary.hpp>
 namespace PkmnLib::Battling {
     class DamageLibrary : public CreatureLib::Battling::DamageLibrary {
     public:
diff --git a/src/Battling/Library/StatCalculator.hpp b/src/Battling/Library/StatCalculator.hpp
index 70709df..df127db 100644
--- a/src/Battling/Library/StatCalculator.hpp
+++ b/src/Battling/Library/StatCalculator.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_STATCALCULATOR_HPP
 #define PKMNLIB_STATCALCULATOR_HPP
 
-#include <Battling/Library/BattleStatCalculator.hpp>
+#include <CreatureLib/Battling/Library/BattleStatCalculator.hpp>
 #include "../../Library/Statistic.hpp"
 
 namespace PkmnLib::Battling {
diff --git a/src/Battling/Pokemon/LearnedMove.hpp b/src/Battling/Pokemon/LearnedMove.hpp
index 9ea4355..21e2285 100644
--- a/src/Battling/Pokemon/LearnedMove.hpp
+++ b/src/Battling/Pokemon/LearnedMove.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_LEARNEDMOVE_HPP
 #define PKMNLIB_LEARNEDMOVE_HPP
 
-#include <Battling/Models/LearnedAttack.hpp>
+#include <CreatureLib/Battling/Models/LearnedAttack.hpp>
 #include "../../Library/Moves/MoveData.hpp"
 namespace PkmnLib::Battling {
     class LearnedMove : public CreatureLib::Battling::LearnedAttack {
diff --git a/src/Battling/Pokemon/Pokemon.hpp b/src/Battling/Pokemon/Pokemon.hpp
index ec76b8e..0cbb6e3 100644
--- a/src/Battling/Pokemon/Pokemon.hpp
+++ b/src/Battling/Pokemon/Pokemon.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_POKEMON_HPP
 #define PKMNLIB_POKEMON_HPP
 
-#include <Battling/Models/Creature.hpp>
+#include <CreatureLib/Battling/Models/Creature.hpp>
 #include <utility>
 #include "../../Library/Statistic.hpp"
 #include "../Library/BattleLibrary.hpp"
diff --git a/src/Library/Evolutions/EvolutionData.hpp b/src/Library/Evolutions/EvolutionData.hpp
index 950545c..9878c5b 100644
--- a/src/Library/Evolutions/EvolutionData.hpp
+++ b/src/Library/Evolutions/EvolutionData.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_EVOLUTIONDATA_HPP
 #define PKMNLIB_EVOLUTIONDATA_HPP
 
-#include <Library/Gender.hpp>
+#include <CreatureLib/Library/Gender.hpp>
 #include <any>
 #include <string>
 #include <utility>
diff --git a/src/Library/Items/Item.hpp b/src/Library/Items/Item.hpp
index 2e83c8d..e6d3bbe 100644
--- a/src/Library/Items/Item.hpp
+++ b/src/Library/Items/Item.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_ITEM_HPP
 #define PKMNLIB_ITEM_HPP
 
-#include <Library/Items/Item.hpp>
+#include <CreatureLib/Library/Items/Item.hpp>
 namespace PkmnLib::Library {
     class Item : public CreatureLib::Library::Item {
     public:
diff --git a/src/Library/Items/ItemLibrary.hpp b/src/Library/Items/ItemLibrary.hpp
index 4b5d07a..86aebf7 100644
--- a/src/Library/Items/ItemLibrary.hpp
+++ b/src/Library/Items/ItemLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_ITEMLIBRARY_HPP
 #define PKMNLIB_ITEMLIBRARY_HPP
 
-#include <Library/ItemLibrary.hpp>
+#include <CreatureLib/Library/ItemLibrary.hpp>
 #include "Item.hpp"
 namespace PkmnLib::Library {
     class ItemLibrary : public CreatureLib::Library::ItemLibrary {
diff --git a/src/Library/LibrarySettings.hpp b/src/Library/LibrarySettings.hpp
index b2ec08b..01e90da 100644
--- a/src/Library/LibrarySettings.hpp
+++ b/src/Library/LibrarySettings.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_LIBRARYSETTINGS_HPP
 #define PKMNLIB_LIBRARYSETTINGS_HPP
 
-#include <Library/LibrarySettings.hpp>
+#include <CreatureLib/Library/LibrarySettings.hpp>
 
 namespace PkmnLib::Library {
     class LibrarySettings : public CreatureLib::Library::LibrarySettings {
diff --git a/src/Library/Moves/MoveData.hpp b/src/Library/Moves/MoveData.hpp
index 0703e47..9b990e9 100644
--- a/src/Library/Moves/MoveData.hpp
+++ b/src/Library/Moves/MoveData.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_MOVEDATA_HPP
 #define PKMNLIB_MOVEDATA_HPP
 
-#include <Library/Attacks/AttackData.hpp>
+#include <CreatureLib/Library/Attacks/AttackData.hpp>
 #include "MoveCategory.hpp"
 
 namespace PkmnLib::Library {
diff --git a/src/Library/Moves/MoveLibrary.hpp b/src/Library/Moves/MoveLibrary.hpp
index 04500ab..eaa2679 100644
--- a/src/Library/Moves/MoveLibrary.hpp
+++ b/src/Library/Moves/MoveLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_MOVELIBRARY_HPP
 #define PKMNLIB_MOVELIBRARY_HPP
 
-#include <Library/AttackLibrary.hpp>
+#include <CreatureLib/Library/AttackLibrary.hpp>
 #include "MoveData.hpp"
 namespace PkmnLib::Library {
     class MoveLibrary : public CreatureLib::Library::AttackLibrary {
diff --git a/src/Library/Natures/Nature.hpp b/src/Library/Natures/Nature.hpp
index 97ab180..601ba59 100644
--- a/src/Library/Natures/Nature.hpp
+++ b/src/Library/Natures/Nature.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_NATURE_HPP
 #define PKMNLIB_NATURE_HPP
 
-#include <Core/Statistic.hpp>
+#include <CreatureLib/Core/Statistic.hpp>
 namespace PkmnLib::Library {
     class Nature {
     private:
diff --git a/src/Library/Natures/NatureLibrary.hpp b/src/Library/Natures/NatureLibrary.hpp
index 714c0be..5f892ce 100644
--- a/src/Library/Natures/NatureLibrary.hpp
+++ b/src/Library/Natures/NatureLibrary.hpp
@@ -1,8 +1,8 @@
 #ifndef PKMNLIB_NATURELIBRARY_HPP
 #define PKMNLIB_NATURELIBRARY_HPP
 
-#include <Core/Exceptions/CreatureException.hpp>
-#include <Core/Random.hpp>
+#include <CreatureLib/Core/Exceptions/CreatureException.hpp>
+#include <CreatureLib/Core/Random.hpp>
 #include <unordered_map>
 #include <vector>
 #include "Nature.hpp"
diff --git a/src/Library/PokemonLibrary.hpp b/src/Library/PokemonLibrary.hpp
index 9da4067..5ef89c8 100644
--- a/src/Library/PokemonLibrary.hpp
+++ b/src/Library/PokemonLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_POKEMONLIBRARY_HPP
 #define PKMNLIB_POKEMONLIBRARY_HPP
 
-#include <Library/DataLibrary.hpp>
+#include <CreatureLib/Library/DataLibrary.hpp>
 #include "Items/ItemLibrary.hpp"
 #include "LibrarySettings.hpp"
 #include "Moves/MoveLibrary.hpp"
diff --git a/src/Library/Species/PokemonForme.hpp b/src/Library/Species/PokemonForme.hpp
index 0cb508a..c6bb6dc 100644
--- a/src/Library/Species/PokemonForme.hpp
+++ b/src/Library/Species/PokemonForme.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_POKEMONFORME_HPP
 #define PKMNLIB_POKEMONFORME_HPP
 
-#include <Library/CreatureData/SpeciesVariant.hpp>
+#include <CreatureLib/Library/CreatureData/SpeciesVariant.hpp>
 
 namespace PkmnLib::Library {
     class PokemonForme : public CreatureLib::Library::SpeciesVariant {
diff --git a/src/Library/Species/PokemonSpecies.hpp b/src/Library/Species/PokemonSpecies.hpp
index 174ffb9..ba0da39 100644
--- a/src/Library/Species/PokemonSpecies.hpp
+++ b/src/Library/Species/PokemonSpecies.hpp
@@ -1,6 +1,6 @@
 #ifndef PKMNLIB_POKEMONSPECIES_HPP
 #define PKMNLIB_POKEMONSPECIES_HPP
-#include <Battling/Models/Creature.hpp>
+#include <CreatureLib/Battling/Models/Creature.hpp>
 #include "../Evolutions/EvolutionData.hpp"
 #include "PokemonForme.hpp"
 
diff --git a/src/Library/Species/SpeciesLibrary.hpp b/src/Library/Species/SpeciesLibrary.hpp
index bfde5ab..3ad90a6 100644
--- a/src/Library/Species/SpeciesLibrary.hpp
+++ b/src/Library/Species/SpeciesLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_SPECIESLIBRARY_HPP
 #define PKMNLIB_SPECIESLIBRARY_HPP
 
-#include <Library/SpeciesLibrary.hpp>
+#include <CreatureLib/Library/SpeciesLibrary.hpp>
 #include "PokemonSpecies.hpp"
 
 namespace PkmnLib::Library {
diff --git a/src/Library/Statistic.hpp b/src/Library/Statistic.hpp
index 6c74f67..b1588a6 100644
--- a/src/Library/Statistic.hpp
+++ b/src/Library/Statistic.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_STATISTIC_HPP
 #define PKMNLIB_STATISTIC_HPP
 
-#include <Core/Statistic.hpp>
+#include <CreatureLib/Core/Statistic.hpp>
 namespace PkmnLib::Library {
     class Statistic {
     public:
diff --git a/src/ScriptResolving/AngelScript/AngelScripResolver.hpp b/src/ScriptResolving/AngelScript/AngelScripResolver.hpp
index c55a707..bcc7382 100644
--- a/src/ScriptResolving/AngelScript/AngelScripResolver.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScripResolver.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_ANGELSCRIPRESOLVER_HPP
 #define PKMNLIB_ANGELSCRIPRESOLVER_HPP
 
-#include <Battling/ScriptHandling/ScriptResolver.hpp>
+#include <CreatureLib/Battling/ScriptHandling/ScriptResolver.hpp>
 #include "../../Battling/Library/BattleLibrary.hpp"
 
 #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
diff --git a/src/ScriptResolving/AngelScript/AngelScriptScript.hpp b/src/ScriptResolving/AngelScript/AngelScriptScript.hpp
index cd9c817..9657252 100644
--- a/src/ScriptResolving/AngelScript/AngelScriptScript.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScriptScript.hpp
@@ -1,8 +1,8 @@
 #ifndef PKMNLIB_ANGELSCRIPTSCRIPT_HPP
 #define PKMNLIB_ANGELSCRIPTSCRIPT_HPP
-#include <Battling/ScriptHandling/Script.hpp>
+#include <CreatureLib/Battling/ScriptHandling/Script.hpp>
 #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
-#include <Core/Exceptions/NotImplementedException.hpp>
+#include <CreatureLib/Core/Exceptions/NotImplementedException.hpp>
 #include <angelscript.h>
 #include "AngelScriptTypeInfo.hpp"
 #include "ContextPool.hpp"
diff --git a/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
index 98d4d20..fac0040 100644
--- a/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
+++ b/src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp
@@ -2,7 +2,7 @@
 #define PKMNLIB_ANGELSCRIPTTYPEINFO_HPP
 
 #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
-#include <Core/Exceptions/CreatureException.hpp>
+#include <CreatureLib/Core/Exceptions/CreatureException.hpp>
 #include <angelscript.h>
 #include <cstring>
 #include <unordered_map>
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp
index 007d9a2..c7132c8 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp
@@ -1,5 +1,5 @@
 #include "RegisterExecutingAttack.hpp"
-#include <Battling/Models/ExecutingAttack.hpp>
+#include <CreatureLib/Battling/Models/ExecutingAttack.hpp>
 #include <cassert>
 
 void RegisterExecutingAttack::Register(asIScriptEngine* engine) {
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp
index abf97ba..3a02adc 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp
@@ -1,5 +1,5 @@
 #include "RegisterPokemonClass.hpp"
-#include <Battling/Models/LearnedAttack.hpp>
+#include <CreatureLib/Battling/Models/LearnedAttack.hpp>
 #include <cassert>
 #include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h"
 #include "../../../../Battling/Pokemon/Pokemon.hpp"
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp
index 5ba4c44..cf11fbc 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp
@@ -1,6 +1,6 @@
 #include "RegisterGrowthRateTypes.hpp"
-#include <Library/GrowthRates/GrowthRate.hpp>
-#include <Library/GrowthRates/GrowthRateLibrary.hpp>
+#include <CreatureLib/Library/GrowthRates/GrowthRate.hpp>
+#include <CreatureLib/Library/GrowthRates/GrowthRateLibrary.hpp>
 #include <cassert>
 
 void RegisterGrowthRateTypes::Register(asIScriptEngine* engine) {
diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp
index 79e7078..bd7d7a5 100644
--- a/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp
+++ b/src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp
@@ -1,5 +1,5 @@
 #include "RegisterTypeLibrary.hpp"
-#include <Library/TypeLibrary.hpp>
+#include <CreatureLib/Library/TypeLibrary.hpp>
 #include <cassert>
 
 void RegisterTypeLibrary::Register(asIScriptEngine* engine) {
diff --git a/tests/TestLibrary/TestLibrary.hpp b/tests/TestLibrary/TestLibrary.hpp
index 7aa5826..42e29a0 100644
--- a/tests/TestLibrary/TestLibrary.hpp
+++ b/tests/TestLibrary/TestLibrary.hpp
@@ -1,7 +1,7 @@
 #ifndef PKMNLIB_TESTLIBRARY_HPP
 #define PKMNLIB_TESTLIBRARY_HPP
 
-#include <Library/GrowthRates/LookupGrowthRate.hpp>
+#include <CreatureLib/Library/GrowthRates/LookupGrowthRate.hpp>
 #include "../../src/Battling/Library/BattleLibrary.hpp"
 #include "../../src/Library/Moves/MoveLibrary.hpp"
 #include "../../src/Library/PokemonLibrary.hpp"