diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b1ba6eba..10c8aff86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,6 +240,9 @@ endif()
 # Load all of our third party directories
 add_subdirectory(thirdparty SYSTEM)
 
+# The component folder and its family subfolders (as the client groups them), for every target that includes components
+set(DLU_COMPONENT_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/dGame/dComponents" "${PROJECT_SOURCE_DIR}/dGame/dComponents/Physics" "${PROJECT_SOURCE_DIR}/dGame/dComponents/Activity" "${PROJECT_SOURCE_DIR}/dGame/dComponents/Vendor" "${PROJECT_SOURCE_DIR}/dGame/dComponents/Character" "${PROJECT_SOURCE_DIR}/dGame/dComponents/Sound" "${PROJECT_SOURCE_DIR}/dGame/dComponents/Property")
+
 # Create our list of include directories
 include_directories(
 	"dPhysics"
diff --git a/dGame/dBehaviors/CMakeLists.txt b/dGame/dBehaviors/CMakeLists.txt
index 35d8cae66..d4871e39d 100644
--- a/dGame/dBehaviors/CMakeLists.txt
+++ b/dGame/dBehaviors/CMakeLists.txt
@@ -59,7 +59,7 @@ target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics)
 target_include_directories(dBehaviors PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h
 	PRIVATE
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct BuffComponent.h
+	${DLU_COMPONENT_INCLUDE_DIRS} # direct BuffComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # Preconditions.h via QuickBuildComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager.h, Spawner.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via CharacterComponent.h
diff --git a/dGame/dComponents/ActivityComponent.cpp b/dGame/dComponents/Activity/ActivityComponent.cpp
similarity index 100%
rename from dGame/dComponents/ActivityComponent.cpp
rename to dGame/dComponents/Activity/ActivityComponent.cpp
diff --git a/dGame/dComponents/ActivityComponent.h b/dGame/dComponents/Activity/ActivityComponent.h
similarity index 100%
rename from dGame/dComponents/ActivityComponent.h
rename to dGame/dComponents/Activity/ActivityComponent.h
diff --git a/dGame/dComponents/BaseRacingControlComponent.h b/dGame/dComponents/Activity/BaseRacingControlComponent.h
similarity index 100%
rename from dGame/dComponents/BaseRacingControlComponent.h
rename to dGame/dComponents/Activity/BaseRacingControlComponent.h
diff --git a/dGame/dComponents/GateRushComponent.h b/dGame/dComponents/Activity/GateRushComponent.h
similarity index 100%
rename from dGame/dComponents/GateRushComponent.h
rename to dGame/dComponents/Activity/GateRushComponent.h
diff --git a/dGame/dComponents/MiniGameControlComponent.h b/dGame/dComponents/Activity/MiniGameControlComponent.h
similarity index 100%
rename from dGame/dComponents/MiniGameControlComponent.h
rename to dGame/dComponents/Activity/MiniGameControlComponent.h
diff --git a/dGame/dComponents/QuickBuildComponent.cpp b/dGame/dComponents/Activity/QuickBuildComponent.cpp
similarity index 100%
rename from dGame/dComponents/QuickBuildComponent.cpp
rename to dGame/dComponents/Activity/QuickBuildComponent.cpp
diff --git a/dGame/dComponents/QuickBuildComponent.h b/dGame/dComponents/Activity/QuickBuildComponent.h
similarity index 100%
rename from dGame/dComponents/QuickBuildComponent.h
rename to dGame/dComponents/Activity/QuickBuildComponent.h
diff --git a/dGame/dComponents/RacingControlComponent.cpp b/dGame/dComponents/Activity/RacingControlComponent.cpp
similarity index 100%
rename from dGame/dComponents/RacingControlComponent.cpp
rename to dGame/dComponents/Activity/RacingControlComponent.cpp
diff --git a/dGame/dComponents/RacingControlComponent.h b/dGame/dComponents/Activity/RacingControlComponent.h
similarity index 100%
rename from dGame/dComponents/RacingControlComponent.h
rename to dGame/dComponents/Activity/RacingControlComponent.h
diff --git a/dGame/dComponents/ScriptedActivityComponent.h b/dGame/dComponents/Activity/ScriptedActivityComponent.h
similarity index 100%
rename from dGame/dComponents/ScriptedActivityComponent.h
rename to dGame/dComponents/Activity/ScriptedActivityComponent.h
diff --git a/dGame/dComponents/ShootingGalleryComponent.cpp b/dGame/dComponents/Activity/ShootingGalleryComponent.cpp
similarity index 100%
rename from dGame/dComponents/ShootingGalleryComponent.cpp
rename to dGame/dComponents/Activity/ShootingGalleryComponent.cpp
diff --git a/dGame/dComponents/ShootingGalleryComponent.h b/dGame/dComponents/Activity/ShootingGalleryComponent.h
similarity index 100%
rename from dGame/dComponents/ShootingGalleryComponent.h
rename to dGame/dComponents/Activity/ShootingGalleryComponent.h
diff --git a/dGame/dComponents/CMakeLists.txt b/dGame/dComponents/CMakeLists.txt
index d833dca12..579854197 100644
--- a/dGame/dComponents/CMakeLists.txt
+++ b/dGame/dComponents/CMakeLists.txt
@@ -1,57 +1,57 @@
 set(DGAME_DCOMPONENTS_SOURCES
-	"AchievementVendorComponent.cpp"
-	"ActivityComponent.cpp"
+	"Vendor/AchievementVendorComponent.cpp"
+	"Activity/ActivityComponent.cpp"
 	"BaseCombatAIComponent.cpp"
 	"BouncerComponent.cpp"
 	"BuffComponent.cpp"
-	"BuildBorderComponent.cpp"
-	"CharacterComponent.cpp"
+	"Property/BuildBorderComponent.cpp"
+	"Character/CharacterComponent.cpp"
 	"CollectibleComponent.cpp"
-	"ControllablePhysicsComponent.cpp"
+	"Physics/ControllablePhysicsComponent.cpp"
 	"DestroyableComponent.cpp"
-	"DonationVendorComponent.cpp"
-	"GhostComponent.cpp"
+	"Vendor/DonationVendorComponent.cpp"
+	"Character/GhostComponent.cpp"
 	"InventoryComponent.cpp"
 	"ItemComponent.cpp"
-	"LevelProgressionComponent.cpp"
+	"Character/LevelProgressionComponent.cpp"
 	"LUPExhibitComponent.cpp"
-	"MissionComponent.cpp"
+	"Character/MissionComponent.cpp"
 	"MissionOfferComponent.cpp"
 	"ModelComponent.cpp"
 	"ModuleAssemblyComponent.cpp"
 	"MovementAIComponent.cpp"
 	"MovingPlatformComponent.cpp"
 	"PetComponent.cpp"
-	"PhantomPhysicsComponent.cpp"
-	"PhysicsComponent.cpp"
-	"PlayerForcedMovementComponent.cpp"
+	"Physics/PhantomPhysicsComponent.cpp"
+	"Physics/PhysicsComponent.cpp"
+	"Character/PlayerForcedMovementComponent.cpp"
 	"PossessableComponent.cpp"
-	"PossessorComponent.cpp"
-	"PropertyEntranceComponent.cpp"
-	"PropertyManagementComponent.cpp"
-	"PropertyVendorComponent.cpp"
+	"Character/PossessorComponent.cpp"
+	"Property/PropertyEntranceComponent.cpp"
+	"Property/PropertyManagementComponent.cpp"
+	"Property/PropertyVendorComponent.cpp"
 	"ProximityMonitorComponent.cpp"
-	"RacingControlComponent.cpp"
+	"Activity/RacingControlComponent.cpp"
 	"RailActivatorComponent.cpp"
-	"QuickBuildComponent.cpp"
+	"Activity/QuickBuildComponent.cpp"
 	"RenderComponent.cpp"
-	"RigidbodyPhantomPhysicsComponent.cpp"
+	"Physics/RigidbodyPhantomPhysicsComponent.cpp"
 	"MultiZoneEntranceComponent.cpp"
 	"RocketLaunchpadControlComponent.cpp"
-	"ShootingGalleryComponent.cpp"
-	"SimplePhysicsComponent.cpp"
+	"Activity/ShootingGalleryComponent.cpp"
+	"Physics/SimplePhysicsComponent.cpp"
 	"SkillComponent.cpp"
-	"SoundTriggerComponent.cpp"
+	"Sound/SoundTriggerComponent.cpp"
 	"SpawnerComponent.cpp"
 	"SwitchComponent.cpp"
 	"TriggerComponent.cpp"
-	"HavokVehiclePhysicsComponent.cpp"
-	"VendorComponent.cpp"
+	"Physics/HavokVehiclePhysicsComponent.cpp"
+	"Vendor/VendorComponent.cpp"
 	"ScriptComponent.cpp"
 )
 
 add_library(dComponents OBJECT ${DGAME_DCOMPONENTS_SOURCES})
-target_include_directories(dComponents PUBLIC "."
+target_include_directories(dComponents PUBLIC ${DLU_COMPONENT_INCLUDE_DIRS}
 	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # via ModelComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors/ControlBehaviorMessages"
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
diff --git a/dGame/dComponents/CharacterComponent.cpp b/dGame/dComponents/Character/CharacterComponent.cpp
similarity index 100%
rename from dGame/dComponents/CharacterComponent.cpp
rename to dGame/dComponents/Character/CharacterComponent.cpp
diff --git a/dGame/dComponents/CharacterComponent.h b/dGame/dComponents/Character/CharacterComponent.h
similarity index 100%
rename from dGame/dComponents/CharacterComponent.h
rename to dGame/dComponents/Character/CharacterComponent.h
diff --git a/dGame/dComponents/GhostComponent.cpp b/dGame/dComponents/Character/GhostComponent.cpp
similarity index 100%
rename from dGame/dComponents/GhostComponent.cpp
rename to dGame/dComponents/Character/GhostComponent.cpp
diff --git a/dGame/dComponents/GhostComponent.h b/dGame/dComponents/Character/GhostComponent.h
similarity index 100%
rename from dGame/dComponents/GhostComponent.h
rename to dGame/dComponents/Character/GhostComponent.h
diff --git a/dGame/dComponents/LevelProgressionComponent.cpp b/dGame/dComponents/Character/LevelProgressionComponent.cpp
similarity index 100%
rename from dGame/dComponents/LevelProgressionComponent.cpp
rename to dGame/dComponents/Character/LevelProgressionComponent.cpp
diff --git a/dGame/dComponents/LevelProgressionComponent.h b/dGame/dComponents/Character/LevelProgressionComponent.h
similarity index 100%
rename from dGame/dComponents/LevelProgressionComponent.h
rename to dGame/dComponents/Character/LevelProgressionComponent.h
diff --git a/dGame/dComponents/MinifigComponent.h b/dGame/dComponents/Character/MinifigComponent.h
similarity index 100%
rename from dGame/dComponents/MinifigComponent.h
rename to dGame/dComponents/Character/MinifigComponent.h
diff --git a/dGame/dComponents/MissionComponent.cpp b/dGame/dComponents/Character/MissionComponent.cpp
similarity index 100%
rename from dGame/dComponents/MissionComponent.cpp
rename to dGame/dComponents/Character/MissionComponent.cpp
diff --git a/dGame/dComponents/MissionComponent.h b/dGame/dComponents/Character/MissionComponent.h
similarity index 100%
rename from dGame/dComponents/MissionComponent.h
rename to dGame/dComponents/Character/MissionComponent.h
diff --git a/dGame/dComponents/MountControlComponent.h b/dGame/dComponents/Character/MountControlComponent.h
similarity index 100%
rename from dGame/dComponents/MountControlComponent.h
rename to dGame/dComponents/Character/MountControlComponent.h
diff --git a/dGame/dComponents/PetCreatorComponent.h b/dGame/dComponents/Character/PetCreatorComponent.h
similarity index 100%
rename from dGame/dComponents/PetCreatorComponent.h
rename to dGame/dComponents/Character/PetCreatorComponent.h
diff --git a/dGame/dComponents/PlayerForcedMovementComponent.cpp b/dGame/dComponents/Character/PlayerForcedMovementComponent.cpp
similarity index 100%
rename from dGame/dComponents/PlayerForcedMovementComponent.cpp
rename to dGame/dComponents/Character/PlayerForcedMovementComponent.cpp
diff --git a/dGame/dComponents/PlayerForcedMovementComponent.h b/dGame/dComponents/Character/PlayerForcedMovementComponent.h
similarity index 100%
rename from dGame/dComponents/PlayerForcedMovementComponent.h
rename to dGame/dComponents/Character/PlayerForcedMovementComponent.h
diff --git a/dGame/dComponents/PossessorComponent.cpp b/dGame/dComponents/Character/PossessorComponent.cpp
similarity index 100%
rename from dGame/dComponents/PossessorComponent.cpp
rename to dGame/dComponents/Character/PossessorComponent.cpp
diff --git a/dGame/dComponents/PossessorComponent.h b/dGame/dComponents/Character/PossessorComponent.h
similarity index 100%
rename from dGame/dComponents/PossessorComponent.h
rename to dGame/dComponents/Character/PossessorComponent.h
diff --git a/dGame/dComponents/ControllablePhysicsComponent.cpp b/dGame/dComponents/Physics/ControllablePhysicsComponent.cpp
similarity index 100%
rename from dGame/dComponents/ControllablePhysicsComponent.cpp
rename to dGame/dComponents/Physics/ControllablePhysicsComponent.cpp
diff --git a/dGame/dComponents/ControllablePhysicsComponent.h b/dGame/dComponents/Physics/ControllablePhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/ControllablePhysicsComponent.h
rename to dGame/dComponents/Physics/ControllablePhysicsComponent.h
diff --git a/dGame/dComponents/HavokVehiclePhysicsComponent.cpp b/dGame/dComponents/Physics/HavokVehiclePhysicsComponent.cpp
similarity index 100%
rename from dGame/dComponents/HavokVehiclePhysicsComponent.cpp
rename to dGame/dComponents/Physics/HavokVehiclePhysicsComponent.cpp
diff --git a/dGame/dComponents/HavokVehiclePhysicsComponent.h b/dGame/dComponents/Physics/HavokVehiclePhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/HavokVehiclePhysicsComponent.h
rename to dGame/dComponents/Physics/HavokVehiclePhysicsComponent.h
diff --git a/dGame/dComponents/PhantomPhysicsComponent.cpp b/dGame/dComponents/Physics/PhantomPhysicsComponent.cpp
similarity index 100%
rename from dGame/dComponents/PhantomPhysicsComponent.cpp
rename to dGame/dComponents/Physics/PhantomPhysicsComponent.cpp
diff --git a/dGame/dComponents/PhantomPhysicsComponent.h b/dGame/dComponents/Physics/PhantomPhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/PhantomPhysicsComponent.h
rename to dGame/dComponents/Physics/PhantomPhysicsComponent.h
diff --git a/dGame/dComponents/PhysicsComponent.cpp b/dGame/dComponents/Physics/PhysicsComponent.cpp
similarity index 100%
rename from dGame/dComponents/PhysicsComponent.cpp
rename to dGame/dComponents/Physics/PhysicsComponent.cpp
diff --git a/dGame/dComponents/PhysicsComponent.h b/dGame/dComponents/Physics/PhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/PhysicsComponent.h
rename to dGame/dComponents/Physics/PhysicsComponent.h
diff --git a/dGame/dComponents/PhysicsSystemComponent.h b/dGame/dComponents/Physics/PhysicsSystemComponent.h
similarity index 100%
rename from dGame/dComponents/PhysicsSystemComponent.h
rename to dGame/dComponents/Physics/PhysicsSystemComponent.h
diff --git a/dGame/dComponents/ProjectilePhysicsComponent.h b/dGame/dComponents/Physics/ProjectilePhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/ProjectilePhysicsComponent.h
rename to dGame/dComponents/Physics/ProjectilePhysicsComponent.h
diff --git a/dGame/dComponents/RigidbodyPhantomPhysicsComponent.cpp b/dGame/dComponents/Physics/RigidbodyPhantomPhysicsComponent.cpp
similarity index 100%
rename from dGame/dComponents/RigidbodyPhantomPhysicsComponent.cpp
rename to dGame/dComponents/Physics/RigidbodyPhantomPhysicsComponent.cpp
diff --git a/dGame/dComponents/RigidbodyPhantomPhysicsComponent.h b/dGame/dComponents/Physics/RigidbodyPhantomPhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/RigidbodyPhantomPhysicsComponent.h
rename to dGame/dComponents/Physics/RigidbodyPhantomPhysicsComponent.h
diff --git a/dGame/dComponents/SimplePhysicsComponent.cpp b/dGame/dComponents/Physics/SimplePhysicsComponent.cpp
similarity index 100%
rename from dGame/dComponents/SimplePhysicsComponent.cpp
rename to dGame/dComponents/Physics/SimplePhysicsComponent.cpp
diff --git a/dGame/dComponents/SimplePhysicsComponent.h b/dGame/dComponents/Physics/SimplePhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/SimplePhysicsComponent.h
rename to dGame/dComponents/Physics/SimplePhysicsComponent.h
diff --git a/dGame/dComponents/VehiclePhysicsComponent.h b/dGame/dComponents/Physics/VehiclePhysicsComponent.h
similarity index 100%
rename from dGame/dComponents/VehiclePhysicsComponent.h
rename to dGame/dComponents/Physics/VehiclePhysicsComponent.h
diff --git a/dGame/dComponents/BuildBorderComponent.cpp b/dGame/dComponents/Property/BuildBorderComponent.cpp
similarity index 100%
rename from dGame/dComponents/BuildBorderComponent.cpp
rename to dGame/dComponents/Property/BuildBorderComponent.cpp
diff --git a/dGame/dComponents/BuildBorderComponent.h b/dGame/dComponents/Property/BuildBorderComponent.h
similarity index 100%
rename from dGame/dComponents/BuildBorderComponent.h
rename to dGame/dComponents/Property/BuildBorderComponent.h
diff --git a/dGame/dComponents/PropertyComponent.h b/dGame/dComponents/Property/PropertyComponent.h
similarity index 100%
rename from dGame/dComponents/PropertyComponent.h
rename to dGame/dComponents/Property/PropertyComponent.h
diff --git a/dGame/dComponents/PropertyEntranceComponent.cpp b/dGame/dComponents/Property/PropertyEntranceComponent.cpp
similarity index 100%
rename from dGame/dComponents/PropertyEntranceComponent.cpp
rename to dGame/dComponents/Property/PropertyEntranceComponent.cpp
diff --git a/dGame/dComponents/PropertyEntranceComponent.h b/dGame/dComponents/Property/PropertyEntranceComponent.h
similarity index 100%
rename from dGame/dComponents/PropertyEntranceComponent.h
rename to dGame/dComponents/Property/PropertyEntranceComponent.h
diff --git a/dGame/dComponents/PropertyManagementComponent.cpp b/dGame/dComponents/Property/PropertyManagementComponent.cpp
similarity index 100%
rename from dGame/dComponents/PropertyManagementComponent.cpp
rename to dGame/dComponents/Property/PropertyManagementComponent.cpp
diff --git a/dGame/dComponents/PropertyManagementComponent.h b/dGame/dComponents/Property/PropertyManagementComponent.h
similarity index 100%
rename from dGame/dComponents/PropertyManagementComponent.h
rename to dGame/dComponents/Property/PropertyManagementComponent.h
diff --git a/dGame/dComponents/PropertyPlaqueComponent.h b/dGame/dComponents/Property/PropertyPlaqueComponent.h
similarity index 100%
rename from dGame/dComponents/PropertyPlaqueComponent.h
rename to dGame/dComponents/Property/PropertyPlaqueComponent.h
diff --git a/dGame/dComponents/PropertyVendorComponent.cpp b/dGame/dComponents/Property/PropertyVendorComponent.cpp
similarity index 100%
rename from dGame/dComponents/PropertyVendorComponent.cpp
rename to dGame/dComponents/Property/PropertyVendorComponent.cpp
diff --git a/dGame/dComponents/PropertyVendorComponent.h b/dGame/dComponents/Property/PropertyVendorComponent.h
similarity index 100%
rename from dGame/dComponents/PropertyVendorComponent.h
rename to dGame/dComponents/Property/PropertyVendorComponent.h
diff --git a/dGame/dComponents/RacingSoundTriggerComponent.h b/dGame/dComponents/Sound/RacingSoundTriggerComponent.h
similarity index 100%
rename from dGame/dComponents/RacingSoundTriggerComponent.h
rename to dGame/dComponents/Sound/RacingSoundTriggerComponent.h
diff --git a/dGame/dComponents/SoundAmbient2DComponent.h b/dGame/dComponents/Sound/SoundAmbient2DComponent.h
similarity index 100%
rename from dGame/dComponents/SoundAmbient2DComponent.h
rename to dGame/dComponents/Sound/SoundAmbient2DComponent.h
diff --git a/dGame/dComponents/SoundAmbient3DComponent.h b/dGame/dComponents/Sound/SoundAmbient3DComponent.h
similarity index 100%
rename from dGame/dComponents/SoundAmbient3DComponent.h
rename to dGame/dComponents/Sound/SoundAmbient3DComponent.h
diff --git a/dGame/dComponents/SoundRepeaterComponent.h b/dGame/dComponents/Sound/SoundRepeaterComponent.h
similarity index 100%
rename from dGame/dComponents/SoundRepeaterComponent.h
rename to dGame/dComponents/Sound/SoundRepeaterComponent.h
diff --git a/dGame/dComponents/SoundTriggerComponent.cpp b/dGame/dComponents/Sound/SoundTriggerComponent.cpp
similarity index 100%
rename from dGame/dComponents/SoundTriggerComponent.cpp
rename to dGame/dComponents/Sound/SoundTriggerComponent.cpp
diff --git a/dGame/dComponents/SoundTriggerComponent.h b/dGame/dComponents/Sound/SoundTriggerComponent.h
similarity index 100%
rename from dGame/dComponents/SoundTriggerComponent.h
rename to dGame/dComponents/Sound/SoundTriggerComponent.h
diff --git a/dGame/dComponents/AchievementCacheKey.h b/dGame/dComponents/Vendor/AchievementCacheKey.h
similarity index 100%
rename from dGame/dComponents/AchievementCacheKey.h
rename to dGame/dComponents/Vendor/AchievementCacheKey.h
diff --git a/dGame/dComponents/AchievementVendorComponent.cpp b/dGame/dComponents/Vendor/AchievementVendorComponent.cpp
similarity index 100%
rename from dGame/dComponents/AchievementVendorComponent.cpp
rename to dGame/dComponents/Vendor/AchievementVendorComponent.cpp
diff --git a/dGame/dComponents/AchievementVendorComponent.h b/dGame/dComponents/Vendor/AchievementVendorComponent.h
similarity index 100%
rename from dGame/dComponents/AchievementVendorComponent.h
rename to dGame/dComponents/Vendor/AchievementVendorComponent.h
diff --git a/dGame/dComponents/DonationVendorComponent.cpp b/dGame/dComponents/Vendor/DonationVendorComponent.cpp
similarity index 100%
rename from dGame/dComponents/DonationVendorComponent.cpp
rename to dGame/dComponents/Vendor/DonationVendorComponent.cpp
diff --git a/dGame/dComponents/DonationVendorComponent.h b/dGame/dComponents/Vendor/DonationVendorComponent.h
similarity index 100%
rename from dGame/dComponents/DonationVendorComponent.h
rename to dGame/dComponents/Vendor/DonationVendorComponent.h
diff --git a/dGame/dComponents/VendorComponent.cpp b/dGame/dComponents/Vendor/VendorComponent.cpp
similarity index 100%
rename from dGame/dComponents/VendorComponent.cpp
rename to dGame/dComponents/Vendor/VendorComponent.cpp
diff --git a/dGame/dComponents/VendorComponent.h b/dGame/dComponents/Vendor/VendorComponent.h
similarity index 100%
rename from dGame/dComponents/VendorComponent.h
rename to dGame/dComponents/Vendor/VendorComponent.h
diff --git a/dGame/dGameMessages/CMakeLists.txt b/dGame/dGameMessages/CMakeLists.txt
index c8968f83f..495da5200 100644
--- a/dGame/dGameMessages/CMakeLists.txt
+++ b/dGame/dGameMessages/CMakeLists.txt
@@ -27,7 +27,7 @@ target_link_libraries(dGameMessages
 )
 target_include_directories(dGameMessages PUBLIC "."
 	PRIVATE
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct MissionComponent.h
+	${DLU_COMPONENT_INCLUDE_DIRS} # direct MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # direct SlashCommandHandler.h
 	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # direct ControlBehaviors.h
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
diff --git a/dGame/dInventory/CMakeLists.txt b/dGame/dInventory/CMakeLists.txt
index bd27b47af..adceafb82 100644
--- a/dGame/dInventory/CMakeLists.txt
+++ b/dGame/dInventory/CMakeLists.txt
@@ -20,7 +20,7 @@ target_include_directories(dInventory PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables" # via EconomyLedger.h
 
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # direct
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct InventoryComponent.h
+	${DLU_COMPONENT_INCLUDE_DIRS} # direct InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
diff --git a/dGame/dMission/CMakeLists.txt b/dGame/dMission/CMakeLists.txt
index 51f74c37d..c3572b7de 100644
--- a/dGame/dMission/CMakeLists.txt
+++ b/dGame/dMission/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(dMission OBJECT ${DGAME_DMISSION_SOURCES})
 target_link_libraries(dMission PUBLIC dDatabase)
 target_include_directories(dMission PUBLIC "."
 	PRIVATE
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
+	${DLU_COMPONENT_INCLUDE_DIRS}
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via CharacterComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # via CharacterComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via LevelProgressionComponent.h
diff --git a/dGame/dPropertyBehaviors/CMakeLists.txt b/dGame/dPropertyBehaviors/CMakeLists.txt
index c33c5860b..8ef8b3802 100644
--- a/dGame/dPropertyBehaviors/CMakeLists.txt
+++ b/dGame/dPropertyBehaviors/CMakeLists.txt
@@ -19,7 +19,7 @@ target_include_directories(dPropertyBehaviors PUBLIC "." "ControlBehaviorMessage
 	"${PROJECT_SOURCE_DIR}/dCommon/dClient" # ControlBehaviors.cpp uses AssetManager
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # ObjectIdManager.h
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # GameMessages.h
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # ModelComponent.h
+	${DLU_COMPONENT_INCLUDE_DIRS} # ModelComponent.h
 	"${PROJECT_SOURCE_DIR}/dChatFilter" # dChatFilter.h
 )
 target_precompile_headers(dPropertyBehaviors REUSE_FROM dGameBase)
diff --git a/dGame/dUtilities/CMakeLists.txt b/dGame/dUtilities/CMakeLists.txt
index c505c7b24..ef6ed86e6 100644
--- a/dGame/dUtilities/CMakeLists.txt
+++ b/dGame/dUtilities/CMakeLists.txt
@@ -35,7 +35,7 @@ add_library(dUtilities OBJECT ${DGAME_DUTILITIES_SOURCES})
 target_precompile_headers(dUtilities REUSE_FROM dGameBase)
 target_include_directories(dUtilities PUBLIC "." "SlashCommands"
 	PRIVATE
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
+	${DLU_COMPONENT_INCLUDE_DIRS}
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # transitive via PossessableComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages"
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # transitive via InventoryComponent.h
diff --git a/dNet/CMakeLists.txt b/dNet/CMakeLists.txt
index 179c940a2..303025244 100644
--- a/dNet/CMakeLists.txt
+++ b/dNet/CMakeLists.txt
@@ -28,7 +28,7 @@ target_include_directories(dNet PRIVATE
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
 
 	"${PROJECT_SOURCE_DIR}/dGame" # UserManager.h
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
+	${DLU_COMPONENT_INCLUDE_DIRS}
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # GameMessages.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via PossessableComponent.h
diff --git a/dScripts/CMakeLists.txt b/dScripts/CMakeLists.txt
index 29f04be32..bb2947cca 100644
--- a/dScripts/CMakeLists.txt
+++ b/dScripts/CMakeLists.txt
@@ -23,7 +23,7 @@ target_precompile_headers(dScriptsBase PRIVATE ${HEADERS_DGAME})
 include_directories(
 	"${PROJECT_SOURCE_DIR}/dScripts"
 	"${PROJECT_SOURCE_DIR}/dGame"
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # e.g. ScriptedActivityComponent.h
+	${DLU_COMPONENT_INCLUDE_DIRS} # e.g. ScriptedActivityComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # e.g. direct ActivityManager
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # e.g. direct ActivityManager
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager.h
diff --git a/dZoneManager/CMakeLists.txt b/dZoneManager/CMakeLists.txt
index 544a01d9e..40e6ebecf 100644
--- a/dZoneManager/CMakeLists.txt
+++ b/dZoneManager/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(dZoneManager PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame" # Entity.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # EntityInfo.h
 	PRIVATE
-	"${PROJECT_SOURCE_DIR}/dGame/dComponents" #InventoryComponent.h
+	${DLU_COMPONENT_INCLUDE_DIRS} #InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" #InventoryComponent.h (transitive)
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" #BehaviorSlot.h
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" #GameMessages.h