diff --git a/modules/acore/extractors/mmaps_generator/CMakeLists.txt b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
index 566824f75..2e789566f 100644
--- a/modules/acore/extractors/mmaps_generator/CMakeLists.txt
+++ b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
@@ -38,10 +38,10 @@ set(mmap_gen_Includes
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
   ${CMAKE_SOURCE_DIR}/src/game
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/game/Addons
   ${CMAKE_SOURCE_DIR}/src/game/AI
   ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
   ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
diff --git a/modules/acore/game-framework/src/CMakeLists.txt b/modules/acore/game-framework/src/CMakeLists.txt
index 88c122de4..94b4628ba 100644
--- a/modules/acore/game-framework/src/CMakeLists.txt
+++ b/modules/acore/game-framework/src/CMakeLists.txt
@@ -2,6 +2,7 @@ if( USE_COREPCH )
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
+file(GLOB_RECURSE sources_Addons Addons/*.cpp Addons/*.h)
 file(GLOB sources_localdir *.cpp *.h)
 
 # Build gamefw sourcelist
@@ -14,6 +15,7 @@ endif()
 
 set(gamefw_STAT_SRCS
   ${gamefw_STAT_SRCS}
+  ${sources_Addons}
   ${sources_localdir}
 )
 
diff --git a/modules/worldengine/lib-collision/CMakeLists.txt b/modules/worldengine/lib-collision/CMakeLists.txt
new file mode 100644
index 000000000..4b43d67e3
--- /dev/null
+++ b/modules/worldengine/lib-collision/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(src)
diff --git a/modules/worldengine/lib-collision/src/CMakeLists.txt b/modules/worldengine/lib-collision/src/CMakeLists.txt
index daed397fd..012c68bd5 100644
--- a/modules/worldengine/lib-collision/src/CMakeLists.txt
+++ b/modules/worldengine/lib-collision/src/CMakeLists.txt
@@ -46,7 +46,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
-  ${CMAKE_SOURCE_DIR}/src/game/Addons
+  ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
   ${CMAKE_SOURCE_DIR}/src/game/Conditions
   ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
   ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index dd6504152..58d3e3a8c 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -92,14 +92,14 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/game/Addons
   ${CMAKE_SOURCE_DIR}/src/game/AI
   ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
   ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
diff --git a/src/worldserver/CMakeLists.txt b/src/worldserver/CMakeLists.txt
index ee8d5ae50..040ebdfd7 100644
--- a/src/worldserver/CMakeLists.txt
+++ b/src/worldserver/CMakeLists.txt
@@ -64,10 +64,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
   ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons
   ${CMAKE_SOURCE_DIR}/src/game
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/game/Addons
   ${CMAKE_SOURCE_DIR}/src/game/AI
   ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
   ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI