diff --git a/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp
index 4583cd02b..e096881e4 100644
--- a/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp
+++ b/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp
@@ -3,140 +3,9 @@
 #include <array>
 
 #include "ITweak.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/CPlayerState.hpp"
 
 namespace DataSpec {
 
-struct ITweakGunRes : ITweak {
-  using ResId = metaforce::CAssetId;
-  using EBeamId = metaforce::CPlayerState::EBeamId;
-
-  ResId x4_gunMotion;
-  ResId x8_grappleArm;
-  ResId xc_rightHand;
-
-  ResId x10_powerBeam;
-  ResId x14_iceBeam;
-  ResId x18_waveBeam;
-  ResId x1c_plasmaBeam;
-  ResId x20_phazonBeam;
-
-  ResId x24_holoTransition;
-
-  ResId x28_bombSet;
-  ResId x2c_bombExplode;
-  ResId x30_powerBombExplode;
-
-  /* Power, Ice, Wave, Plasma, Phazon / Beam, Ball */
-  using WeaponPair = std::array<ResId, 2>;
-  std::array<WeaponPair, 5> x34_weapons;
-  std::array<ResId, 5> x84_muzzle;
-  std::array<ResId, 5> x94_charge;
-  std::array<ResId, 5> xa4_auxMuzzle;
-
-  ResId xb4_grappleSegment;
-  ResId xb8_grappleClaw;
-  ResId xbc_grappleHit;
-  ResId xc0_grappleMuzzle;
-  ResId xc4_grappleSwoosh;
-
-  ResId GetBeamModel(EBeamId beam) const {
-    auto b = int(beam);
-    if (b < 0 || b > 4)
-      b = 0;
-    switch (EBeamId(b)) {
-    default:
-    case EBeamId::Power:
-      return x10_powerBeam;
-    case EBeamId::Ice:
-      return x14_iceBeam;
-    case EBeamId::Wave:
-      return x18_waveBeam;
-    case EBeamId::Plasma:
-      return x1c_plasmaBeam;
-    case EBeamId::Phazon:
-      return x20_phazonBeam;
-    }
-  }
-
-  const WeaponPair& GetWeaponPair(EBeamId beam) const {
-    const auto b = int(beam);
-    if (b < 0 || b > 4) {
-      return x34_weapons[0];
-    }
-    return x34_weapons[b];
-  }
-
-  void ResolveResources(const metaforce::IFactory& factory) {
-    x4_gunMotion = factory.GetResourceIdByName(GetGunMotion())->id;
-    x8_grappleArm = factory.GetResourceIdByName(GetGrappleArm())->id;
-    xc_rightHand = factory.GetResourceIdByName(GetRightHand())->id;
-
-    x10_powerBeam = factory.GetResourceIdByName(GetPowerBeam())->id;
-    x14_iceBeam = factory.GetResourceIdByName(GetIceBeam())->id;
-    x18_waveBeam = factory.GetResourceIdByName(GetWaveBeam())->id;
-    x1c_plasmaBeam = factory.GetResourceIdByName(GetPlasmaBeam())->id;
-    x20_phazonBeam = factory.GetResourceIdByName(GetPhazonBeam())->id;
-
-    x24_holoTransition = factory.GetResourceIdByName(GetHoloTransition())->id;
-
-    x28_bombSet = factory.GetResourceIdByName(GetBombSet())->id;
-    x2c_bombExplode = factory.GetResourceIdByName(GetBombExplode())->id;
-    x30_powerBombExplode = factory.GetResourceIdByName(GetPowerBombExplode())->id;
-
-    for (size_t i = 0; i < x34_weapons.size(); ++i) {
-      for (size_t j = 0; j < x34_weapons[i].size(); ++j) {
-        x34_weapons[i][j] = factory.GetResourceIdByName(GetWeapon(i, j != 0))->id;
-      }
-    }
-
-    for (size_t i = 0; i < x84_muzzle.size(); ++i) {
-      x84_muzzle[i] = factory.GetResourceIdByName(GetMuzzleParticle(i))->id;
-    }
-
-    for (size_t i = 0; i < x94_charge.size(); ++i) {
-      x94_charge[i] = factory.GetResourceIdByName(GetChargeParticle(i))->id;
-    }
-
-    for (size_t i = 0; i < xa4_auxMuzzle.size(); ++i) {
-      xa4_auxMuzzle[i] = factory.GetResourceIdByName(GetAuxMuzzleParticle(i))->id;
-    }
-
-    xb4_grappleSegment = factory.GetResourceIdByName(GetGrappleSegmentParticle())->id;
-    xb8_grappleClaw = factory.GetResourceIdByName(GetGrappleClawParticle())->id;
-    xbc_grappleHit = factory.GetResourceIdByName(GetGrappleHitParticle())->id;
-    xc0_grappleMuzzle = factory.GetResourceIdByName(GetGrappleMuzzleParticle())->id;
-    xc4_grappleSwoosh = factory.GetResourceIdByName(GetGrappleSwooshParticle())->id;
-  }
-
-protected:
-  virtual const std::string& GetGunMotion() const = 0;
-  virtual const std::string& GetGrappleArm() const = 0;
-  virtual const std::string& GetRightHand() const = 0;
-
-  virtual const std::string& GetPowerBeam() const = 0;
-  virtual const std::string& GetIceBeam() const = 0;
-  virtual const std::string& GetWaveBeam() const = 0;
-  virtual const std::string& GetPlasmaBeam() const = 0;
-  virtual const std::string& GetPhazonBeam() const = 0;
-
-  virtual const std::string& GetHoloTransition() const = 0;
-
-  virtual const std::string& GetBombSet() const = 0;
-  virtual const std::string& GetBombExplode() const = 0;
-  virtual const std::string& GetPowerBombExplode() const = 0;
-
-  virtual const std::string& GetWeapon(size_t idx, bool ball) const = 0;
-  virtual const std::string& GetMuzzleParticle(size_t idx) const = 0;
-  virtual const std::string& GetChargeParticle(size_t idx) const = 0;
-  virtual const std::string& GetAuxMuzzleParticle(size_t idx) const = 0;
-
-  virtual const std::string& GetGrappleSegmentParticle() const = 0;
-  virtual const std::string& GetGrappleClawParticle() const = 0;
-  virtual const std::string& GetGrappleHitParticle() const = 0;
-  virtual const std::string& GetGrappleMuzzleParticle() const = 0;
-  virtual const std::string& GetGrappleSwooshParticle() const = 0;
-};
+struct ITweakGunRes : ITweak {};
 
 } // namespace DataSpec
diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp
index 6e0b689d3..a6bf96fa0 100644
--- a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp
+++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp
@@ -1,176 +1,9 @@
 #pragma once
 
-#include <array>
-
 #include "ITweak.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/CPlayerState.hpp"
 
 namespace DataSpec {
 
-struct ITweakPlayerRes : ITweak {
-  using ResId = metaforce::CAssetId;
-  using EBeamId = metaforce::CPlayerState::EBeamId;
-
-  ResId x4_saveStationIcon;
-  ResId x8_missileStationIcon;
-  ResId xc_elevatorIcon;
-
-  ResId x10_minesBreakFirstTopIcon;
-  ResId x14_minesBreakFirstBottomIcon;
-  ResId x18_minesBreakSecondTopIcon;
-  ResId x1c_minesBreakSecondBottomIcon;
-
-  ResId rs5_mapArrowUp;
-  ResId rs5_mapArrowDown;
-
-  /* N, U, UL, L, DL, D, DR, R, UR */
-  std::array<ResId, 9> x24_lStick;
-  std::array<ResId, 9> x4c_cStick;
-
-  /* Out, In */
-  std::array<ResId, 2> x74_lTrigger;
-  std::array<ResId, 2> x80_rTrigger;
-  std::array<ResId, 2> x8c_startButton;
-  std::array<ResId, 2> x98_aButton;
-  std::array<ResId, 2> xa4_bButton;
-  std::array<ResId, 2> xb0_xButton;
-  std::array<ResId, 2> xbc_yButton;
-
-  ResId xc4_ballTransitionsANCS;
-
-  /* Power, Ice, Wave, Plasma, Phazon */
-  std::array<ResId, 5> xc8_ballTransitions;
-  std::array<ResId, 5> xdc_cineGun;
-
-  float xf0_cinematicMoveOutofIntoPlayerDistance;
-
-  ResId GetBeamBallTransitionModel(EBeamId beam) const {
-    auto b = size_t(beam);
-    if (b >= xc8_ballTransitions.size()) {
-      b = 0;
-    }
-    switch (EBeamId(b)) {
-    case EBeamId::Power:
-    default:
-      return xc8_ballTransitions[0];
-    case EBeamId::Ice:
-      return xc8_ballTransitions[1];
-    case EBeamId::Wave:
-      return xc8_ballTransitions[2];
-    case EBeamId::Plasma:
-      return xc8_ballTransitions[3];
-    case EBeamId::Phazon:
-      return xc8_ballTransitions[4];
-    }
-  }
-
-  ResId GetBeamCineModel(EBeamId beam) const {
-    auto b = size_t(beam);
-    if (b >= xdc_cineGun.size()) {
-      b = 0;
-    }
-    switch (EBeamId(b)) {
-    case EBeamId::Power:
-    default:
-      return xdc_cineGun[0];
-    case EBeamId::Ice:
-      return xdc_cineGun[1];
-    case EBeamId::Wave:
-      return xdc_cineGun[2];
-    case EBeamId::Plasma:
-      return xdc_cineGun[3];
-    case EBeamId::Phazon:
-      return xdc_cineGun[4];
-    }
-  }
-
-  void ResolveResources(const metaforce::IFactory& factory) {
-    x4_saveStationIcon = factory.GetResourceIdByName(_GetSaveStationIcon())->id;
-    x8_missileStationIcon = factory.GetResourceIdByName(_GetMissileStationIcon())->id;
-    xc_elevatorIcon = factory.GetResourceIdByName(_GetElevatorIcon())->id;
-
-    x10_minesBreakFirstTopIcon = factory.GetResourceIdByName(_GetMinesBreakFirstTopIcon())->id;
-    x14_minesBreakFirstBottomIcon = factory.GetResourceIdByName(_GetMinesBreakFirstBottomIcon())->id;
-    x18_minesBreakSecondTopIcon = factory.GetResourceIdByName(_GetMinesBreakSecondTopIcon())->id;
-    x1c_minesBreakSecondBottomIcon = factory.GetResourceIdByName(_GetMinesBreakSecondBottomIcon())->id;
-
-    for (size_t i = 0; i < x24_lStick.size(); ++i) {
-      x24_lStick[i] = factory.GetResourceIdByName(_GetLStick(i))->id;
-    }
-
-    for (size_t i = 0; i < x4c_cStick.size(); ++i) {
-      x4c_cStick[i] = factory.GetResourceIdByName(_GetCStick(i))->id;
-    }
-
-    for (size_t i = 0; i < x74_lTrigger.size(); ++i) {
-      x74_lTrigger[i] = factory.GetResourceIdByName(_GetLTrigger(i))->id;
-    }
-
-    for (size_t i = 0; i < x80_rTrigger.size(); ++i) {
-      x80_rTrigger[i] = factory.GetResourceIdByName(_GetRTrigger(i))->id;
-    }
-
-    for (size_t i = 0; i < x8c_startButton.size(); ++i) {
-      x8c_startButton[i] = factory.GetResourceIdByName(_GetStartButton(i))->id;
-    }
-
-    for (size_t i = 0; i < x98_aButton.size(); ++i) {
-      x98_aButton[i] = factory.GetResourceIdByName(_GetAButton(i))->id;
-    }
-
-    for (size_t i = 0; i < xa4_bButton.size(); ++i) {
-      xa4_bButton[i] = factory.GetResourceIdByName(_GetBButton(i))->id;
-    }
-
-    for (size_t i = 0; i < xb0_xButton.size(); ++i) {
-      xb0_xButton[i] = factory.GetResourceIdByName(_GetXButton(i))->id;
-    }
-
-    for (size_t i = 0; i < xbc_yButton.size(); ++i) {
-      xbc_yButton[i] = factory.GetResourceIdByName(_GetYButton(i))->id;
-    }
-
-    xc4_ballTransitionsANCS = factory.GetResourceIdByName(_GetBallTransitionsANCS())->id;
-
-    for (size_t i = 0; i < xc8_ballTransitions.size(); ++i) {
-      xc8_ballTransitions[i] = factory.GetResourceIdByName(_GetBallTransitionBeamRes(i))->id;
-    }
-
-    for (size_t i = 0; i < xdc_cineGun.size(); ++i) {
-      xdc_cineGun[i] = factory.GetResourceIdByName(_GetBeamCineModel(i))->id;
-    }
-
-    xf0_cinematicMoveOutofIntoPlayerDistance = _GetCinematicMoveOutofIntoPlayerDistance();
-  }
-
-protected:
-  virtual std::string_view _GetSaveStationIcon() const = 0;
-  virtual std::string_view _GetMissileStationIcon() const = 0;
-  virtual std::string_view _GetElevatorIcon() const = 0;
-
-  virtual std::string_view _GetMinesBreakFirstTopIcon() const = 0;
-  virtual std::string_view _GetMinesBreakFirstBottomIcon() const = 0;
-  virtual std::string_view _GetMinesBreakSecondTopIcon() const = 0;
-  virtual std::string_view _GetMinesBreakSecondBottomIcon() const = 0;
-
-  virtual std::string_view _GetLStick(size_t idx) const = 0;
-  virtual std::string_view _GetCStick(size_t idx) const = 0;
-
-  virtual std::string_view _GetLTrigger(size_t idx) const = 0;
-  virtual std::string_view _GetRTrigger(size_t idx) const = 0;
-  virtual std::string_view _GetStartButton(size_t idx) const = 0;
-  virtual std::string_view _GetAButton(size_t idx) const = 0;
-  virtual std::string_view _GetBButton(size_t idx) const = 0;
-  virtual std::string_view _GetXButton(size_t idx) const = 0;
-  virtual std::string_view _GetYButton(size_t idx) const = 0;
-
-  virtual std::string_view _GetBallTransitionsANCS() const = 0;
-
-  virtual std::string_view _GetBallTransitionBeamRes(size_t idx) const = 0;
-  virtual std::string_view _GetBeamCineModel(size_t idx) const = 0;
-
-  virtual float _GetCinematicMoveOutofIntoPlayerDistance() const = 0;
-};
+struct ITweakPlayerRes : ITweak {};
 
 } // namespace DataSpec
diff --git a/Runtime/Audio/CAudioGroupSet.hpp b/Runtime/Audio/CAudioGroupSet.hpp
index 444b547c7..7a2f03904 100644
--- a/Runtime/Audio/CAudioGroupSet.hpp
+++ b/Runtime/Audio/CAudioGroupSet.hpp
@@ -3,10 +3,10 @@
 #include <memory>
 #include <string>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 #include <amuse/AudioGroupData.hpp>
diff --git a/Runtime/Audio/CAudioSys.cpp b/Runtime/Audio/CAudioSys.cpp
index 49298644c..2ba6cae2b 100644
--- a/Runtime/Audio/CAudioSys.cpp
+++ b/Runtime/Audio/CAudioSys.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Audio/CAudioGroupSet.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Audio/CSfxManager.cpp b/Runtime/Audio/CSfxManager.cpp
index f3d3f5d7c..785b5f052 100644
--- a/Runtime/Audio/CSfxManager.cpp
+++ b/Runtime/Audio/CSfxManager.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Streams/CInputStream.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 
 namespace metaforce {
 static TLockedToken<std::vector<u16>> mpSfxTranslationTableTok;
diff --git a/Runtime/AutoMapper/CAutoMapper.cpp b/Runtime/AutoMapper/CAutoMapper.cpp
index 480a61454..24d87465c 100644
--- a/Runtime/AutoMapper/CAutoMapper.cpp
+++ b/Runtime/AutoMapper/CAutoMapper.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/AutoMapper/CAutoMapper.hpp"
 
 #include "Runtime/CInGameTweakManagerBase.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/AutoMapper/CMapArea.hpp"
 #include "Runtime/AutoMapper/CMapUniverse.hpp"
diff --git a/Runtime/AutoMapper/CMapArea.hpp b/Runtime/AutoMapper/CMapArea.hpp
index 703b2da15..2b72b644d 100644
--- a/Runtime/AutoMapper/CMapArea.hpp
+++ b/Runtime/AutoMapper/CMapArea.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Runtime/AutoMapper/CMappableObject.hpp"
-#include "Runtime/CResFactory.hpp"
+#include "Runtime/Factory/CResFactory.hpp"
 #include "Runtime/Graphics/CLineRenderer.hpp"
 #include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
 #include "Runtime/RetroTypes.hpp"
diff --git a/Runtime/AutoMapper/CMapUniverse.cpp b/Runtime/AutoMapper/CMapUniverse.cpp
index 329738b06..d6d890810 100644
--- a/Runtime/AutoMapper/CMapUniverse.cpp
+++ b/Runtime/AutoMapper/CMapUniverse.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/AutoMapper/CMapUniverse.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CGameState.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
diff --git a/Runtime/AutoMapper/CMapUniverse.hpp b/Runtime/AutoMapper/CMapUniverse.hpp
index 27cc58fff..d991368d0 100644
--- a/Runtime/AutoMapper/CMapUniverse.hpp
+++ b/Runtime/AutoMapper/CMapUniverse.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/AutoMapper/CMapArea.hpp"
 
diff --git a/Runtime/AutoMapper/CMapWorld.cpp b/Runtime/AutoMapper/CMapWorld.cpp
index 612e15fd0..6e8090a7f 100644
--- a/Runtime/AutoMapper/CMapWorld.cpp
+++ b/Runtime/AutoMapper/CMapWorld.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/AutoMapper/CMapWorldInfo.hpp"
diff --git a/Runtime/AutoMapper/CMappableObject.cpp b/Runtime/AutoMapper/CMappableObject.cpp
index f4edeafd9..9bc4e2279 100644
--- a/Runtime/AutoMapper/CMappableObject.cpp
+++ b/Runtime/AutoMapper/CMappableObject.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/AutoMapper/CMappableObject.hpp"
 
 #include "Runtime/AutoMapper/CMapWorldInfo.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
diff --git a/Runtime/CDependencyGroup.hpp b/Runtime/CDependencyGroup.hpp
index 40f5bb1f2..ff9ced217 100644
--- a/Runtime/CDependencyGroup.hpp
+++ b/Runtime/CDependencyGroup.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 
 namespace metaforce {
 class CDependencyGroup {
diff --git a/Runtime/CGameHintInfo.hpp b/Runtime/CGameHintInfo.hpp
index 96b04e070..7c3790c24 100644
--- a/Runtime/CGameHintInfo.hpp
+++ b/Runtime/CGameHintInfo.hpp
@@ -3,7 +3,7 @@
 #include <string_view>
 #include <vector>
 
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/CGameOptions.cpp b/Runtime/CGameOptions.cpp
index 3f3db333d..1de0984c4 100644
--- a/Runtime/CGameOptions.cpp
+++ b/Runtime/CGameOptions.cpp
@@ -6,7 +6,7 @@
 #include "Runtime/CGameState.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
 #include "Runtime/CWorldSaveGameInfo.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
diff --git a/Runtime/CGameState.cpp b/Runtime/CGameState.cpp
index 2da53fce2..a81674489 100644
--- a/Runtime/CGameState.cpp
+++ b/Runtime/CGameState.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/CMemoryCardSys.hpp"
 #include "Runtime/CWorldSaveGameInfo.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/MP1/MP1.hpp"
diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt
index de77316bc..59086c2e1 100644
--- a/Runtime/CMakeLists.txt
+++ b/Runtime/CMakeLists.txt
@@ -101,28 +101,28 @@ set(RUNTIME_SOURCES_B
         CScriptMailbox.hpp CScriptMailbox.cpp
         CPlayerState.hpp CPlayerState.cpp
         CRandom16.hpp CRandom16.cpp
-        CResFactory.hpp CResFactory.cpp
-        CResLoader.hpp CResLoader.cpp
+        Factory/CResFactory.hpp Factory/CResFactory.cpp
+        Factory/CResLoader.hpp Factory/CResLoader.cpp
         CDvdRequest.hpp
         CDvdFile.hpp CDvdFile.cpp
-        IObjectStore.hpp
-        CSimplePool.hpp CSimplePool.cpp
+        Factory/IObjectStore.hpp
+        Factory/CSimplePool.hpp Factory/CSimplePool.cpp
         CGameOptions.hpp CGameOptions.cpp
         CGameOptionsTouchBar.hpp CGameOptionsTouchBar.cpp
         CStaticInterference.hpp CStaticInterference.cpp
         CCRC32.hpp CCRC32.cpp
-        IFactory.hpp
-        IObjFactory.hpp
+        Factory/IFactory.hpp
+        Factory/IObjFactory.hpp
         CObjectList.hpp CObjectList.cpp
         GameObjectLists.hpp GameObjectLists.cpp
         CSortedLists.hpp CSortedLists.cpp
         CArchitectureMessage.hpp
         CArchitectureQueue.hpp
-        IObj.hpp
-        IVParamObj.hpp
+        Factory/IObj.hpp
+        Factory/IVParamObj.hpp
         CTimeProvider.hpp CTimeProvider.cpp
         CToken.hpp CToken.cpp
-        CFactoryMgr.hpp CFactoryMgr.cpp
+        Factory/CFactoryMgr.hpp Factory/CFactoryMgr.cpp
         CPakFile.hpp CPakFile.cpp
         CStringExtras.hpp CStringExtras.cpp
         CMainFlowBase.hpp CMainFlowBase.cpp
diff --git a/Runtime/CMemoryCardSys.cpp b/Runtime/CMemoryCardSys.cpp
index 6b29b12cf..971522c1a 100644
--- a/Runtime/CMemoryCardSys.cpp
+++ b/Runtime/CMemoryCardSys.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/CCRC32.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"
diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp
index 01119b1d7..b3b76fac7 100644
--- a/Runtime/CPakFile.hpp
+++ b/Runtime/CPakFile.hpp
@@ -6,7 +6,7 @@
 
 #include "Runtime/CDvdFile.hpp"
 #include "Runtime/CDvdRequest.hpp"
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CStringExtras.hpp"
 #include "Runtime/RetroTypes.hpp"
 
diff --git a/Runtime/CScannableObjectInfo.hpp b/Runtime/CScannableObjectInfo.hpp
index f844ff01e..de97eaf17 100644
--- a/Runtime/CScannableObjectInfo.hpp
+++ b/Runtime/CScannableObjectInfo.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/rstl.hpp"
 
diff --git a/Runtime/CToken.hpp b/Runtime/CToken.hpp
index e0dca4519..6ae4324e3 100644
--- a/Runtime/CToken.hpp
+++ b/Runtime/CToken.hpp
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObj.hpp"
-#include "Runtime/IObjectStore.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObj.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/CWorldSaveGameInfo.hpp b/Runtime/CWorldSaveGameInfo.hpp
index 91f393da8..441997723 100644
--- a/Runtime/CWorldSaveGameInfo.hpp
+++ b/Runtime/CWorldSaveGameInfo.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Camera/CCameraFilter.cpp b/Runtime/Camera/CCameraFilter.cpp
index 96ca61cc4..4525eaad4 100644
--- a/Runtime/Camera/CCameraFilter.cpp
+++ b/Runtime/Camera/CCameraFilter.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Camera/CCameraFilter.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
diff --git a/Runtime/Character/CAllFormatsAnimSource.cpp b/Runtime/Character/CAllFormatsAnimSource.cpp
index e3c01f9cc..fe06de029 100644
--- a/Runtime/Character/CAllFormatsAnimSource.cpp
+++ b/Runtime/Character/CAllFormatsAnimSource.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Character/CAllFormatsAnimSource.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CAnimSourceReader.hpp"
 #include "Runtime/Character/CFBStreamedAnimReader.hpp"
 
diff --git a/Runtime/Character/CAllFormatsAnimSource.hpp b/Runtime/Character/CAllFormatsAnimSource.hpp
index 1388c2583..1d22a86f6 100644
--- a/Runtime/Character/CAllFormatsAnimSource.hpp
+++ b/Runtime/Character/CAllFormatsAnimSource.hpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/Character/CAnimSource.hpp"
 #include "Runtime/Character/CFBStreamedCompression.hpp"
diff --git a/Runtime/Character/CAnimCharacterSet.hpp b/Runtime/Character/CAnimCharacterSet.hpp
index 24795ed91..d0a2bbb93 100644
--- a/Runtime/Character/CAnimCharacterSet.hpp
+++ b/Runtime/Character/CAnimCharacterSet.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Character/CAnimationSet.hpp"
 #include "Runtime/Character/CCharacterSet.hpp"
 
diff --git a/Runtime/Character/CAnimPOIData.hpp b/Runtime/Character/CAnimPOIData.hpp
index d51acde57..3f82df827 100644
--- a/Runtime/Character/CAnimPOIData.hpp
+++ b/Runtime/Character/CAnimPOIData.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/GCNTypes.hpp"
 #include "Runtime/Character/CBoolPOINode.hpp"
 #include "Runtime/Character/CInt32POINode.hpp"
diff --git a/Runtime/Character/CAssetFactory.hpp b/Runtime/Character/CAssetFactory.hpp
index 7364d6f6d..668220ccd 100644
--- a/Runtime/Character/CAssetFactory.hpp
+++ b/Runtime/Character/CAssetFactory.hpp
@@ -3,10 +3,10 @@
 #include <functional>
 #include <memory>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObj.hpp"
 
 namespace metaforce {
 class CCharacterFactory;
diff --git a/Runtime/Character/CCharLayoutInfo.hpp b/Runtime/Character/CCharLayoutInfo.hpp
index 70641e8b8..af03c17d6 100644
--- a/Runtime/Character/CCharLayoutInfo.hpp
+++ b/Runtime/Character/CCharLayoutInfo.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/Character/CSegId.hpp"
 #include "Runtime/Character/CSegIdList.hpp"
diff --git a/Runtime/Character/CCharacterFactory.cpp b/Runtime/Character/CCharacterFactory.cpp
index 5801c3248..adad26d7f 100644
--- a/Runtime/Character/CCharacterFactory.cpp
+++ b/Runtime/Character/CCharacterFactory.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Character/CCharacterFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CAdditiveAnimPlayback.hpp"
 #include "Runtime/Character/CAnimCharacterSet.hpp"
diff --git a/Runtime/Character/CCharacterFactory.hpp b/Runtime/Character/CCharacterFactory.hpp
index a082c9183..a85e9b0c7 100644
--- a/Runtime/Character/CCharacterFactory.hpp
+++ b/Runtime/Character/CCharacterFactory.hpp
@@ -5,10 +5,10 @@
 #include <utility>
 #include <vector>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObjFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObjFactory.hpp"
 #include "Runtime/Character/CAnimationSet.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Character/CMetaAnimPlay.cpp b/Runtime/Character/CMetaAnimPlay.cpp
index eca98a950..b14356173 100644
--- a/Runtime/Character/CMetaAnimPlay.cpp
+++ b/Runtime/Character/CMetaAnimPlay.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Character/CMetaAnimPlay.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CAllFormatsAnimSource.hpp"
 #include "Runtime/Character/CAnimSysContext.hpp"
 #include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp"
diff --git a/Runtime/Character/CParticleDatabase.cpp b/Runtime/Character/CParticleDatabase.cpp
index 8e3d02146..505ff49da 100644
--- a/Runtime/Character/CParticleDatabase.cpp
+++ b/Runtime/Character/CParticleDatabase.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Character/CParticleDatabase.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CCharLayoutInfo.hpp"
 #include "Runtime/Character/CPoseAsTransforms.hpp"
diff --git a/Runtime/Character/CSkinRules.hpp b/Runtime/Character/CSkinRules.hpp
index a17261147..fac502d55 100644
--- a/Runtime/Character/CSkinRules.hpp
+++ b/Runtime/Character/CSkinRules.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Character/CSkinBank.hpp"
 #include "Runtime/RetroTypes.hpp"
 
diff --git a/Runtime/Collision/CCollidableOBBTreeGroup.hpp b/Runtime/Collision/CCollidableOBBTreeGroup.hpp
index 8b445d69f..bc156a706 100644
--- a/Runtime/Collision/CCollidableOBBTreeGroup.hpp
+++ b/Runtime/Collision/CCollidableOBBTreeGroup.hpp
@@ -3,7 +3,7 @@
 #include <memory>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/Collision/COBBTree.hpp"
 #include "Runtime/Collision/CCollisionPrimitive.hpp"
diff --git a/Runtime/Collision/CCollisionResponseData.cpp b/Runtime/Collision/CCollisionResponseData.cpp
index cff473279..5fba6482f 100644
--- a/Runtime/Collision/CCollisionResponseData.cpp
+++ b/Runtime/Collision/CCollisionResponseData.cpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CDecalDescription.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"
diff --git a/Runtime/Collision/CCollisionResponseData.hpp b/Runtime/Collision/CCollisionResponseData.hpp
index 4901e0c69..8be32970b 100644
--- a/Runtime/Collision/CCollisionResponseData.hpp
+++ b/Runtime/Collision/CCollisionResponseData.hpp
@@ -3,10 +3,10 @@
 #include <optional>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/Collision/CMaterialList.hpp"
 #include "Runtime/Particle/CDecalDescription.hpp"
diff --git a/Runtime/CFactoryMgr.cpp b/Runtime/Factory/CFactoryMgr.cpp
similarity index 98%
rename from Runtime/CFactoryMgr.cpp
rename to Runtime/Factory/CFactoryMgr.cpp
index c140a039c..945be4ba8 100644
--- a/Runtime/CFactoryMgr.cpp
+++ b/Runtime/Factory/CFactoryMgr.cpp
@@ -1,4 +1,4 @@
-#include "Runtime/CFactoryMgr.hpp"
+#include "CFactoryMgr.hpp"
 
 #include <algorithm>
 #include <array>
@@ -7,7 +7,7 @@
 #include "optick.h"
 
 #include "Runtime/CStopwatch.hpp"
-#include "Runtime/IObj.hpp"
+#include "IObj.hpp"
 
 namespace metaforce {
 constexpr std::array TypeTable{
diff --git a/Runtime/CFactoryMgr.hpp b/Runtime/Factory/CFactoryMgr.hpp
similarity index 98%
rename from Runtime/CFactoryMgr.hpp
rename to Runtime/Factory/CFactoryMgr.hpp
index 058203051..3f2b41eb9 100644
--- a/Runtime/CFactoryMgr.hpp
+++ b/Runtime/Factory/CFactoryMgr.hpp
@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 
-#include "Runtime/IFactory.hpp"
+#include "IFactory.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/RetroTypes.hpp"
 
diff --git a/Runtime/CResFactory.cpp b/Runtime/Factory/CResFactory.cpp
similarity index 98%
rename from Runtime/CResFactory.cpp
rename to Runtime/Factory/CResFactory.cpp
index 459988fde..eae892426 100644
--- a/Runtime/CResFactory.cpp
+++ b/Runtime/Factory/CResFactory.cpp
@@ -1,6 +1,6 @@
-#include "Runtime/CResFactory.hpp"
+#include "CResFactory.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "CSimplePool.hpp"
 #include "Runtime/CStopwatch.hpp"
 #include "optick.h"
 
diff --git a/Runtime/CResFactory.hpp b/Runtime/Factory/CResFactory.hpp
similarity index 97%
rename from Runtime/CResFactory.hpp
rename to Runtime/Factory/CResFactory.hpp
index c27d9c225..abe8bdb8b 100644
--- a/Runtime/CResFactory.hpp
+++ b/Runtime/Factory/CResFactory.hpp
@@ -5,10 +5,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Runtime/CResLoader.hpp"
+#include "CResLoader.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "IFactory.hpp"
+#include "IVParamObj.hpp"
 
 namespace metaforce {
 class IDvdRequest;
diff --git a/Runtime/CResLoader.cpp b/Runtime/Factory/CResLoader.cpp
similarity index 99%
rename from Runtime/CResLoader.cpp
rename to Runtime/Factory/CResLoader.cpp
index 99a1b1d9d..8050321dc 100644
--- a/Runtime/CResLoader.cpp
+++ b/Runtime/Factory/CResLoader.cpp
@@ -1,4 +1,4 @@
-#include "Runtime/CResLoader.hpp"
+#include "CResLoader.hpp"
 
 #include "Runtime/CPakFile.hpp"
 
diff --git a/Runtime/CResLoader.hpp b/Runtime/Factory/CResLoader.hpp
similarity index 100%
rename from Runtime/CResLoader.hpp
rename to Runtime/Factory/CResLoader.hpp
diff --git a/Runtime/CSimplePool.cpp b/Runtime/Factory/CSimplePool.cpp
similarity index 96%
rename from Runtime/CSimplePool.cpp
rename to Runtime/Factory/CSimplePool.cpp
index 731059e1f..c0281d944 100644
--- a/Runtime/CSimplePool.cpp
+++ b/Runtime/Factory/CSimplePool.cpp
@@ -1,7 +1,7 @@
-#include "Runtime/CSimplePool.hpp"
+#include "CSimplePool.hpp"
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 
 #include <cassert>
 
diff --git a/Runtime/CSimplePool.hpp b/Runtime/Factory/CSimplePool.hpp
similarity index 92%
rename from Runtime/CSimplePool.hpp
rename to Runtime/Factory/CSimplePool.hpp
index 852a35b29..86ec481a5 100644
--- a/Runtime/CSimplePool.hpp
+++ b/Runtime/Factory/CSimplePool.hpp
@@ -3,8 +3,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Runtime/IObjectStore.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/IFactory.hpp b/Runtime/Factory/IFactory.hpp
similarity index 100%
rename from Runtime/IFactory.hpp
rename to Runtime/Factory/IFactory.hpp
diff --git a/Runtime/IObj.hpp b/Runtime/Factory/IObj.hpp
similarity index 100%
rename from Runtime/IObj.hpp
rename to Runtime/Factory/IObj.hpp
diff --git a/Runtime/IObjFactory.hpp b/Runtime/Factory/IObjFactory.hpp
similarity index 100%
rename from Runtime/IObjFactory.hpp
rename to Runtime/Factory/IObjFactory.hpp
diff --git a/Runtime/IObjectStore.hpp b/Runtime/Factory/IObjectStore.hpp
similarity index 100%
rename from Runtime/IObjectStore.hpp
rename to Runtime/Factory/IObjectStore.hpp
diff --git a/Runtime/IVParamObj.hpp b/Runtime/Factory/IVParamObj.hpp
similarity index 97%
rename from Runtime/IVParamObj.hpp
rename to Runtime/Factory/IVParamObj.hpp
index 642ef20e9..f3005d8f2 100644
--- a/Runtime/IVParamObj.hpp
+++ b/Runtime/Factory/IVParamObj.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "Runtime/IObj.hpp"
+#include "IObj.hpp"
 
 namespace metaforce {
 
diff --git a/Runtime/Graphics/CCubeMaterial.hpp b/Runtime/Graphics/CCubeMaterial.hpp
index 97d75b6d9..a8ffe2c8c 100644
--- a/Runtime/Graphics/CCubeMaterial.hpp
+++ b/Runtime/Graphics/CCubeMaterial.hpp
@@ -6,7 +6,7 @@
 #include "CToken.hpp"
 #include "GCNTypes.hpp"
 #include "Graphics/CTexture.hpp"
-#include "IObjectStore.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
 
 namespace metaforce {
 class CCubeModel;
diff --git a/Runtime/Graphics/CCubeModel.cpp b/Runtime/Graphics/CCubeModel.cpp
index 8409895f4..b39d329c9 100644
--- a/Runtime/Graphics/CCubeModel.cpp
+++ b/Runtime/Graphics/CCubeModel.cpp
@@ -1,6 +1,6 @@
 #include "CCubeModel.hpp"
 
-#include "CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Graphics/CCubeMaterial.hpp"
 #include "Graphics/CCubeSurface.hpp"
 #include "Graphics/CGraphics.hpp"
diff --git a/Runtime/Graphics/CCubeModel.hpp b/Runtime/Graphics/CCubeModel.hpp
index 8415dfc23..99fce68de 100644
--- a/Runtime/Graphics/CCubeModel.hpp
+++ b/Runtime/Graphics/CCubeModel.hpp
@@ -7,7 +7,7 @@
 #include "CToken.hpp"
 #include "GCNTypes.hpp"
 #include "Graphics/CTexture.hpp"
-#include "IObjectStore.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
 
 namespace metaforce {
 class CCubeSurface;
diff --git a/Runtime/Graphics/CModel.hpp b/Runtime/Graphics/CModel.hpp
index ec221112e..9ba3d7999 100644
--- a/Runtime/Graphics/CModel.hpp
+++ b/Runtime/Graphics/CModel.hpp
@@ -7,7 +7,7 @@
 #include "GCNTypes.hpp"
 #include "Graphics/CCubeModel.hpp"
 #include "Graphics/CTexture.hpp"
-#include "IObjectStore.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
 
 namespace metaforce {
 class CCubeSurface;
diff --git a/Runtime/Graphics/CModel.hpp.old b/Runtime/Graphics/CModel.hpp.old
index 1e3255d23..629f006af 100644
--- a/Runtime/Graphics/CModel.hpp.old
+++ b/Runtime/Graphics/CModel.hpp.old
@@ -7,7 +7,7 @@
 
 //#include "DataSpec/DNACommon/CMDL.hpp"
 //#include "DataSpec/DNAMP1/CMDLMaterials.hpp"
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/Graphics/Shaders/CModelShaders.hpp"
diff --git a/Runtime/Graphics/CModelBoo.cpp b/Runtime/Graphics/CModelBoo.cpp
index 32ad5ea45..4c7513429 100644
--- a/Runtime/Graphics/CModelBoo.cpp
+++ b/Runtime/Graphics/CModelBoo.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Graphics/CModel.hpp"
 
 #include "Runtime/CBasics.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CSkinRules.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/Graphics/CTexture.hpp b/Runtime/Graphics/CTexture.hpp
index 0cbf56442..fa49410aa 100644
--- a/Runtime/Graphics/CTexture.hpp
+++ b/Runtime/Graphics/CTexture.hpp
@@ -3,9 +3,9 @@
 #include <memory>
 #include <string>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/GCNTypes.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 
diff --git a/Runtime/Graphics/CTextureBoo.cpp b/Runtime/Graphics/CTextureBoo.cpp
index 1924e4790..4b3e42cfe 100644
--- a/Runtime/Graphics/CTextureBoo.cpp
+++ b/Runtime/Graphics/CTextureBoo.cpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/CBasics.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CTextureCache.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
diff --git a/Runtime/GuiSys/CAuiEnergyBarT01.cpp b/Runtime/GuiSys/CAuiEnergyBarT01.cpp
index 10e474b98..1ac8dc1c1 100644
--- a/Runtime/GuiSys/CAuiEnergyBarT01.cpp
+++ b/Runtime/GuiSys/CAuiEnergyBarT01.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GuiSys/CGuiSys.hpp"
 #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
diff --git a/Runtime/GuiSys/CAuiImagePane.cpp b/Runtime/GuiSys/CAuiImagePane.cpp
index f823d1846..cc974bf4f 100644
--- a/Runtime/GuiSys/CAuiImagePane.cpp
+++ b/Runtime/GuiSys/CAuiImagePane.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CAuiImagePane.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
diff --git a/Runtime/GuiSys/CCompoundTargetReticle.cpp b/Runtime/GuiSys/CCompoundTargetReticle.cpp
index 4ec7a6264..507fab0e8 100644
--- a/Runtime/GuiSys/CCompoundTargetReticle.cpp
+++ b/Runtime/GuiSys/CCompoundTargetReticle.cpp
@@ -3,7 +3,7 @@
 #include <cstdlib>
 
 #include "Runtime/GameGlobalObjects.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
 #include "Runtime/World/CPlayer.hpp"
diff --git a/Runtime/GuiSys/CGuiFrame.cpp b/Runtime/GuiSys/CGuiFrame.cpp
index 5cc723c6a..04e4ab8c1 100644
--- a/Runtime/GuiSys/CGuiFrame.cpp
+++ b/Runtime/GuiSys/CGuiFrame.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/GuiSys/CGuiCamera.hpp"
diff --git a/Runtime/GuiSys/CGuiFrame.hpp b/Runtime/GuiSys/CGuiFrame.hpp
index 036b79ed7..fe9e795d7 100644
--- a/Runtime/GuiSys/CGuiFrame.hpp
+++ b/Runtime/GuiSys/CGuiFrame.hpp
@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/GuiSys/CGuiHeadWidget.hpp"
 #include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
 #include "Runtime/GuiSys/CGuiWidget.hpp"
diff --git a/Runtime/GuiSys/CGuiModel.cpp b/Runtime/GuiSys/CGuiModel.cpp
index 3cdd65e30..b1a17ba17 100644
--- a/Runtime/GuiSys/CGuiModel.cpp
+++ b/Runtime/GuiSys/CGuiModel.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CGuiModel.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CGuiSys.hpp"
diff --git a/Runtime/GuiSys/CGuiSys.cpp b/Runtime/GuiSys/CGuiSys.cpp
index d033f8cf9..2d6e87d19 100644
--- a/Runtime/GuiSys/CGuiSys.cpp
+++ b/Runtime/GuiSys/CGuiSys.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CGuiSys.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
 #include "Runtime/GuiSys/CAuiImagePane.hpp"
 #include "Runtime/GuiSys/CAuiMeter.hpp"
diff --git a/Runtime/GuiSys/CGuiTextSupport.cpp b/Runtime/GuiSys/CGuiTextSupport.cpp
index 7013e1b94..105181692 100644
--- a/Runtime/GuiSys/CGuiTextSupport.cpp
+++ b/Runtime/GuiSys/CGuiTextSupport.cpp
@@ -2,7 +2,7 @@
 
 #include <fmt/xchar.h>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 #include "Runtime/Graphics/CGraphicsPalette.hpp"
 #include "Runtime/GuiSys/CFontImageDef.hpp"
diff --git a/Runtime/GuiSys/CHudDecoInterface.cpp b/Runtime/GuiSys/CHudDecoInterface.cpp
index cbc572a9c..9b36602cb 100644
--- a/Runtime/GuiSys/CHudDecoInterface.cpp
+++ b/Runtime/GuiSys/CHudDecoInterface.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CHudDecoInterface.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
 #include "Runtime/GuiSys/CGuiCamera.hpp"
diff --git a/Runtime/GuiSys/CHudRadarInterface.cpp b/Runtime/GuiSys/CHudRadarInterface.cpp
index 88c977087..9de121819 100644
--- a/Runtime/GuiSys/CHudRadarInterface.cpp
+++ b/Runtime/GuiSys/CHudRadarInterface.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/GuiSys/CHudRadarInterface.hpp"
 
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/GuiSys/COrbitPointMarker.cpp b/Runtime/GuiSys/COrbitPointMarker.cpp
index ddd98932a..6bc5404f5 100644
--- a/Runtime/GuiSys/COrbitPointMarker.cpp
+++ b/Runtime/GuiSys/COrbitPointMarker.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/COrbitPointMarker.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/GuiSys/CRasterFont.cpp b/Runtime/GuiSys/CRasterFont.cpp
index e04114745..79c5b9d10 100644
--- a/Runtime/GuiSys/CRasterFont.cpp
+++ b/Runtime/GuiSys/CRasterFont.cpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CDrawStringOptions.hpp"
 #include "Runtime/GuiSys/CTextRenderBuffer.hpp"
diff --git a/Runtime/GuiSys/CScanDisplay.cpp b/Runtime/GuiSys/CScanDisplay.cpp
index 858a0185f..0fc1d0570 100644
--- a/Runtime/GuiSys/CScanDisplay.cpp
+++ b/Runtime/GuiSys/CScanDisplay.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CScanDisplay.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/GuiSys/CSplashScreen.cpp b/Runtime/GuiSys/CSplashScreen.cpp
index 174bc0830..82b667ed5 100644
--- a/Runtime/GuiSys/CSplashScreen.cpp
+++ b/Runtime/GuiSys/CSplashScreen.cpp
@@ -2,7 +2,7 @@
 
 #include "CArchitectureMessage.hpp"
 #include "CArchitectureQueue.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "GameGlobalObjects.hpp"
 #include "Graphics/CCubeRenderer.hpp"
 
diff --git a/Runtime/GuiSys/CStringTable.hpp b/Runtime/GuiSys/CStringTable.hpp
index d500270da..c4eb83667 100644
--- a/Runtime/GuiSys/CStringTable.hpp
+++ b/Runtime/GuiSys/CStringTable.hpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/MP1/CArtifactDoll.cpp b/Runtime/MP1/CArtifactDoll.cpp
index 5dffe34a9..69a917e9b 100644
--- a/Runtime/MP1/CArtifactDoll.cpp
+++ b/Runtime/MP1/CArtifactDoll.cpp
@@ -4,7 +4,7 @@
 #include <array>
 #include <cmath>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/CCredits.cpp b/Runtime/MP1/CCredits.cpp
index 4204197db..f6d0a15fe 100644
--- a/Runtime/MP1/CCredits.cpp
+++ b/Runtime/MP1/CCredits.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/CArchitectureMessage.hpp"
 #include "Runtime/CArchitectureQueue.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
diff --git a/Runtime/MP1/CFaceplateDecoration.cpp b/Runtime/MP1/CFaceplateDecoration.cpp
index f8e8d21e6..2b9b82e8b 100644
--- a/Runtime/MP1/CFaceplateDecoration.cpp
+++ b/Runtime/MP1/CFaceplateDecoration.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CFaceplateDecoration.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Particle/CGenDescription.hpp"
diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp
index 8ba1a112c..77522c981 100644
--- a/Runtime/MP1/CFrontEndUI.cpp
+++ b/Runtime/MP1/CFrontEndUI.cpp
@@ -12,7 +12,7 @@
 #include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CDvdFile.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CAudioGroupSet.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
diff --git a/Runtime/MP1/CGameCubeDoll.cpp b/Runtime/MP1/CGameCubeDoll.cpp
index 5e66fb132..233a3dbbf 100644
--- a/Runtime/MP1/CGameCubeDoll.cpp
+++ b/Runtime/MP1/CGameCubeDoll.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CGameCubeDoll.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/CInGameGuiManager.cpp b/Runtime/MP1/CInGameGuiManager.cpp
index 9028bba21..ad2fb5a22 100644
--- a/Runtime/MP1/CInGameGuiManager.cpp
+++ b/Runtime/MP1/CInGameGuiManager.cpp
@@ -4,7 +4,7 @@
 #include <array>
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/AutoMapper/CAutoMapper.hpp"
diff --git a/Runtime/MP1/CMainFlow.cpp b/Runtime/MP1/CMainFlow.cpp
index 450710a80..3185b66c6 100644
--- a/Runtime/MP1/CMainFlow.cpp
+++ b/Runtime/MP1/CMainFlow.cpp
@@ -3,7 +3,7 @@
 #include "NESEmulator/CNESEmulator.hpp"
 
 #include "Runtime/CArchitectureQueue.hpp"
-#include "Runtime/CResFactory.hpp"
+#include "Runtime/Factory/CResFactory.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CCharLayoutInfo.hpp"
 #include "Runtime/MP1/CCredits.hpp"
diff --git a/Runtime/MP1/CMessageScreen.cpp b/Runtime/MP1/CMessageScreen.cpp
index 459ce2c92..53a8226b3 100644
--- a/Runtime/MP1/CMessageScreen.cpp
+++ b/Runtime/MP1/CMessageScreen.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/MP1/CMessageScreen.hpp"
 
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/GuiSys/CGuiModel.hpp"
diff --git a/Runtime/MP1/CPauseScreen.cpp b/Runtime/MP1/CPauseScreen.cpp
index a09a572d4..8cdeb4c10 100644
--- a/Runtime/MP1/CPauseScreen.cpp
+++ b/Runtime/MP1/CPauseScreen.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPauseScreen.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/GuiSys/CGuiSys.hpp"
diff --git a/Runtime/MP1/CPauseScreenBlur.cpp b/Runtime/MP1/CPauseScreenBlur.cpp
index c797238a2..0900629af 100644
--- a/Runtime/MP1/CPauseScreenBlur.cpp
+++ b/Runtime/MP1/CPauseScreenBlur.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPauseScreenBlur.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 
diff --git a/Runtime/MP1/CPlayerVisor.cpp b/Runtime/MP1/CPlayerVisor.cpp
index 0a2d05c09..b493f3189 100644
--- a/Runtime/MP1/CPlayerVisor.cpp
+++ b/Runtime/MP1/CPlayerVisor.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPlayerVisor.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/MP1/CPreFrontEnd.cpp b/Runtime/MP1/CPreFrontEnd.cpp
index 3d875e53f..efdf5579e 100644
--- a/Runtime/MP1/CPreFrontEnd.cpp
+++ b/Runtime/MP1/CPreFrontEnd.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPreFrontEnd.hpp"
 
-#include "Runtime/CResLoader.hpp"
+#include "Runtime/Factory/CResLoader.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 #include "Runtime/MP1/MP1.hpp"
diff --git a/Runtime/MP1/CQuitGameScreen.cpp b/Runtime/MP1/CQuitGameScreen.cpp
index ac8dcce4f..7c2808d09 100644
--- a/Runtime/MP1/CQuitGameScreen.cpp
+++ b/Runtime/MP1/CQuitGameScreen.cpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/GameGlobalObjects.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/Input/CFinalInput.hpp"
diff --git a/Runtime/MP1/CSamusDoll.cpp b/Runtime/MP1/CSamusDoll.cpp
index 2d1ab91c4..d81d4dec8 100644
--- a/Runtime/MP1/CSamusDoll.cpp
+++ b/Runtime/MP1/CSamusDoll.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/MP1/CSamusDoll.hpp"
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Collision/CollisionUtil.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/CSamusHud.cpp b/Runtime/MP1/CSamusHud.cpp
index 66a90b85e..12b83853f 100644
--- a/Runtime/MP1/CSamusHud.cpp
+++ b/Runtime/MP1/CSamusHud.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CSamusHud.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
 #include "Runtime/GuiSys/CGuiCamera.hpp"
diff --git a/Runtime/MP1/CSaveGameScreen.cpp b/Runtime/MP1/CSaveGameScreen.cpp
index e18133df5..b3d6f4d7f 100644
--- a/Runtime/MP1/CSaveGameScreen.cpp
+++ b/Runtime/MP1/CSaveGameScreen.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CGuiTableGroup.hpp"
diff --git a/Runtime/MP1/CSlideShow.cpp b/Runtime/MP1/CSlideShow.cpp
index f827c7d7d..76a15c920 100644
--- a/Runtime/MP1/CSlideShow.cpp
+++ b/Runtime/MP1/CSlideShow.cpp
@@ -4,7 +4,7 @@
 
 #include "Runtime/CArchitectureMessage.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 namespace metaforce {
diff --git a/Runtime/MP1/CSplashScreen.cpp b/Runtime/MP1/CSplashScreen.cpp
index 7baf77840..e4f39f640 100644
--- a/Runtime/MP1/CSplashScreen.cpp
+++ b/Runtime/MP1/CSplashScreen.cpp
@@ -1,6 +1,6 @@
 #include "CSplashScreen.hpp"
 #include "Graphics/CGraphics.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "CArchitectureQueue.hpp"
 #include "CArchitectureMessage.hpp"
 
diff --git a/Runtime/MP1/MP1.hpp b/Runtime/MP1/MP1.hpp
index 9dd64a7b0..7971f0a8d 100644
--- a/Runtime/MP1/MP1.hpp
+++ b/Runtime/MP1/MP1.hpp
@@ -6,8 +6,8 @@
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/CBasics.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
-#include "Runtime/CResFactory.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CResFactory.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CAssetFactory.hpp"
 #include "Runtime/World/CAi.hpp"
 #include "Runtime/CGameState.hpp"
diff --git a/Runtime/MP1/World/CActorContraption.cpp b/Runtime/MP1/World/CActorContraption.cpp
index 3edd42ab3..940f343c8 100644
--- a/Runtime/MP1/World/CActorContraption.cpp
+++ b/Runtime/MP1/World/CActorContraption.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CActorContraption.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CInt32POINode.hpp"
diff --git a/Runtime/MP1/World/CAtomicBeta.cpp b/Runtime/MP1/World/CAtomicBeta.cpp
index 4a66b1f67..8eaf78f82 100644
--- a/Runtime/MP1/World/CAtomicBeta.cpp
+++ b/Runtime/MP1/World/CAtomicBeta.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Particle/CWeaponDescription.hpp"
diff --git a/Runtime/MP1/World/CBabygoth.cpp b/Runtime/MP1/World/CBabygoth.cpp
index c6ba9101c..5b7d5c574 100644
--- a/Runtime/MP1/World/CBabygoth.cpp
+++ b/Runtime/MP1/World/CBabygoth.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"
diff --git a/Runtime/MP1/World/CBloodFlower.cpp b/Runtime/MP1/World/CBloodFlower.cpp
index a39655d77..dacd9a221 100644
--- a/Runtime/MP1/World/CBloodFlower.cpp
+++ b/Runtime/MP1/World/CBloodFlower.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Particle/CElementGen.hpp"
diff --git a/Runtime/MP1/World/CBouncyGrenade.cpp b/Runtime/MP1/World/CBouncyGrenade.cpp
index 95e84b3e3..c2a206f84 100644
--- a/Runtime/MP1/World/CBouncyGrenade.cpp
+++ b/Runtime/MP1/World/CBouncyGrenade.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/MP1/World/CBouncyGrenade.hpp"
 
 #include "Runtime/CPlayerState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/World/CChozoGhost.cpp b/Runtime/MP1/World/CChozoGhost.cpp
index b611ee221..d85e7135e 100644
--- a/Runtime/MP1/World/CChozoGhost.cpp
+++ b/Runtime/MP1/World/CChozoGhost.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/CStateManager.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CRandom16.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"
 #include "Runtime/Weapon/CGameProjectile.hpp"
diff --git a/Runtime/MP1/World/CDrone.cpp b/Runtime/MP1/World/CDrone.cpp
index c6a396e1c..b0bdddad0 100644
--- a/Runtime/MP1/World/CDrone.cpp
+++ b/Runtime/MP1/World/CDrone.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/MP1/World/CDroneLaser.hpp"
diff --git a/Runtime/MP1/World/CDroneLaser.cpp b/Runtime/MP1/World/CDroneLaser.cpp
index 658ed81c5..c87a601ff 100644
--- a/Runtime/MP1/World/CDroneLaser.cpp
+++ b/Runtime/MP1/World/CDroneLaser.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CDroneLaser.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/World/CElitePirate.cpp b/Runtime/MP1/World/CElitePirate.cpp
index d0849ccc2..e4f6ab2bd 100644
--- a/Runtime/MP1/World/CElitePirate.cpp
+++ b/Runtime/MP1/World/CElitePirate.cpp
@@ -6,7 +6,7 @@
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
 #include "Runtime/Collision/CCollisionActorManager.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/MP1/World/CGrenadeLauncher.hpp"
diff --git a/Runtime/MP1/World/CEnergyBall.cpp b/Runtime/MP1/World/CEnergyBall.cpp
index d7f375c4b..f3edb851a 100644
--- a/Runtime/MP1/World/CEnergyBall.cpp
+++ b/Runtime/MP1/World/CEnergyBall.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CEnergyBall.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/World/CPatternedInfo.hpp"
diff --git a/Runtime/MP1/World/CFlyingPirate.cpp b/Runtime/MP1/World/CFlyingPirate.cpp
index b74a21bb7..6ffab227f 100644
--- a/Runtime/MP1/World/CFlyingPirate.cpp
+++ b/Runtime/MP1/World/CFlyingPirate.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CFlyingPirate.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
diff --git a/Runtime/MP1/World/CGrenadeLauncher.cpp b/Runtime/MP1/World/CGrenadeLauncher.cpp
index 28d08c5f2..d14b7fc01 100644
--- a/Runtime/MP1/World/CGrenadeLauncher.cpp
+++ b/Runtime/MP1/World/CGrenadeLauncher.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/Character/CPASAnimParm.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Weapon/CGameProjectile.hpp"
diff --git a/Runtime/MP1/World/CIceSheegoth.cpp b/Runtime/MP1/World/CIceSheegoth.cpp
index 645f8942a..ba5a7ba1e 100644
--- a/Runtime/MP1/World/CIceSheegoth.cpp
+++ b/Runtime/MP1/World/CIceSheegoth.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CIceSheegoth.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Camera/CCameraManager.hpp"
 #include "Runtime/Camera/CCameraShakeData.hpp"
diff --git a/Runtime/MP1/World/CMagdolite.cpp b/Runtime/MP1/World/CMagdolite.cpp
index d504e48a5..cfe21c329 100644
--- a/Runtime/MP1/World/CMagdolite.cpp
+++ b/Runtime/MP1/World/CMagdolite.cpp
@@ -9,7 +9,7 @@
 #include "Runtime/World/CScriptWater.hpp"
 #include "Runtime/World/CScriptWaypoint.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
diff --git a/Runtime/MP1/World/CMetroidBeta.cpp b/Runtime/MP1/World/CMetroidBeta.cpp
index bd9a3a7de..8ad67e816 100644
--- a/Runtime/MP1/World/CMetroidBeta.cpp
+++ b/Runtime/MP1/World/CMetroidBeta.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CMetroidBeta.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
diff --git a/Runtime/MP1/World/CMetroidPrimeEssence.cpp b/Runtime/MP1/World/CMetroidPrimeEssence.cpp
index 420ff1c77..cce3d6962 100644
--- a/Runtime/MP1/World/CMetroidPrimeEssence.cpp
+++ b/Runtime/MP1/World/CMetroidPrimeEssence.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CMetroidPrimeEssence.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
 #include "Runtime/Collision/CCollisionActorManager.hpp"
diff --git a/Runtime/MP1/World/CMetroidPrimeExo.cpp b/Runtime/MP1/World/CMetroidPrimeExo.cpp
index 1e3c8ebeb..ba69067dd 100644
--- a/Runtime/MP1/World/CMetroidPrimeExo.cpp
+++ b/Runtime/MP1/World/CMetroidPrimeExo.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CMetroidPrimeExo.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
 #include "Runtime/Collision/CCollisionActorManager.hpp"
diff --git a/Runtime/MP1/World/CMetroidPrimeProjectile.cpp b/Runtime/MP1/World/CMetroidPrimeProjectile.cpp
index 3c96b62f0..01dce76d1 100644
--- a/Runtime/MP1/World/CMetroidPrimeProjectile.cpp
+++ b/Runtime/MP1/World/CMetroidPrimeProjectile.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CMetroidPrimeProjectile.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 namespace metaforce::MP1 {
diff --git a/Runtime/MP1/World/COmegaPirate.cpp b/Runtime/MP1/World/COmegaPirate.cpp
index aa518969a..11de3fd21 100644
--- a/Runtime/MP1/World/COmegaPirate.cpp
+++ b/Runtime/MP1/World/COmegaPirate.cpp
@@ -4,7 +4,7 @@
 #include "Runtime/Collision/CCollisionActor.hpp"
 #include "Runtime/Collision/CCollisionActorManager.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Weapon/CGameProjectile.hpp"
diff --git a/Runtime/MP1/World/CParasite.cpp b/Runtime/MP1/World/CParasite.cpp
index ee28646bf..d9e68f4a2 100644
--- a/Runtime/MP1/World/CParasite.cpp
+++ b/Runtime/MP1/World/CParasite.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CParasite.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CModelData.hpp"
diff --git a/Runtime/MP1/World/CPhazonHealingNodule.cpp b/Runtime/MP1/World/CPhazonHealingNodule.cpp
index 71fddfde0..3ce30d784 100644
--- a/Runtime/MP1/World/CPhazonHealingNodule.cpp
+++ b/Runtime/MP1/World/CPhazonHealingNodule.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CPhazonHealingNodule.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/World/CPatternedInfo.hpp"
diff --git a/Runtime/MP1/World/CPhazonPool.cpp b/Runtime/MP1/World/CPhazonPool.cpp
index de6a32b0a..9175f99d2 100644
--- a/Runtime/MP1/World/CPhazonPool.cpp
+++ b/Runtime/MP1/World/CPhazonPool.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CPhazonPool.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/World/CPuddleSpore.cpp b/Runtime/MP1/World/CPuddleSpore.cpp
index f00c67b83..8afeb25d0 100644
--- a/Runtime/MP1/World/CPuddleSpore.cpp
+++ b/Runtime/MP1/World/CPuddleSpore.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CPuddleSpore.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
diff --git a/Runtime/MP1/World/CPuddleToadGamma.cpp b/Runtime/MP1/World/CPuddleToadGamma.cpp
index 7ee32396c..675301786 100644
--- a/Runtime/MP1/World/CPuddleToadGamma.cpp
+++ b/Runtime/MP1/World/CPuddleToadGamma.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CPuddleToadGamma.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
diff --git a/Runtime/MP1/World/CPuffer.cpp b/Runtime/MP1/World/CPuffer.cpp
index 890472875..8806e1336 100644
--- a/Runtime/MP1/World/CPuffer.cpp
+++ b/Runtime/MP1/World/CPuffer.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CPuffer.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/World/CFire.hpp"
diff --git a/Runtime/MP1/World/CRidley.cpp b/Runtime/MP1/World/CRidley.cpp
index 187ea2c90..04393448a 100644
--- a/Runtime/MP1/World/CRidley.cpp
+++ b/Runtime/MP1/World/CRidley.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/Character/CPASAnimParmData.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/World/CShockWave.cpp b/Runtime/MP1/World/CShockWave.cpp
index 9f8161567..8d555197e 100644
--- a/Runtime/MP1/World/CShockWave.cpp
+++ b/Runtime/MP1/World/CShockWave.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/MP1/World/CShockWave.hpp"
 
 #include "Runtime/Collision/CCollisionActor.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/MP1/World/CThardus.cpp b/Runtime/MP1/World/CThardus.cpp
index ec3c3f3c5..f138e79af 100644
--- a/Runtime/MP1/World/CThardus.cpp
+++ b/Runtime/MP1/World/CThardus.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Camera/CCameraManager.hpp"
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
diff --git a/Runtime/MP1/World/CThardusRockProjectile.cpp b/Runtime/MP1/World/CThardusRockProjectile.cpp
index d0038053a..3e554b53f 100644
--- a/Runtime/MP1/World/CThardusRockProjectile.cpp
+++ b/Runtime/MP1/World/CThardusRockProjectile.cpp
@@ -12,7 +12,7 @@
 #include "Runtime/World/CLightParameters.hpp"
 #include "Runtime/World/CPlayer.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 #include "Runtime/MP1/World/CThardus.hpp"
diff --git a/Runtime/MP1/World/CWarWasp.cpp b/Runtime/MP1/World/CWarWasp.cpp
index 7928a83cb..b7859700f 100644
--- a/Runtime/MP1/World/CWarWasp.cpp
+++ b/Runtime/MP1/World/CWarWasp.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CCharLayoutInfo.hpp"
 #include "Runtime/Weapon/CGameProjectile.hpp"
diff --git a/Runtime/Particle/CDecalDataFactory.cpp b/Runtime/Particle/CDecalDataFactory.cpp
index a564efa6f..0f8a0a780 100644
--- a/Runtime/Particle/CDecalDataFactory.cpp
+++ b/Runtime/Particle/CDecalDataFactory.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Particle/CDecalDataFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CParticleDataFactory.hpp"
 
diff --git a/Runtime/Particle/CDecalDataFactory.hpp b/Runtime/Particle/CDecalDataFactory.hpp
index 528ce5232..906ff0929 100644
--- a/Runtime/Particle/CDecalDataFactory.hpp
+++ b/Runtime/Particle/CDecalDataFactory.hpp
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/Particle/CDecalDescription.hpp"
diff --git a/Runtime/Particle/CParticleDataFactory.cpp b/Runtime/Particle/CParticleDataFactory.cpp
index 0812cb756..fd97e2731 100644
--- a/Runtime/Particle/CParticleDataFactory.cpp
+++ b/Runtime/Particle/CParticleDataFactory.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Particle/CParticleDataFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"
diff --git a/Runtime/Particle/CParticleDataFactory.hpp b/Runtime/Particle/CParticleDataFactory.hpp
index b6dd56fac..ac6b06c14 100644
--- a/Runtime/Particle/CParticleDataFactory.hpp
+++ b/Runtime/Particle/CParticleDataFactory.hpp
@@ -3,10 +3,10 @@
 #include <memory>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 
diff --git a/Runtime/Particle/CParticleElectricDataFactory.cpp b/Runtime/Particle/CParticleElectricDataFactory.cpp
index ab1dda2b8..bea5ff48c 100644
--- a/Runtime/Particle/CParticleElectricDataFactory.cpp
+++ b/Runtime/Particle/CParticleElectricDataFactory.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Particle/CParticleElectricDataFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"
diff --git a/Runtime/Particle/CParticleElectricDataFactory.hpp b/Runtime/Particle/CParticleElectricDataFactory.hpp
index 4364b49a6..84112dd32 100644
--- a/Runtime/Particle/CParticleElectricDataFactory.hpp
+++ b/Runtime/Particle/CParticleElectricDataFactory.hpp
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Particle/CParticleSwooshDataFactory.cpp b/Runtime/Particle/CParticleSwooshDataFactory.cpp
index 9b5d048ce..4a0ac882d 100644
--- a/Runtime/Particle/CParticleSwooshDataFactory.cpp
+++ b/Runtime/Particle/CParticleSwooshDataFactory.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"
 #include "Runtime/Particle/CGenDescription.hpp"
diff --git a/Runtime/Particle/CParticleSwooshDataFactory.hpp b/Runtime/Particle/CParticleSwooshDataFactory.hpp
index da3fb76ec..45b51b25a 100644
--- a/Runtime/Particle/CParticleSwooshDataFactory.hpp
+++ b/Runtime/Particle/CParticleSwooshDataFactory.hpp
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.cpp b/Runtime/Particle/CProjectileWeaponDataFactory.cpp
index 540e228d6..1dea2aace 100644
--- a/Runtime/Particle/CProjectileWeaponDataFactory.cpp
+++ b/Runtime/Particle/CProjectileWeaponDataFactory.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Collision/CCollisionResponseData.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"
diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.hpp b/Runtime/Particle/CProjectileWeaponDataFactory.hpp
index b3653875a..b501912a9 100644
--- a/Runtime/Particle/CProjectileWeaponDataFactory.hpp
+++ b/Runtime/Particle/CProjectileWeaponDataFactory.hpp
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.cpp b/Runtime/Particle/CSpawnSystemKeyframeData.cpp
index f75a2ae34..b5243b2a9 100644
--- a/Runtime/Particle/CSpawnSystemKeyframeData.cpp
+++ b/Runtime/Particle/CSpawnSystemKeyframeData.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Particle/CSpawnSystemKeyframeData.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"
 
diff --git a/Runtime/Tweaks/ITweakGunRes.hpp b/Runtime/Tweaks/ITweakGunRes.hpp
index 7becd4a99..e69c001d3 100644
--- a/Runtime/Tweaks/ITweakGunRes.hpp
+++ b/Runtime/Tweaks/ITweakGunRes.hpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/Tweaks/ITweak.hpp"
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/CPlayerState.hpp"
 
 namespace metaforce::Tweaks {
diff --git a/Runtime/Tweaks/ITweakPlayerRes.hpp b/Runtime/Tweaks/ITweakPlayerRes.hpp
index 2a09913cf..aaa438d41 100644
--- a/Runtime/Tweaks/ITweakPlayerRes.hpp
+++ b/Runtime/Tweaks/ITweakPlayerRes.hpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/Tweaks/ITweak.hpp"
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/CPlayerState.hpp"
 
 namespace metaforce::Tweaks {
diff --git a/Runtime/Weapon/CAuxWeapon.cpp b/Runtime/Weapon/CAuxWeapon.cpp
index 3832455e2..ac5cecb9a 100644
--- a/Runtime/Weapon/CAuxWeapon.cpp
+++ b/Runtime/Weapon/CAuxWeapon.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Weapon/CEnergyProjectile.hpp"
 #include "Runtime/Weapon/CNewFlameThrower.hpp"
diff --git a/Runtime/Weapon/CElectricBeamProjectile.cpp b/Runtime/Weapon/CElectricBeamProjectile.cpp
index 5bd7838eb..d2f6109bf 100644
--- a/Runtime/Weapon/CElectricBeamProjectile.cpp
+++ b/Runtime/Weapon/CElectricBeamProjectile.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CElectricBeamProjectile.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/Weapon/CEnergyProjectile.cpp b/Runtime/Weapon/CEnergyProjectile.cpp
index 1f21c1c97..ac6142f20 100644
--- a/Runtime/Weapon/CEnergyProjectile.cpp
+++ b/Runtime/Weapon/CEnergyProjectile.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CEnergyProjectile.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/Weapon/CFlameThrower.cpp b/Runtime/Weapon/CFlameThrower.cpp
index f7f76eb6d..68d050fd0 100644
--- a/Runtime/Weapon/CFlameThrower.cpp
+++ b/Runtime/Weapon/CFlameThrower.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CFlameThrower.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Collision/CInternalRayCastStructure.hpp"
diff --git a/Runtime/Weapon/CGrappleArm.cpp b/Runtime/Weapon/CGrappleArm.cpp
index 4daa2f286..62fd51f76 100644
--- a/Runtime/Weapon/CGrappleArm.cpp
+++ b/Runtime/Weapon/CGrappleArm.cpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
 #include "Runtime/Graphics/CSkinnedModel.hpp"
diff --git a/Runtime/Weapon/CGunWeapon.cpp b/Runtime/Weapon/CGunWeapon.cpp
index 0e74fd50f..e64a53f86 100644
--- a/Runtime/Weapon/CGunWeapon.cpp
+++ b/Runtime/Weapon/CGunWeapon.cpp
@@ -5,7 +5,7 @@
 
 #include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CSkinnedModel.hpp"
 #include "Runtime/Graphics/CVertexMorphEffect.hpp"
diff --git a/Runtime/Weapon/CIceBeam.cpp b/Runtime/Weapon/CIceBeam.cpp
index 819ad2e15..b696ef7ff 100644
--- a/Runtime/Weapon/CIceBeam.cpp
+++ b/Runtime/Weapon/CIceBeam.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Weapon/CNewFlameThrower.cpp b/Runtime/Weapon/CNewFlameThrower.cpp
index cb072c5fd..d64ce7c9b 100644
--- a/Runtime/Weapon/CNewFlameThrower.cpp
+++ b/Runtime/Weapon/CNewFlameThrower.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CNewFlameThrower.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Collision/CCollisionInfoList.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
diff --git a/Runtime/Weapon/CPhazonBeam.cpp b/Runtime/Weapon/CPhazonBeam.cpp
index 8ddd7fa91..2245c726b 100644
--- a/Runtime/Weapon/CPhazonBeam.cpp
+++ b/Runtime/Weapon/CPhazonBeam.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Weapon/CProjectileWeapon.hpp"
diff --git a/Runtime/Weapon/CPlasmaBeam.cpp b/Runtime/Weapon/CPlasmaBeam.cpp
index 6f6d60797..935ed18f2 100644
--- a/Runtime/Weapon/CPlasmaBeam.cpp
+++ b/Runtime/Weapon/CPlasmaBeam.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/World/CPlayer.hpp"
 #include "Runtime/World/CWorld.hpp"
diff --git a/Runtime/Weapon/CPlasmaProjectile.cpp b/Runtime/Weapon/CPlasmaProjectile.cpp
index c35185b2b..41d2787f1 100644
--- a/Runtime/Weapon/CPlasmaProjectile.cpp
+++ b/Runtime/Weapon/CPlasmaProjectile.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CPlasmaProjectile.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/Weapon/CPlayerGun.cpp b/Runtime/Weapon/CPlayerGun.cpp
index 4b220d356..88bbcd87f 100644
--- a/Runtime/Weapon/CPlayerGun.cpp
+++ b/Runtime/Weapon/CPlayerGun.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CPlayerGun.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CPrimitive.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/Weapon/CPowerBeam.cpp b/Runtime/Weapon/CPowerBeam.cpp
index a42e64a0a..20e0ef750 100644
--- a/Runtime/Weapon/CPowerBeam.cpp
+++ b/Runtime/Weapon/CPowerBeam.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 namespace metaforce {
diff --git a/Runtime/Weapon/CProjectileInfo.cpp b/Runtime/Weapon/CProjectileInfo.cpp
index 6ab2e123e..72071b627 100644
--- a/Runtime/Weapon/CProjectileInfo.cpp
+++ b/Runtime/Weapon/CProjectileInfo.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CProjectileInfo.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CSteeringBehaviors.hpp"
 #include "Runtime/Weapon/CProjectileWeapon.hpp"
diff --git a/Runtime/Weapon/CWaveBeam.cpp b/Runtime/Weapon/CWaveBeam.cpp
index 15e646c09..7481906f2 100644
--- a/Runtime/Weapon/CWaveBeam.cpp
+++ b/Runtime/Weapon/CWaveBeam.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Weapon/CEnergyProjectile.hpp"
 
diff --git a/Runtime/Weapon/CWaveBuster.cpp b/Runtime/Weapon/CWaveBuster.cpp
index db26d633d..2858ad87e 100644
--- a/Runtime/Weapon/CWaveBuster.cpp
+++ b/Runtime/Weapon/CWaveBuster.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/CWaveBuster.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Input/CRumbleManager.hpp"
diff --git a/Runtime/Weapon/WeaponCommon.cpp b/Runtime/Weapon/WeaponCommon.cpp
index 5c23f3c50..959cc4072 100644
--- a/Runtime/Weapon/WeaponCommon.cpp
+++ b/Runtime/Weapon/WeaponCommon.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/Weapon/WeaponCommon.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
diff --git a/Runtime/World/CActor.cpp b/Runtime/World/CActor.cpp
index 9f8c663e9..3eeca0f5b 100644
--- a/Runtime/World/CActor.cpp
+++ b/Runtime/World/CActor.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CActor.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/CTimeProvider.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
diff --git a/Runtime/World/CActorModelParticles.cpp b/Runtime/World/CActorModelParticles.cpp
index 9a115dfab..6f9566e03 100644
--- a/Runtime/World/CActorModelParticles.cpp
+++ b/Runtime/World/CActorModelParticles.cpp
@@ -4,7 +4,7 @@
 #include <array>
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/World/CAi.cpp b/Runtime/World/CAi.cpp
index c97dd2a97..55c1bee52 100644
--- a/Runtime/World/CAi.cpp
+++ b/Runtime/World/CAi.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CAi.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CModelData.hpp"
diff --git a/Runtime/World/CEnvFxManager.cpp b/Runtime/World/CEnvFxManager.cpp
index 9781e0f61..ae449fbbd 100644
--- a/Runtime/World/CEnvFxManager.cpp
+++ b/Runtime/World/CEnvFxManager.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/World/CEnvFxManager.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
diff --git a/Runtime/World/CFishCloud.cpp b/Runtime/World/CFishCloud.cpp
index 6011c7cd8..73dbd2b77 100644
--- a/Runtime/World/CFishCloud.cpp
+++ b/Runtime/World/CFishCloud.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CFishCloud.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/World/CFluidPlane.cpp b/Runtime/World/CFluidPlane.cpp
index 37a7eff8f..5381172a6 100644
--- a/Runtime/World/CFluidPlane.cpp
+++ b/Runtime/World/CFluidPlane.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CFluidPlane.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/World/CRipple.hpp"
diff --git a/Runtime/World/CFluidPlaneCPU.cpp b/Runtime/World/CFluidPlaneCPU.cpp
index 1e4dd4045..55af027d1 100644
--- a/Runtime/World/CFluidPlaneCPU.cpp
+++ b/Runtime/World/CFluidPlaneCPU.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CFluidPlaneCPU.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/World/CGameArea.cpp b/Runtime/World/CGameArea.cpp
index 30117d46b..f058d3b97 100644
--- a/Runtime/World/CGameArea.cpp
+++ b/Runtime/World/CGameArea.cpp
@@ -4,7 +4,7 @@
 #include <cstring>
 
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/World/CGameLight.cpp b/Runtime/World/CGameLight.cpp
index 5e3b2f289..85afc376b 100644
--- a/Runtime/World/CGameLight.cpp
+++ b/Runtime/World/CGameLight.cpp
@@ -3,7 +3,7 @@
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/World/CActorParameters.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Graphics/CCubeRenderer.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp
index 28d32760a..d332418f6 100644
--- a/Runtime/World/CMorphBall.cpp
+++ b/Runtime/World/CMorphBall.cpp
@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
diff --git a/Runtime/World/CPathFindArea.cpp b/Runtime/World/CPathFindArea.cpp
index 525ae61b5..9f9bdc8d9 100644
--- a/Runtime/World/CPathFindArea.cpp
+++ b/Runtime/World/CPathFindArea.cpp
@@ -3,7 +3,7 @@
 #include <logvisor/logvisor.hpp>
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 
 namespace metaforce {
 
diff --git a/Runtime/World/CPathFindArea.hpp b/Runtime/World/CPathFindArea.hpp
index 5a58bc61f..18a59a7ca 100644
--- a/Runtime/World/CPathFindArea.hpp
+++ b/Runtime/World/CPathFindArea.hpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/rstl.hpp"
 #include "Runtime/World/CPathFindRegion.hpp"
 
diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp
index 75ee90ccc..eacac98ba 100644
--- a/Runtime/World/CPlayer.cpp
+++ b/Runtime/World/CPlayer.cpp
@@ -7,7 +7,7 @@
 
 #include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Audio/CStreamAudioManager.hpp"
 #include "Runtime/Camera/CBallCamera.hpp"
diff --git a/Runtime/World/CScriptDebris.cpp b/Runtime/World/CScriptDebris.cpp
index 709957c67..b0a80820d 100644
--- a/Runtime/World/CScriptDebris.cpp
+++ b/Runtime/World/CScriptDebris.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CScriptDebris.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Collision/CCollisionInfoList.hpp"
diff --git a/Runtime/World/CScriptEMPulse.cpp b/Runtime/World/CScriptEMPulse.cpp
index 0defd3dae..bfc114de4 100644
--- a/Runtime/World/CScriptEMPulse.cpp
+++ b/Runtime/World/CScriptEMPulse.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CScriptEMPulse.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/World/CScriptEffect.cpp b/Runtime/World/CScriptEffect.cpp
index a5ae76028..f933f4362 100644
--- a/Runtime/World/CScriptEffect.cpp
+++ b/Runtime/World/CScriptEffect.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/World/CScriptEffect.hpp"
 
 #include "Runtime/CPlayerState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/World/CScriptGunTurret.cpp b/Runtime/World/CScriptGunTurret.cpp
index ea6533f8f..7a6a1abd3 100644
--- a/Runtime/World/CScriptGunTurret.cpp
+++ b/Runtime/World/CScriptGunTurret.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
diff --git a/Runtime/World/CScriptHUDMemo.cpp b/Runtime/World/CScriptHUDMemo.cpp
index 1feadb2f1..4eebfe666 100644
--- a/Runtime/World/CScriptHUDMemo.cpp
+++ b/Runtime/World/CScriptHUDMemo.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CScriptHUDMemo.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"
 #include "Runtime/MP1/CSamusHud.hpp"
diff --git a/Runtime/World/CScriptMidi.cpp b/Runtime/World/CScriptMidi.cpp
index 00b23486a..612286d99 100644
--- a/Runtime/World/CScriptMidi.cpp
+++ b/Runtime/World/CScriptMidi.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/World/CScriptMidi.hpp"
 
 #include "Runtime/CInGameTweakManagerBase.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/MP1/CInGameGuiManager.hpp"
diff --git a/Runtime/World/CScriptPickup.cpp b/Runtime/World/CScriptPickup.cpp
index ac5a5c9dd..9a2e4dad0 100644
--- a/Runtime/World/CScriptPickup.cpp
+++ b/Runtime/World/CScriptPickup.cpp
@@ -2,7 +2,7 @@
 
 #include "Runtime/CGameOptions.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"
diff --git a/Runtime/World/CScriptSpecialFunction.cpp b/Runtime/World/CScriptSpecialFunction.cpp
index 80f59215c..886f240e5 100644
--- a/Runtime/World/CScriptSpecialFunction.cpp
+++ b/Runtime/World/CScriptSpecialFunction.cpp
@@ -4,7 +4,7 @@
 
 #include "Runtime/CGameState.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/IMain.hpp"
diff --git a/Runtime/World/CScriptVisorGoo.cpp b/Runtime/World/CScriptVisorGoo.cpp
index 509ef0ef4..aa93ff186 100644
--- a/Runtime/World/CScriptVisorGoo.cpp
+++ b/Runtime/World/CScriptVisorGoo.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CScriptVisorGoo.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/World/CActorParameters.hpp"
diff --git a/Runtime/World/CScriptWater.cpp b/Runtime/World/CScriptWater.cpp
index 10faa2aba..33947f02f 100644
--- a/Runtime/World/CScriptWater.cpp
+++ b/Runtime/World/CScriptWater.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
diff --git a/Runtime/World/CSnakeWeedSwarm.cpp b/Runtime/World/CSnakeWeedSwarm.cpp
index 5d8e059c2..ba85fc384 100644
--- a/Runtime/World/CSnakeWeedSwarm.cpp
+++ b/Runtime/World/CSnakeWeedSwarm.cpp
@@ -1,6 +1,6 @@
 #include "Runtime/World/CSnakeWeedSwarm.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
diff --git a/Runtime/World/CStateMachine.hpp b/Runtime/World/CStateMachine.hpp
index 3b9cccd4e..ace8579cf 100644
--- a/Runtime/World/CStateMachine.hpp
+++ b/Runtime/World/CStateMachine.hpp
@@ -5,8 +5,8 @@
 #include "Runtime/CToken.hpp"
 #include "Runtime/GCNTypes.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
-#include "Runtime/IObjFactory.hpp"
+#include "Runtime/Factory/IObj.hpp"
+#include "Runtime/Factory/IObjFactory.hpp"
 #include "Runtime/World/CAiFuncMap.hpp"
 
 namespace metaforce {
diff --git a/Runtime/World/CVisorFlare.cpp b/Runtime/World/CVisorFlare.cpp
index d06ce9210..c8381b895 100644
--- a/Runtime/World/CVisorFlare.cpp
+++ b/Runtime/World/CVisorFlare.cpp
@@ -5,7 +5,7 @@
 #include "Runtime/World/CPlayer.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/CStateManager.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 
 namespace metaforce {
 
diff --git a/Runtime/World/CWallCrawlerSwarm.cpp b/Runtime/World/CWallCrawlerSwarm.cpp
index b83059ea5..9e998b095 100644
--- a/Runtime/World/CWallCrawlerSwarm.cpp
+++ b/Runtime/World/CWallCrawlerSwarm.cpp
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
diff --git a/Runtime/World/CWorld.cpp b/Runtime/World/CWorld.cpp
index 00d623e70..f66a8ecb6 100644
--- a/Runtime/World/CWorld.cpp
+++ b/Runtime/World/CWorld.cpp
@@ -5,7 +5,7 @@
 
 #include "Runtime/CGameState.hpp"
 #include "Runtime/CInGameTweakManagerBase.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/IMain.hpp"
 #include "Runtime/Audio/CAudioGroupSet.hpp"
diff --git a/Runtime/World/CWorldTransManager.cpp b/Runtime/World/CWorldTransManager.cpp
index af848076f..e3c3b73e5 100644
--- a/Runtime/World/CWorldTransManager.cpp
+++ b/Runtime/World/CWorldTransManager.cpp
@@ -1,7 +1,7 @@
 #include "Runtime/World/CWorldTransManager.hpp"
 
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Camera/CCameraManager.hpp"
diff --git a/Runtime/World/ScriptLoader.cpp b/Runtime/World/ScriptLoader.cpp
index d5eecdc1f..8dc13ff9b 100644
--- a/Runtime/World/ScriptLoader.cpp
+++ b/Runtime/World/ScriptLoader.cpp
@@ -3,7 +3,7 @@
 #include "Runtime/Camera/CCinematicCamera.hpp"
 #include "Runtime/Camera/CPathCamera.hpp"
 #include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/MP1/World/CActorContraption.hpp"