diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9a1d07f..6a205337 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,7 @@ foreach (SOURCE ${SOURCES_COMBINED})
 endforeach()
 
 target_include_directories(odyssey PRIVATE src)
+target_include_directories(odyssey PRIVATE lib/al/include)
 target_compile_definitions(odyssey PRIVATE NON_MATCHING)
 target_compile_options(odyssey PRIVATE -fno-rtti -fno-exceptions)
 target_compile_options(odyssey PRIVATE -Wall -Wextra -Wdeprecated)
diff --git a/Contributing.md b/Contributing.md
index ea4536b7..8d81313d 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -124,7 +124,7 @@ Before opening a PR, please format your code with clang-format 12 and ensure the
 
 * Use `#include "..."` when including `al` and `rs` (SMO) header files.
     * Include paths should be relative to lib/.
-        * OK: `#include "al/Library/LiveActor/LiveActor.h"`
+        * OK: `#include "Library/LiveActor/LiveActor.h"`
         * Not OK: `#include "LiveActor.h"`
 
 * Use `#include <...>` for system or library includes. Examples:
diff --git a/lib/al/Library/Scene/GameDataHolderBase.h b/lib/al/Library/Scene/GameDataHolderBase.h
deleted file mode 100644
index 58ff94e3..00000000
--- a/lib/al/Library/Scene/GameDataHolderBase.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Message/IUseMessageSystem.h"
-#include "al/Library/Scene/ISceneObj.h"
-
-namespace al {
-class GameDataHolderBase : public ISceneObj, HioNode, IUseMessageSystem {};
-}  // namespace al
diff --git a/lib/al/Library/Area/AreaInitInfo.h b/lib/al/include/Library/Area/AreaInitInfo.h
similarity index 96%
rename from lib/al/Library/Area/AreaInitInfo.h
rename to lib/al/include/Library/Area/AreaInitInfo.h
index 9a5e2565..a58ba4d6 100644
--- a/lib/al/Library/Area/AreaInitInfo.h
+++ b/lib/al/include/Library/Area/AreaInitInfo.h
@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class AudioDirector;
diff --git a/lib/al/Library/Area/AreaObjDirector.h b/lib/al/include/Library/Area/AreaObjDirector.h
similarity index 100%
rename from lib/al/Library/Area/AreaObjDirector.h
rename to lib/al/include/Library/Area/AreaObjDirector.h
diff --git a/lib/al/Library/Area/AreaObjUtil.h b/lib/al/include/Library/Area/AreaObjUtil.h
similarity index 100%
rename from lib/al/Library/Area/AreaObjUtil.h
rename to lib/al/include/Library/Area/AreaObjUtil.h
diff --git a/lib/al/Library/Area/IUseAreaObj.h b/lib/al/include/Library/Area/IUseAreaObj.h
similarity index 100%
rename from lib/al/Library/Area/IUseAreaObj.h
rename to lib/al/include/Library/Area/IUseAreaObj.h
diff --git a/lib/al/Library/Audio/AudioDirector.h b/lib/al/include/Library/Audio/AudioDirector.h
similarity index 93%
rename from lib/al/Library/Audio/AudioDirector.h
rename to lib/al/include/Library/Audio/AudioDirector.h
index 79b7a427..119d46ab 100644
--- a/lib/al/Library/Audio/AudioDirector.h
+++ b/lib/al/include/Library/Audio/AudioDirector.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <container/seadPtrArray.h>
-#include "al/audio/IAudioSystemPause.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Area/IUseAreaObj.h"
-#include "al/util/OtherUtil.h"
+#include "audio/IAudioSystemPause.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Area/IUseAreaObj.h"
+#include "util/OtherUtil.h"
 
 namespace aal {
 class AudioFrameProcessMgr;
diff --git a/lib/al/Library/Audio/AudioKeeper.h b/lib/al/include/Library/Audio/AudioKeeper.h
similarity index 97%
rename from lib/al/Library/Audio/AudioKeeper.h
rename to lib/al/include/Library/Audio/AudioKeeper.h
index 5be8eb61..a2946fec 100644
--- a/lib/al/Library/Audio/AudioKeeper.h
+++ b/lib/al/include/Library/Audio/AudioKeeper.h
@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class AudioDirector;
diff --git a/lib/al/Library/Audio/IAudioSystemPause.h b/lib/al/include/Library/Audio/IAudioSystemPause.h
similarity index 100%
rename from lib/al/Library/Audio/IAudioSystemPause.h
rename to lib/al/include/Library/Audio/IAudioSystemPause.h
diff --git a/lib/al/Library/Audio/IUseAudioKeeper.h b/lib/al/include/Library/Audio/IUseAudioKeeper.h
similarity index 100%
rename from lib/al/Library/Audio/IUseAudioKeeper.h
rename to lib/al/include/Library/Audio/IUseAudioKeeper.h
diff --git a/lib/al/Library/Base/String.h b/lib/al/include/Library/Base/String.h
similarity index 100%
rename from lib/al/Library/Base/String.h
rename to lib/al/include/Library/Base/String.h
diff --git a/lib/al/Library/Camera/CameraDirector.h b/lib/al/include/Library/Camera/CameraDirector.h
similarity index 97%
rename from lib/al/Library/Camera/CameraDirector.h
rename to lib/al/include/Library/Camera/CameraDirector.h
index 21cd061e..16c3fcd3 100755
--- a/lib/al/Library/Camera/CameraDirector.h
+++ b/lib/al/include/Library/Camera/CameraDirector.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <math/seadMatrix.h>
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Execute/IUseExecutor.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Execute/IUseExecutor.h"
 
 namespace al {
 class SceneCameraInfo;
diff --git a/lib/al/Library/Camera/CameraPoser.h b/lib/al/include/Library/Camera/CameraPoser.h
similarity index 93%
rename from lib/al/Library/Camera/CameraPoser.h
rename to lib/al/include/Library/Camera/CameraPoser.h
index 9c24d752..0c9b3aec 100644
--- a/lib/al/Library/Camera/CameraPoser.h
+++ b/lib/al/include/Library/Camera/CameraPoser.h
@@ -5,13 +5,13 @@
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
 
-#include "al/Library/Area/IUseAreaObj.h"
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Collision/IUseCollision.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/HostIO/IUseName.h"
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Rail/IUseRail.h"
+#include "Library/Area/IUseAreaObj.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Collision/IUseCollision.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/HostIO/IUseName.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Rail/IUseRail.h"
 
 namespace al {
 class CameraVerticalAbsorber;
diff --git a/lib/al/Library/Camera/CameraPoserFunction.h b/lib/al/include/Library/Camera/CameraPoserFunction.h
similarity index 100%
rename from lib/al/Library/Camera/CameraPoserFunction.h
rename to lib/al/include/Library/Camera/CameraPoserFunction.h
diff --git a/lib/al/Library/Camera/CameraUtil.h b/lib/al/include/Library/Camera/CameraUtil.h
similarity index 100%
rename from lib/al/Library/Camera/CameraUtil.h
rename to lib/al/include/Library/Camera/CameraUtil.h
diff --git a/lib/al/Library/Camera/IUseCamera.h b/lib/al/include/Library/Camera/IUseCamera.h
similarity index 100%
rename from lib/al/Library/Camera/IUseCamera.h
rename to lib/al/include/Library/Camera/IUseCamera.h
diff --git a/lib/al/Library/Camera/IUseCameraDirector.h b/lib/al/include/Library/Camera/IUseCameraDirector.h
similarity index 100%
rename from lib/al/Library/Camera/IUseCameraDirector.h
rename to lib/al/include/Library/Camera/IUseCameraDirector.h
diff --git a/lib/al/Library/Camera/SnapShotCameraCtrl.h b/lib/al/include/Library/Camera/SnapShotCameraCtrl.h
similarity index 90%
rename from lib/al/Library/Camera/SnapShotCameraCtrl.h
rename to lib/al/include/Library/Camera/SnapShotCameraCtrl.h
index 5e8b1ee8..ec686df0 100644
--- a/lib/al/Library/Camera/SnapShotCameraCtrl.h
+++ b/lib/al/include/Library/Camera/SnapShotCameraCtrl.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <gfx/seadCamera.h>
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Nerve/NerveExecutor.h"
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Nerve/NerveExecutor.h"
+#include "Library/Yaml/ByamlIter.h"
 
 struct CameraParam {
     bool gotMin;
diff --git a/lib/al/Library/Clipping/ViewIdHolder.h b/lib/al/include/Library/Clipping/ViewIdHolder.h
similarity index 100%
rename from lib/al/Library/Clipping/ViewIdHolder.h
rename to lib/al/include/Library/Clipping/ViewIdHolder.h
diff --git a/lib/al/Library/Collision/Collider.h b/lib/al/include/Library/Collision/Collider.h
similarity index 93%
rename from lib/al/Library/Collision/Collider.h
rename to lib/al/include/Library/Collision/Collider.h
index c8aaa5ee..d66a7ee6 100644
--- a/lib/al/Library/Collision/Collider.h
+++ b/lib/al/include/Library/Collision/Collider.h
@@ -3,8 +3,8 @@
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
 
-#include "al/Library/Collision/IUseCollision.h"
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/Collision/IUseCollision.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 struct SphereInterpolator;
diff --git a/lib/al/Library/Collision/CollisionDirector.h b/lib/al/include/Library/Collision/CollisionDirector.h
similarity index 98%
rename from lib/al/Library/Collision/CollisionDirector.h
rename to lib/al/include/Library/Collision/CollisionDirector.h
index 299ce35c..011fad13 100644
--- a/lib/al/Library/Collision/CollisionDirector.h
+++ b/lib/al/include/Library/Collision/CollisionDirector.h
@@ -3,7 +3,7 @@
 #include <container/seadPtrArray.h>
 #include <math/seadVector.h>
 #include <prim/seadDelegate.h>
-#include "al/Library/Execute/IUseExecutor.h"
+#include "Library/Execute/IUseExecutor.h"
 
 namespace al {
 class ICollisionPartsKeeper;
diff --git a/lib/al/Library/Collision/IUseCollision.h b/lib/al/include/Library/Collision/IUseCollision.h
similarity index 100%
rename from lib/al/Library/Collision/IUseCollision.h
rename to lib/al/include/Library/Collision/IUseCollision.h
diff --git a/lib/al/Library/Controller/GamePadSystem.h b/lib/al/include/Library/Controller/GamePadSystem.h
similarity index 100%
rename from lib/al/Library/Controller/GamePadSystem.h
rename to lib/al/include/Library/Controller/GamePadSystem.h
diff --git a/lib/al/Library/Controller/InputFunction.h b/lib/al/include/Library/Controller/InputFunction.h
similarity index 100%
rename from lib/al/Library/Controller/InputFunction.h
rename to lib/al/include/Library/Controller/InputFunction.h
diff --git a/lib/al/Library/Controller/JoyPadAccelPoseAnalyzer.h b/lib/al/include/Library/Controller/JoyPadAccelPoseAnalyzer.h
similarity index 100%
rename from lib/al/Library/Controller/JoyPadAccelPoseAnalyzer.h
rename to lib/al/include/Library/Controller/JoyPadAccelPoseAnalyzer.h
diff --git a/lib/al/Library/Demo/DemoFunction.h b/lib/al/include/Library/Demo/DemoFunction.h
similarity index 100%
rename from lib/al/Library/Demo/DemoFunction.h
rename to lib/al/include/Library/Demo/DemoFunction.h
diff --git a/lib/al/Library/Draw/GraphicsFunction.h b/lib/al/include/Library/Draw/GraphicsFunction.h
similarity index 100%
rename from lib/al/Library/Draw/GraphicsFunction.h
rename to lib/al/include/Library/Draw/GraphicsFunction.h
diff --git a/lib/al/Library/Effect/EffectKeeper.h b/lib/al/include/Library/Effect/EffectKeeper.h
similarity index 100%
rename from lib/al/Library/Effect/EffectKeeper.h
rename to lib/al/include/Library/Effect/EffectKeeper.h
diff --git a/lib/al/Library/Effect/EffectSystemInfo.h b/lib/al/include/Library/Effect/EffectSystemInfo.h
similarity index 100%
rename from lib/al/Library/Effect/EffectSystemInfo.h
rename to lib/al/include/Library/Effect/EffectSystemInfo.h
diff --git a/lib/al/Library/Effect/IUseEffectKeeper.h b/lib/al/include/Library/Effect/IUseEffectKeeper.h
similarity index 100%
rename from lib/al/Library/Effect/IUseEffectKeeper.h
rename to lib/al/include/Library/Effect/IUseEffectKeeper.h
diff --git a/lib/al/Library/Execute/ActorExecuteInfo.h b/lib/al/include/Library/Execute/ActorExecuteInfo.h
similarity index 100%
rename from lib/al/Library/Execute/ActorExecuteInfo.h
rename to lib/al/include/Library/Execute/ActorExecuteInfo.h
diff --git a/lib/al/Library/Execute/ExecuteDirector.h b/lib/al/include/Library/Execute/ExecuteDirector.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteDirector.h
rename to lib/al/include/Library/Execute/ExecuteDirector.h
diff --git a/lib/al/Library/Execute/ExecuteOrder.h b/lib/al/include/Library/Execute/ExecuteOrder.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteOrder.h
rename to lib/al/include/Library/Execute/ExecuteOrder.h
diff --git a/lib/al/Library/Execute/ExecuteRequestKeeper.h b/lib/al/include/Library/Execute/ExecuteRequestKeeper.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteRequestKeeper.h
rename to lib/al/include/Library/Execute/ExecuteRequestKeeper.h
diff --git a/lib/al/Library/Execute/ExecuteSystemInitInfo.h b/lib/al/include/Library/Execute/ExecuteSystemInitInfo.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteSystemInitInfo.h
rename to lib/al/include/Library/Execute/ExecuteSystemInitInfo.h
diff --git a/lib/al/Library/Execute/ExecuteTable.h b/lib/al/include/Library/Execute/ExecuteTable.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteTable.h
rename to lib/al/include/Library/Execute/ExecuteTable.h
diff --git a/lib/al/Library/Execute/ExecuteTableHolderDraw.h b/lib/al/include/Library/Execute/ExecuteTableHolderDraw.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteTableHolderDraw.h
rename to lib/al/include/Library/Execute/ExecuteTableHolderDraw.h
diff --git a/lib/al/Library/Execute/ExecuteTableHolderUpdate.h b/lib/al/include/Library/Execute/ExecuteTableHolderUpdate.h
similarity index 100%
rename from lib/al/Library/Execute/ExecuteTableHolderUpdate.h
rename to lib/al/include/Library/Execute/ExecuteTableHolderUpdate.h
diff --git a/lib/al/Library/Execute/ExecuteTablesImpl.h b/lib/al/include/Library/Execute/ExecuteTablesImpl.h
similarity index 99%
rename from lib/al/Library/Execute/ExecuteTablesImpl.h
rename to lib/al/include/Library/Execute/ExecuteTablesImpl.h
index 103285cb..789cead4 100644
--- a/lib/al/Library/Execute/ExecuteTablesImpl.h
+++ b/lib/al/include/Library/Execute/ExecuteTablesImpl.h
@@ -1,8 +1,8 @@
-#include "al/Library/Execute/ExecuteOrder.h"
-#include "al/Library/Execute/ExecuteTable.h"
+#include "Library/Execute/ExecuteOrder.h"
+#include "Library/Execute/ExecuteTable.h"
 
-#include "al/Library/Execute/ExecuteTableHolderDraw.h"
-#include "al/Library/Execute/ExecuteTableHolderUpdate.h"
+#include "Library/Execute/ExecuteTableHolderDraw.h"
+#include "Library/Execute/ExecuteTableHolderUpdate.h"
 
 static constexpr al::ExecuteOrder drawTableArr[] = {
     // ３Ｄ（カリング）
diff --git a/lib/al/Library/Execute/ExecutorListBase.h b/lib/al/include/Library/Execute/ExecutorListBase.h
similarity index 100%
rename from lib/al/Library/Execute/ExecutorListBase.h
rename to lib/al/include/Library/Execute/ExecutorListBase.h
diff --git a/lib/al/Library/Execute/IUseExecutor.h b/lib/al/include/Library/Execute/IUseExecutor.h
similarity index 100%
rename from lib/al/Library/Execute/IUseExecutor.h
rename to lib/al/include/Library/Execute/IUseExecutor.h
diff --git a/lib/al/Library/Execute/LayoutExecuteInfo.h b/lib/al/include/Library/Execute/LayoutExecuteInfo.h
similarity index 100%
rename from lib/al/Library/Execute/LayoutExecuteInfo.h
rename to lib/al/include/Library/Execute/LayoutExecuteInfo.h
diff --git a/lib/al/Library/Factory/Factory.h b/lib/al/include/Library/Factory/Factory.h
similarity index 100%
rename from lib/al/Library/Factory/Factory.h
rename to lib/al/include/Library/Factory/Factory.h
diff --git a/lib/al/Library/File/FileUtil.h b/lib/al/include/Library/File/FileUtil.h
similarity index 100%
rename from lib/al/Library/File/FileUtil.h
rename to lib/al/include/Library/File/FileUtil.h
diff --git a/lib/al/Library/HitSensor/HitSensorKeeper.h b/lib/al/include/Library/HitSensor/HitSensorKeeper.h
similarity index 86%
rename from lib/al/Library/HitSensor/HitSensorKeeper.h
rename to lib/al/include/Library/HitSensor/HitSensorKeeper.h
index 670f89d3..e6283337 100755
--- a/lib/al/Library/HitSensor/HitSensorKeeper.h
+++ b/lib/al/include/Library/HitSensor/HitSensorKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HitSensor/HitSensor.h"
+#include "Library/HitSensor/HitSensor.h"
 
 namespace al {
 class HitSensorKeeper {
diff --git a/lib/al/Library/HitSensor/SensorFunction.h b/lib/al/include/Library/HitSensor/SensorFunction.h
similarity index 100%
rename from lib/al/Library/HitSensor/SensorFunction.h
rename to lib/al/include/Library/HitSensor/SensorFunction.h
diff --git a/lib/al/Library/HostIO/HioNode.h b/lib/al/include/Library/HostIO/HioNode.h
similarity index 100%
rename from lib/al/Library/HostIO/HioNode.h
rename to lib/al/include/Library/HostIO/HioNode.h
diff --git a/lib/al/Library/HostIO/IUseName.h b/lib/al/include/Library/HostIO/IUseName.h
similarity index 100%
rename from lib/al/Library/HostIO/IUseName.h
rename to lib/al/include/Library/HostIO/IUseName.h
diff --git a/lib/al/Library/Joint/JointControllerKeeper.h b/lib/al/include/Library/Joint/JointControllerKeeper.h
similarity index 100%
rename from lib/al/Library/Joint/JointControllerKeeper.h
rename to lib/al/include/Library/Joint/JointControllerKeeper.h
diff --git a/lib/al/Library/Layout/IUseLayout.h b/lib/al/include/Library/Layout/IUseLayout.h
similarity index 80%
rename from lib/al/Library/Layout/IUseLayout.h
rename to lib/al/include/Library/Layout/IUseLayout.h
index b2a500f8..d19c3cc5 100644
--- a/lib/al/Library/Layout/IUseLayout.h
+++ b/lib/al/include/Library/Layout/IUseLayout.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/IUseName.h"
+#include "Library/HostIO/IUseName.h"
 
 namespace al {
 class LayoutKeeper;
diff --git a/lib/al/Library/Layout/IUseLayoutAction.h b/lib/al/include/Library/Layout/IUseLayoutAction.h
similarity index 82%
rename from lib/al/Library/Layout/IUseLayoutAction.h
rename to lib/al/include/Library/Layout/IUseLayoutAction.h
index 88eb3086..3e31bdaa 100644
--- a/lib/al/Library/Layout/IUseLayoutAction.h
+++ b/lib/al/include/Library/Layout/IUseLayoutAction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/IUseName.h"
+#include "Library/HostIO/IUseName.h"
 
 namespace al {
 class LayoutActionKeeper;
diff --git a/lib/al/Library/Layout/LayoutActionFunction.h b/lib/al/include/Library/Layout/LayoutActionFunction.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutActionFunction.h
rename to lib/al/include/Library/Layout/LayoutActionFunction.h
diff --git a/lib/al/Library/Layout/LayoutActionKeeper.h b/lib/al/include/Library/Layout/LayoutActionKeeper.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutActionKeeper.h
rename to lib/al/include/Library/Layout/LayoutActionKeeper.h
diff --git a/lib/al/Library/Layout/LayoutActor.h b/lib/al/include/Library/Layout/LayoutActor.h
similarity index 86%
rename from lib/al/Library/Layout/LayoutActor.h
rename to lib/al/include/Library/Layout/LayoutActor.h
index 8a7671c2..d6aa709b 100644
--- a/lib/al/Library/Layout/LayoutActor.h
+++ b/lib/al/include/Library/Layout/LayoutActor.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Camera/IUseCamera.h"
-#include "al/Library/Effect/IUseEffectKeeper.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Layout/IUseLayout.h"
-#include "al/Library/Layout/IUseLayoutAction.h"
-#include "al/Library/Message/IUseMessageSystem.h"
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Scene/IUseSceneObjHolder.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Camera/IUseCamera.h"
+#include "Library/Effect/IUseEffectKeeper.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Layout/IUseLayout.h"
+#include "Library/Layout/IUseLayoutAction.h"
+#include "Library/Message/IUseMessageSystem.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Scene/IUseSceneObjHolder.h"
 
 namespace al {
 class NerveKeeper;
diff --git a/lib/al/Library/Layout/LayoutActorGroup.h b/lib/al/include/Library/Layout/LayoutActorGroup.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutActorGroup.h
rename to lib/al/include/Library/Layout/LayoutActorGroup.h
diff --git a/lib/al/Library/Layout/LayoutActorUtil.h b/lib/al/include/Library/Layout/LayoutActorUtil.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutActorUtil.h
rename to lib/al/include/Library/Layout/LayoutActorUtil.h
diff --git a/lib/al/Library/Layout/LayoutKeeper.h b/lib/al/include/Library/Layout/LayoutKeeper.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutKeeper.h
rename to lib/al/include/Library/Layout/LayoutKeeper.h
diff --git a/lib/al/Library/Layout/LayoutPartsActorKeeper.h b/lib/al/include/Library/Layout/LayoutPartsActorKeeper.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutPartsActorKeeper.h
rename to lib/al/include/Library/Layout/LayoutPartsActorKeeper.h
diff --git a/lib/al/Library/Layout/LayoutSceneInfo.h b/lib/al/include/Library/Layout/LayoutSceneInfo.h
similarity index 100%
rename from lib/al/Library/Layout/LayoutSceneInfo.h
rename to lib/al/include/Library/Layout/LayoutSceneInfo.h
diff --git a/lib/al/Library/LiveActor/ActorActionFunction.h b/lib/al/include/Library/LiveActor/ActorActionFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorActionFunction.h
rename to lib/al/include/Library/LiveActor/ActorActionFunction.h
diff --git a/lib/al/Library/LiveActor/ActorClippingFunction.h b/lib/al/include/Library/LiveActor/ActorClippingFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorClippingFunction.h
rename to lib/al/include/Library/LiveActor/ActorClippingFunction.h
diff --git a/lib/al/Library/LiveActor/ActorCollisionFunction.h b/lib/al/include/Library/LiveActor/ActorCollisionFunction.h
similarity index 99%
rename from lib/al/Library/LiveActor/ActorCollisionFunction.h
rename to lib/al/include/Library/LiveActor/ActorCollisionFunction.h
index fbeec358..6f387856 100644
--- a/lib/al/Library/LiveActor/ActorCollisionFunction.h
+++ b/lib/al/include/Library/LiveActor/ActorCollisionFunction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 class TriangleFilterBase;
diff --git a/lib/al/Library/LiveActor/ActorFactory.h b/lib/al/include/Library/LiveActor/ActorFactory.h
similarity index 82%
rename from lib/al/Library/LiveActor/ActorFactory.h
rename to lib/al/include/Library/LiveActor/ActorFactory.h
index 20e020b6..2ffac019 100644
--- a/lib/al/Library/LiveActor/ActorFactory.h
+++ b/lib/al/include/Library/LiveActor/ActorFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/Factory/Factory.h"
+#include "Library/Factory/Factory.h"
 
 namespace al {
 class LiveActor;
diff --git a/lib/al/Library/LiveActor/ActorFlagFunction.h b/lib/al/include/Library/LiveActor/ActorFlagFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorFlagFunction.h
rename to lib/al/include/Library/LiveActor/ActorFlagFunction.h
diff --git a/lib/al/Library/LiveActor/ActorInitInfo.h b/lib/al/include/Library/LiveActor/ActorInitInfo.h
similarity index 99%
rename from lib/al/Library/LiveActor/ActorInitInfo.h
rename to lib/al/include/Library/LiveActor/ActorInitInfo.h
index c1e89c50..b260fd44 100755
--- a/lib/al/Library/LiveActor/ActorInitInfo.h
+++ b/lib/al/include/Library/LiveActor/ActorInitInfo.h
@@ -7,9 +7,9 @@
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
 #include <prim/seadSafeString.h>
-#include "al/Library/LiveActor/ActorSceneInfo.h"
-#include "al/Library/Nerve/NerveUtil.h"
-#include "al/Library/Placement/PlacementInfo.h"
+#include "Library/LiveActor/ActorSceneInfo.h"
+#include "Library/Nerve/NerveUtil.h"
+#include "Library/Placement/PlacementInfo.h"
 
 namespace al {
 class LiveActor;
diff --git a/lib/al/Library/LiveActor/ActorModelFunction.h b/lib/al/include/Library/LiveActor/ActorModelFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorModelFunction.h
rename to lib/al/include/Library/LiveActor/ActorModelFunction.h
diff --git a/lib/al/Library/LiveActor/ActorMovementFunction.h b/lib/al/include/Library/LiveActor/ActorMovementFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorMovementFunction.h
rename to lib/al/include/Library/LiveActor/ActorMovementFunction.h
diff --git a/lib/al/Library/LiveActor/ActorParamHolder.h b/lib/al/include/Library/LiveActor/ActorParamHolder.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorParamHolder.h
rename to lib/al/include/Library/LiveActor/ActorParamHolder.h
diff --git a/lib/al/Library/LiveActor/ActorPoseKeeper.h b/lib/al/include/Library/LiveActor/ActorPoseKeeper.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorPoseKeeper.h
rename to lib/al/include/Library/LiveActor/ActorPoseKeeper.h
diff --git a/lib/al/Library/LiveActor/ActorResourceFunction.h b/lib/al/include/Library/LiveActor/ActorResourceFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorResourceFunction.h
rename to lib/al/include/Library/LiveActor/ActorResourceFunction.h
diff --git a/lib/al/Library/LiveActor/ActorSceneInfo.h b/lib/al/include/Library/LiveActor/ActorSceneInfo.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorSceneInfo.h
rename to lib/al/include/Library/LiveActor/ActorSceneInfo.h
diff --git a/lib/al/Library/LiveActor/ActorSensorFunction.h b/lib/al/include/Library/LiveActor/ActorSensorFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorSensorFunction.h
rename to lib/al/include/Library/LiveActor/ActorSensorFunction.h
diff --git a/lib/al/Library/LiveActor/ActorSensorMsgFunction.h b/lib/al/include/Library/LiveActor/ActorSensorMsgFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/ActorSensorMsgFunction.h
rename to lib/al/include/Library/LiveActor/ActorSensorMsgFunction.h
diff --git a/lib/al/Library/LiveActor/LiveActor.h b/lib/al/include/Library/LiveActor/LiveActor.h
similarity index 93%
rename from lib/al/Library/LiveActor/LiveActor.h
rename to lib/al/include/Library/LiveActor/LiveActor.h
index 58cd243e..6e5f6545 100755
--- a/lib/al/Library/LiveActor/LiveActor.h
+++ b/lib/al/include/Library/LiveActor/LiveActor.h
@@ -1,16 +1,16 @@
 #pragma once
 
 #include <math/seadMatrix.h>
-#include "al/Library/Area/IUseAreaObj.h"
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Camera/IUseCamera.h"
-#include "al/Library/Collision/IUseCollision.h"
-#include "al/Library/Effect/IUseEffectKeeper.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Rail/IUseRail.h"
-#include "al/Library/Scene/IUseSceneObjHolder.h"
-#include "al/Library/Stage/IUseStageSwitch.h"
+#include "Library/Area/IUseAreaObj.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Camera/IUseCamera.h"
+#include "Library/Collision/IUseCollision.h"
+#include "Library/Effect/IUseEffectKeeper.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Rail/IUseRail.h"
+#include "Library/Scene/IUseSceneObjHolder.h"
+#include "Library/Stage/IUseStageSwitch.h"
 
 namespace al {
 class ActorPoseKeeperBase;
diff --git a/lib/al/Library/LiveActor/LiveActorFunction.h b/lib/al/include/Library/LiveActor/LiveActorFunction.h
similarity index 98%
rename from lib/al/Library/LiveActor/LiveActorFunction.h
rename to lib/al/include/Library/LiveActor/LiveActorFunction.h
index febbe300..bfd57c5d 100644
--- a/lib/al/Library/LiveActor/LiveActorFunction.h
+++ b/lib/al/include/Library/LiveActor/LiveActorFunction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 void isExistSubActorKeeper(const LiveActor*);
diff --git a/lib/al/Library/LiveActor/LiveActorGroup.h b/lib/al/include/Library/LiveActor/LiveActorGroup.h
similarity index 97%
rename from lib/al/Library/LiveActor/LiveActorGroup.h
rename to lib/al/include/Library/LiveActor/LiveActorGroup.h
index f58e9992..8c595da5 100755
--- a/lib/al/Library/LiveActor/LiveActorGroup.h
+++ b/lib/al/include/Library/LiveActor/LiveActorGroup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class LiveActor;
diff --git a/lib/al/Library/LiveActor/LiveActorUtil.h b/lib/al/include/Library/LiveActor/LiveActorUtil.h
similarity index 96%
rename from lib/al/Library/LiveActor/LiveActorUtil.h
rename to lib/al/include/Library/LiveActor/LiveActorUtil.h
index 01c36596..55c03154 100644
--- a/lib/al/Library/LiveActor/LiveActorUtil.h
+++ b/lib/al/include/Library/LiveActor/LiveActorUtil.h
@@ -4,8 +4,8 @@
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
 #include <prim/seadSafeString.h>
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Nerve/Nerve.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Nerve/Nerve.h"
 
 namespace al {
 
diff --git a/lib/al/Library/LiveActor/SubActorFunction.h b/lib/al/include/Library/LiveActor/SubActorFunction.h
similarity index 100%
rename from lib/al/Library/LiveActor/SubActorFunction.h
rename to lib/al/include/Library/LiveActor/SubActorFunction.h
diff --git a/lib/al/Library/LiveActor/SubActorKeeper.h b/lib/al/include/Library/LiveActor/SubActorKeeper.h
similarity index 99%
rename from lib/al/Library/LiveActor/SubActorKeeper.h
rename to lib/al/include/Library/LiveActor/SubActorKeeper.h
index 2a41a4a0..83176c81 100644
--- a/lib/al/Library/LiveActor/SubActorKeeper.h
+++ b/lib/al/include/Library/LiveActor/SubActorKeeper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorInitInfo.h"
 
 // TODO: bring this up to sanae
 // temp solution to figure out a solution to bitflag enums (stole this right from nvn headers)
diff --git a/lib/al/Library/MapObj/FixMapParts.h b/lib/al/include/Library/MapObj/FixMapParts.h
similarity index 90%
rename from lib/al/Library/MapObj/FixMapParts.h
rename to lib/al/include/Library/MapObj/FixMapParts.h
index 9e56fd42..a1681536 100644
--- a/lib/al/Library/MapObj/FixMapParts.h
+++ b/lib/al/include/Library/MapObj/FixMapParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 class FixMapParts : public LiveActor {
diff --git a/lib/al/Library/MapObj/MtxUtil.h b/lib/al/include/Library/MapObj/MtxUtil.h
similarity index 100%
rename from lib/al/Library/MapObj/MtxUtil.h
rename to lib/al/include/Library/MapObj/MtxUtil.h
diff --git a/lib/al/Library/Math/InOutParam.h b/lib/al/include/Library/Math/InOutParam.h
similarity index 100%
rename from lib/al/Library/Math/InOutParam.h
rename to lib/al/include/Library/Math/InOutParam.h
diff --git a/lib/al/Library/Math/IntervalTrigger.h b/lib/al/include/Library/Math/IntervalTrigger.h
similarity index 100%
rename from lib/al/Library/Math/IntervalTrigger.h
rename to lib/al/include/Library/Math/IntervalTrigger.h
diff --git a/lib/al/Library/Math/MathGridUtil.h b/lib/al/include/Library/Math/MathGridUtil.h
similarity index 100%
rename from lib/al/Library/Math/MathGridUtil.h
rename to lib/al/include/Library/Math/MathGridUtil.h
diff --git a/lib/al/Library/Math/MathRandomUtil.h b/lib/al/include/Library/Math/MathRandomUtil.h
similarity index 100%
rename from lib/al/Library/Math/MathRandomUtil.h
rename to lib/al/include/Library/Math/MathRandomUtil.h
diff --git a/lib/al/Library/Math/MathUtil.h b/lib/al/include/Library/Math/MathUtil.h
similarity index 100%
rename from lib/al/Library/Math/MathUtil.h
rename to lib/al/include/Library/Math/MathUtil.h
diff --git a/lib/al/Library/Math/VectorUtil.h b/lib/al/include/Library/Math/VectorUtil.h
similarity index 100%
rename from lib/al/Library/Math/VectorUtil.h
rename to lib/al/include/Library/Math/VectorUtil.h
diff --git a/lib/al/Library/Memory/HeapUtil.h b/lib/al/include/Library/Memory/HeapUtil.h
similarity index 100%
rename from lib/al/Library/Memory/HeapUtil.h
rename to lib/al/include/Library/Memory/HeapUtil.h
diff --git a/lib/al/Library/Message/IUseMessageSystem.h b/lib/al/include/Library/Message/IUseMessageSystem.h
similarity index 100%
rename from lib/al/Library/Message/IUseMessageSystem.h
rename to lib/al/include/Library/Message/IUseMessageSystem.h
diff --git a/lib/al/Library/Message/MessageSystem.h b/lib/al/include/Library/Message/MessageSystem.h
similarity index 100%
rename from lib/al/Library/Message/MessageSystem.h
rename to lib/al/include/Library/Message/MessageSystem.h
diff --git a/lib/al/Library/Model/ModelDrawerBase.h b/lib/al/include/Library/Model/ModelDrawerBase.h
similarity index 96%
rename from lib/al/Library/Model/ModelDrawerBase.h
rename to lib/al/include/Library/Model/ModelDrawerBase.h
index c5a78269..90390e75 100644
--- a/lib/al/Library/Model/ModelDrawerBase.h
+++ b/lib/al/include/Library/Model/ModelDrawerBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace agl {
 class DrawContext;
diff --git a/lib/al/Library/Model/ModelKeeper.h b/lib/al/include/Library/Model/ModelKeeper.h
similarity index 83%
rename from lib/al/Library/Model/ModelKeeper.h
rename to lib/al/include/Library/Model/ModelKeeper.h
index 106f6ce9..78c72a51 100755
--- a/lib/al/Library/Model/ModelKeeper.h
+++ b/lib/al/include/Library/Model/ModelKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class ActorResource;
diff --git a/lib/al/Library/Model/PartsModel.h b/lib/al/include/Library/Model/PartsModel.h
similarity index 97%
rename from lib/al/Library/Model/PartsModel.h
rename to lib/al/include/Library/Model/PartsModel.h
index 32f5d9b7..bf8c0522 100644
--- a/lib/al/Library/Model/PartsModel.h
+++ b/lib/al/include/Library/Model/PartsModel.h
@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Nerve/IUseNerve.h b/lib/al/include/Library/Nerve/IUseNerve.h
similarity index 100%
rename from lib/al/Library/Nerve/IUseNerve.h
rename to lib/al/include/Library/Nerve/IUseNerve.h
diff --git a/lib/al/Library/Nerve/Nerve.h b/lib/al/include/Library/Nerve/Nerve.h
similarity index 100%
rename from lib/al/Library/Nerve/Nerve.h
rename to lib/al/include/Library/Nerve/Nerve.h
diff --git a/lib/al/Library/Nerve/NerveAction.h b/lib/al/include/Library/Nerve/NerveAction.h
similarity index 78%
rename from lib/al/Library/Nerve/NerveAction.h
rename to lib/al/include/Library/Nerve/NerveAction.h
index df928b54..7866d749 100755
--- a/lib/al/Library/Nerve/NerveAction.h
+++ b/lib/al/include/Library/Nerve/NerveAction.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveUtil.h"
 
 namespace al {
 class NerveAction : public Nerve {
diff --git a/lib/al/Library/Nerve/NerveExecutor.h b/lib/al/include/Library/Nerve/NerveExecutor.h
similarity index 83%
rename from lib/al/Library/Nerve/NerveExecutor.h
rename to lib/al/include/Library/Nerve/NerveExecutor.h
index 25363794..7e9d6316 100755
--- a/lib/al/Library/Nerve/NerveExecutor.h
+++ b/lib/al/include/Library/Nerve/NerveExecutor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Nerve/IUseNerve.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Nerve/IUseNerve.h"
 
 namespace al {
 class Nerve;
diff --git a/lib/al/Library/Nerve/NerveKeeper.h b/lib/al/include/Library/Nerve/NerveKeeper.h
similarity index 100%
rename from lib/al/Library/Nerve/NerveKeeper.h
rename to lib/al/include/Library/Nerve/NerveKeeper.h
diff --git a/lib/al/Library/Nerve/NerveSetupUtil.h b/lib/al/include/Library/Nerve/NerveSetupUtil.h
similarity index 93%
rename from lib/al/Library/Nerve/NerveSetupUtil.h
rename to lib/al/include/Library/Nerve/NerveSetupUtil.h
index d84a6ec0..31c0fa8c 100644
--- a/lib/al/Library/Nerve/NerveSetupUtil.h
+++ b/lib/al/include/Library/Nerve/NerveSetupUtil.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveKeeper.h"
 
 /*
 
diff --git a/lib/al/Library/Nerve/NerveStateBase.h b/lib/al/include/Library/Nerve/NerveStateBase.h
similarity index 94%
rename from lib/al/Library/Nerve/NerveStateBase.h
rename to lib/al/include/Library/Nerve/NerveStateBase.h
index aecdea68..5a9335d7 100755
--- a/lib/al/Library/Nerve/NerveStateBase.h
+++ b/lib/al/include/Library/Nerve/NerveStateBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/Nerve/NerveExecutor.h"
+#include "Library/Nerve/NerveExecutor.h"
 
 namespace al {
 class NerveStateBase : public NerveExecutor {
diff --git a/lib/al/Library/Nerve/NerveStateCtrl.h b/lib/al/include/Library/Nerve/NerveStateCtrl.h
similarity index 88%
rename from lib/al/Library/Nerve/NerveStateCtrl.h
rename to lib/al/include/Library/Nerve/NerveStateCtrl.h
index e08ebfac..29d8a663 100755
--- a/lib/al/Library/Nerve/NerveStateCtrl.h
+++ b/lib/al/include/Library/Nerve/NerveStateCtrl.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveStateBase.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveStateBase.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Nerve/NerveUtil.h b/lib/al/include/Library/Nerve/NerveUtil.h
similarity index 100%
rename from lib/al/Library/Nerve/NerveUtil.h
rename to lib/al/include/Library/Nerve/NerveUtil.h
diff --git a/lib/al/Library/Network/HtmlViewer.h b/lib/al/include/Library/Network/HtmlViewer.h
similarity index 100%
rename from lib/al/Library/Network/HtmlViewer.h
rename to lib/al/include/Library/Network/HtmlViewer.h
diff --git a/lib/al/Library/Obj/BreakModel.h b/lib/al/include/Library/Obj/BreakModel.h
similarity index 94%
rename from lib/al/Library/Obj/BreakModel.h
rename to lib/al/include/Library/Obj/BreakModel.h
index 6bcefda1..f2f41299 100644
--- a/lib/al/Library/Obj/BreakModel.h
+++ b/lib/al/include/Library/Obj/BreakModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Obj/CollisionObj.h b/lib/al/include/Library/Obj/CollisionObj.h
similarity index 88%
rename from lib/al/Library/Obj/CollisionObj.h
rename to lib/al/include/Library/Obj/CollisionObj.h
index 65d37b9b..4f238510 100644
--- a/lib/al/Library/Obj/CollisionObj.h
+++ b/lib/al/include/Library/Obj/CollisionObj.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Resource/Resource.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Resource/Resource.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Obj/DepthShadowModel.h b/lib/al/include/Library/Obj/DepthShadowModel.h
similarity index 91%
rename from lib/al/Library/Obj/DepthShadowModel.h
rename to lib/al/include/Library/Obj/DepthShadowModel.h
index e30309ee..d84df9ea 100644
--- a/lib/al/Library/Obj/DepthShadowModel.h
+++ b/lib/al/include/Library/Obj/DepthShadowModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Obj/ModelDrawParts.h b/lib/al/include/Library/Obj/ModelDrawParts.h
similarity index 85%
rename from lib/al/Library/Obj/ModelDrawParts.h
rename to lib/al/include/Library/Obj/ModelDrawParts.h
index ddaac4c9..81d5d5d6 100644
--- a/lib/al/Library/Obj/ModelDrawParts.h
+++ b/lib/al/include/Library/Obj/ModelDrawParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Obj/PartsModel.h b/lib/al/include/Library/Obj/PartsModel.h
similarity index 97%
rename from lib/al/Library/Obj/PartsModel.h
rename to lib/al/include/Library/Obj/PartsModel.h
index aad67b21..51c08bed 100644
--- a/lib/al/Library/Obj/PartsModel.h
+++ b/lib/al/include/Library/Obj/PartsModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Obj/SilhouetteModel.h b/lib/al/include/Library/Obj/SilhouetteModel.h
similarity index 82%
rename from lib/al/Library/Obj/SilhouetteModel.h
rename to lib/al/include/Library/Obj/SilhouetteModel.h
index a1d88a23..e082b467 100644
--- a/lib/al/Library/Obj/SilhouetteModel.h
+++ b/lib/al/include/Library/Obj/SilhouetteModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Obj/SimpleCircleShadowXZ.h b/lib/al/include/Library/Obj/SimpleCircleShadowXZ.h
similarity index 95%
rename from lib/al/Library/Obj/SimpleCircleShadowXZ.h
rename to lib/al/include/Library/Obj/SimpleCircleShadowXZ.h
index 963deb63..01fec7a9 100644
--- a/lib/al/Library/Obj/SimpleCircleShadowXZ.h
+++ b/lib/al/include/Library/Obj/SimpleCircleShadowXZ.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Placement/PlacementFunction.h b/lib/al/include/Library/Placement/PlacementFunction.h
similarity index 100%
rename from lib/al/Library/Placement/PlacementFunction.h
rename to lib/al/include/Library/Placement/PlacementFunction.h
diff --git a/lib/al/Library/Placement/PlacementId.h b/lib/al/include/Library/Placement/PlacementId.h
similarity index 100%
rename from lib/al/Library/Placement/PlacementId.h
rename to lib/al/include/Library/Placement/PlacementId.h
diff --git a/lib/al/Library/Placement/PlacementInfo.h b/lib/al/include/Library/Placement/PlacementInfo.h
similarity index 91%
rename from lib/al/Library/Placement/PlacementInfo.h
rename to lib/al/include/Library/Placement/PlacementInfo.h
index a9102060..9c1f4760 100755
--- a/lib/al/Library/Placement/PlacementInfo.h
+++ b/lib/al/include/Library/Placement/PlacementInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <resource/seadResource.h>
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlIter.h"
 
 namespace al {
 class PlacementInfo {
diff --git a/lib/al/Library/Play/Camera/CameraVerticalAbsorber.h b/lib/al/include/Library/Play/Camera/CameraVerticalAbsorber.h
similarity index 84%
rename from lib/al/Library/Play/Camera/CameraVerticalAbsorber.h
rename to lib/al/include/Library/Play/Camera/CameraVerticalAbsorber.h
index 9c7a8c06..4161cd19 100644
--- a/lib/al/Library/Play/Camera/CameraVerticalAbsorber.h
+++ b/lib/al/include/Library/Play/Camera/CameraVerticalAbsorber.h
@@ -3,13 +3,13 @@
 #include <gfx/seadCamera.h>
 #include <gfx/seadProjection.h>
 
-#include "al/Library/Camera/CameraPoserFunction.h"
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveExecutor.h"
-#include "al/Library/Nerve/NerveKeeper.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
-#include "al/Library/Nerve/NerveUtil.h"
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Camera/CameraPoserFunction.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveExecutor.h"
+#include "Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveUtil.h"
+#include "Library/Yaml/ByamlIter.h"
 
 namespace al {
 class CameraPoser;
diff --git a/lib/al/Library/Player/PlayerHolder.h b/lib/al/include/Library/Player/PlayerHolder.h
similarity index 100%
rename from lib/al/Library/Player/PlayerHolder.h
rename to lib/al/include/Library/Player/PlayerHolder.h
diff --git a/lib/al/Library/Player/PlayerUtil.h b/lib/al/include/Library/Player/PlayerUtil.h
similarity index 100%
rename from lib/al/Library/Player/PlayerUtil.h
rename to lib/al/include/Library/Player/PlayerUtil.h
diff --git a/lib/al/Library/Rail/Graph.h b/lib/al/include/Library/Rail/Graph.h
similarity index 100%
rename from lib/al/Library/Rail/Graph.h
rename to lib/al/include/Library/Rail/Graph.h
diff --git a/lib/al/Library/Rail/IUseRail.h b/lib/al/include/Library/Rail/IUseRail.h
similarity index 100%
rename from lib/al/Library/Rail/IUseRail.h
rename to lib/al/include/Library/Rail/IUseRail.h
diff --git a/lib/al/Library/Rail/Rail.h b/lib/al/include/Library/Rail/Rail.h
similarity index 97%
rename from lib/al/Library/Rail/Rail.h
rename to lib/al/include/Library/Rail/Rail.h
index dbcb806d..adefb24e 100644
--- a/lib/al/Library/Rail/Rail.h
+++ b/lib/al/include/Library/Rail/Rail.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <math/seadVector.h>
-#include "al/Library/Rail/RailPart.h"
+#include "Library/Rail/RailPart.h"
 
 namespace al {
 class PlacementInfo;
diff --git a/lib/al/Library/Rail/RailKeeper.h b/lib/al/include/Library/Rail/RailKeeper.h
similarity index 78%
rename from lib/al/Library/Rail/RailKeeper.h
rename to lib/al/include/Library/Rail/RailKeeper.h
index 0a08f2d7..5a1e4251 100755
--- a/lib/al/Library/Rail/RailKeeper.h
+++ b/lib/al/include/Library/Rail/RailKeeper.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Rail/IUseRail.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Rail/IUseRail.h"
 
 namespace al {
 class RailRider;
diff --git a/lib/al/Library/Rail/RailPart.h b/lib/al/include/Library/Rail/RailPart.h
similarity index 100%
rename from lib/al/Library/Rail/RailPart.h
rename to lib/al/include/Library/Rail/RailPart.h
diff --git a/lib/al/Library/Rail/RailRider.h b/lib/al/include/Library/Rail/RailRider.h
similarity index 100%
rename from lib/al/Library/Rail/RailRider.h
rename to lib/al/include/Library/Rail/RailRider.h
diff --git a/lib/al/Library/Resource/Resource.h b/lib/al/include/Library/Resource/Resource.h
similarity index 100%
rename from lib/al/Library/Resource/Resource.h
rename to lib/al/include/Library/Resource/Resource.h
diff --git a/lib/al/Library/Resource/ResourceHolder.h b/lib/al/include/Library/Resource/ResourceHolder.h
similarity index 100%
rename from lib/al/Library/Resource/ResourceHolder.h
rename to lib/al/include/Library/Resource/ResourceHolder.h
diff --git a/lib/al/Library/Resource/ResourceUtil.h b/lib/al/include/Library/Resource/ResourceUtil.h
similarity index 76%
rename from lib/al/Library/Resource/ResourceUtil.h
rename to lib/al/include/Library/Resource/ResourceUtil.h
index 90375ff4..b67ce16d 100644
--- a/lib/al/Library/Resource/ResourceUtil.h
+++ b/lib/al/include/Library/Resource/ResourceUtil.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "al/Library/Resource/Resource.h"
+#include "Library/Resource/Resource.h"
 
 namespace al {
 
diff --git a/lib/al/include/Library/Scene/GameDataHolderBase.h b/lib/al/include/Library/Scene/GameDataHolderBase.h
new file mode 100644
index 00000000..be610fad
--- /dev/null
+++ b/lib/al/include/Library/Scene/GameDataHolderBase.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "Library/HostIO/HioNode.h"
+#include "Library/Message/IUseMessageSystem.h"
+#include "Library/Scene/ISceneObj.h"
+
+namespace al {
+class GameDataHolderBase : public ISceneObj, HioNode, IUseMessageSystem {};
+}  // namespace al
diff --git a/lib/al/Library/Scene/ISceneObj.h b/lib/al/include/Library/Scene/ISceneObj.h
similarity index 100%
rename from lib/al/Library/Scene/ISceneObj.h
rename to lib/al/include/Library/Scene/ISceneObj.h
diff --git a/lib/al/Library/Scene/IUseSceneObjHolder.h b/lib/al/include/Library/Scene/IUseSceneObjHolder.h
similarity index 100%
rename from lib/al/Library/Scene/IUseSceneObjHolder.h
rename to lib/al/include/Library/Scene/IUseSceneObjHolder.h
diff --git a/lib/al/Library/Scene/Scene.h b/lib/al/include/Library/Scene/Scene.h
similarity index 89%
rename from lib/al/Library/Scene/Scene.h
rename to lib/al/include/Library/Scene/Scene.h
index ed6f6600..b6f3268a 100755
--- a/lib/al/Library/Scene/Scene.h
+++ b/lib/al/include/Library/Scene/Scene.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Camera/IUseCamera.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/Nerve/NerveExecutor.h"
-#include "al/Library/Scene/IUseSceneObjHolder.h"
-#include "al/Project/Scene/SceneInitInfo.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Camera/IUseCamera.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/Nerve/NerveExecutor.h"
+#include "Library/Scene/IUseSceneObjHolder.h"
+#include "Project/Scene/SceneInitInfo.h"
 
 namespace al {
 class AudioDirector;
diff --git a/lib/al/Library/Scene/SceneMsg.h b/lib/al/include/Library/Scene/SceneMsg.h
similarity index 100%
rename from lib/al/Library/Scene/SceneMsg.h
rename to lib/al/include/Library/Scene/SceneMsg.h
diff --git a/lib/al/Library/Scene/SceneMsgCtrl.h b/lib/al/include/Library/Scene/SceneMsgCtrl.h
similarity index 78%
rename from lib/al/Library/Scene/SceneMsgCtrl.h
rename to lib/al/include/Library/Scene/SceneMsgCtrl.h
index c2447547..5f80672a 100644
--- a/lib/al/Library/Scene/SceneMsgCtrl.h
+++ b/lib/al/include/Library/Scene/SceneMsgCtrl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/Scene/SceneMsg.h"
+#include "Library/Scene/SceneMsg.h"
 
 namespace al {
 class SceneMsgCtrl {
diff --git a/lib/al/Library/Scene/SceneObjHolder.h b/lib/al/include/Library/Scene/SceneObjHolder.h
similarity index 100%
rename from lib/al/Library/Scene/SceneObjHolder.h
rename to lib/al/include/Library/Scene/SceneObjHolder.h
diff --git a/lib/al/Library/Scene/SceneUtil.h b/lib/al/include/Library/Scene/SceneUtil.h
similarity index 100%
rename from lib/al/Library/Scene/SceneUtil.h
rename to lib/al/include/Library/Scene/SceneUtil.h
diff --git a/lib/al/Library/Screen/ScreenFunction.h b/lib/al/include/Library/Screen/ScreenFunction.h
similarity index 98%
rename from lib/al/Library/Screen/ScreenFunction.h
rename to lib/al/include/Library/Screen/ScreenFunction.h
index 5a3d5954..146ae4b3 100644
--- a/lib/al/Library/Screen/ScreenFunction.h
+++ b/lib/al/include/Library/Screen/ScreenFunction.h
@@ -7,8 +7,8 @@
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
 
-#include "al/Library/Camera/IUseCamera.h"
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/Camera/IUseCamera.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 
diff --git a/lib/al/Library/Screen/ScreenPointKeeper.h b/lib/al/include/Library/Screen/ScreenPointKeeper.h
similarity index 100%
rename from lib/al/Library/Screen/ScreenPointKeeper.h
rename to lib/al/include/Library/Screen/ScreenPointKeeper.h
diff --git a/lib/al/Library/Se/SeFunction.h b/lib/al/include/Library/Se/SeFunction.h
similarity index 100%
rename from lib/al/Library/Se/SeFunction.h
rename to lib/al/include/Library/Se/SeFunction.h
diff --git a/lib/al/Library/Se/SeKeeper.h b/lib/al/include/Library/Se/SeKeeper.h
similarity index 100%
rename from lib/al/Library/Se/SeKeeper.h
rename to lib/al/include/Library/Se/SeKeeper.h
diff --git a/lib/al/Library/Sequence/IUseSceneCreator.h b/lib/al/include/Library/Sequence/IUseSceneCreator.h
similarity index 100%
rename from lib/al/Library/Sequence/IUseSceneCreator.h
rename to lib/al/include/Library/Sequence/IUseSceneCreator.h
diff --git a/lib/al/Library/Sequence/Sequence.h b/lib/al/include/Library/Sequence/Sequence.h
similarity index 87%
rename from lib/al/Library/Sequence/Sequence.h
rename to lib/al/include/Library/Sequence/Sequence.h
index 85b693f6..d5e0813a 100644
--- a/lib/al/Library/Sequence/Sequence.h
+++ b/lib/al/include/Library/Sequence/Sequence.h
@@ -2,10 +2,10 @@
 
 #include <prim/seadSafeString.h>
 
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Nerve/NerveExecutor.h"
-#include "al/Library/Sequence/IUseSceneCreator.h"
-#include "al/Library/System/GameSystemInfo.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Nerve/NerveExecutor.h"
+#include "Library/Sequence/IUseSceneCreator.h"
+#include "Library/System/GameSystemInfo.h"
 
 namespace al {
 struct GameSystemInfo;
diff --git a/lib/al/Library/Shadow/DepthShadowMapCtrl.h b/lib/al/include/Library/Shadow/DepthShadowMapCtrl.h
similarity index 100%
rename from lib/al/Library/Shadow/DepthShadowMapCtrl.h
rename to lib/al/include/Library/Shadow/DepthShadowMapCtrl.h
diff --git a/lib/al/Library/Shadow/ShadowKeeper.h b/lib/al/include/Library/Shadow/ShadowKeeper.h
similarity index 100%
rename from lib/al/Library/Shadow/ShadowKeeper.h
rename to lib/al/include/Library/Shadow/ShadowKeeper.h
diff --git a/lib/al/Library/Shadow/ShadowMaskCtrl.h b/lib/al/include/Library/Shadow/ShadowMaskCtrl.h
similarity index 100%
rename from lib/al/Library/Shadow/ShadowMaskCtrl.h
rename to lib/al/include/Library/Shadow/ShadowMaskCtrl.h
diff --git a/lib/al/Library/Stage/IUseStageSwitch.h b/lib/al/include/Library/Stage/IUseStageSwitch.h
similarity index 86%
rename from lib/al/Library/Stage/IUseStageSwitch.h
rename to lib/al/include/Library/Stage/IUseStageSwitch.h
index 3e75436f..9727537d 100644
--- a/lib/al/Library/Stage/IUseStageSwitch.h
+++ b/lib/al/include/Library/Stage/IUseStageSwitch.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/IUseName.h"
+#include "Library/HostIO/IUseName.h"
 
 namespace al {
 class StageSwitchKeeper;
diff --git a/lib/al/Library/Stage/StageInfo.h b/lib/al/include/Library/Stage/StageInfo.h
similarity index 100%
rename from lib/al/Library/Stage/StageInfo.h
rename to lib/al/include/Library/Stage/StageInfo.h
diff --git a/lib/al/Library/Stage/StageSwitchKeeper.h b/lib/al/include/Library/Stage/StageSwitchKeeper.h
similarity index 91%
rename from lib/al/Library/Stage/StageSwitchKeeper.h
rename to lib/al/include/Library/Stage/StageSwitchKeeper.h
index 505eb5bb..4c525c1a 100755
--- a/lib/al/Library/Stage/StageSwitchKeeper.h
+++ b/lib/al/include/Library/Stage/StageSwitchKeeper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/HostIO/IUseName.h"
+#include "Library/HostIO/IUseName.h"
 
 namespace al {
 class StageSwitchAccesser;
diff --git a/lib/al/Library/Stage/StageSwitchUtil.h b/lib/al/include/Library/Stage/StageSwitchUtil.h
similarity index 100%
rename from lib/al/Library/Stage/StageSwitchUtil.h
rename to lib/al/include/Library/Stage/StageSwitchUtil.h
diff --git a/lib/al/Library/System/GameSystemInfo.h b/lib/al/include/Library/System/GameSystemInfo.h
similarity index 100%
rename from lib/al/Library/System/GameSystemInfo.h
rename to lib/al/include/Library/System/GameSystemInfo.h
diff --git a/lib/al/Library/System/SystemKit.h b/lib/al/include/Library/System/SystemKit.h
similarity index 100%
rename from lib/al/Library/System/SystemKit.h
rename to lib/al/include/Library/System/SystemKit.h
diff --git a/lib/al/Library/Thread/AsyncFunctorThread.h b/lib/al/include/Library/Thread/AsyncFunctorThread.h
similarity index 94%
rename from lib/al/Library/Thread/AsyncFunctorThread.h
rename to lib/al/include/Library/Thread/AsyncFunctorThread.h
index a8cb6916..ec8d20ea 100644
--- a/lib/al/Library/Thread/AsyncFunctorThread.h
+++ b/lib/al/include/Library/Thread/AsyncFunctorThread.h
@@ -3,7 +3,7 @@
 #include <basis/seadTypes.h>
 #include <mc/seadCoreInfo.h>
 #include <prim/seadSafeString.h>
-#include "al/Library/Thread/FunctorV0M.h"
+#include "Library/Thread/FunctorV0M.h"
 
 namespace sead {
 class DelegateThread;
diff --git a/lib/al/Library/Thread/FunctorV0M.h b/lib/al/include/Library/Thread/FunctorV0M.h
similarity index 100%
rename from lib/al/Library/Thread/FunctorV0M.h
rename to lib/al/include/Library/Thread/FunctorV0M.h
diff --git a/lib/al/Library/Yaml/ByamlContainerHeader.h b/lib/al/include/Library/Yaml/ByamlContainerHeader.h
similarity index 100%
rename from lib/al/Library/Yaml/ByamlContainerHeader.h
rename to lib/al/include/Library/Yaml/ByamlContainerHeader.h
diff --git a/lib/al/Library/Yaml/ByamlData.h b/lib/al/include/Library/Yaml/ByamlData.h
similarity index 100%
rename from lib/al/Library/Yaml/ByamlData.h
rename to lib/al/include/Library/Yaml/ByamlData.h
diff --git a/lib/al/Library/Yaml/ByamlHeader.h b/lib/al/include/Library/Yaml/ByamlHeader.h
similarity index 100%
rename from lib/al/Library/Yaml/ByamlHeader.h
rename to lib/al/include/Library/Yaml/ByamlHeader.h
diff --git a/lib/al/Library/Yaml/ByamlIter.h b/lib/al/include/Library/Yaml/ByamlIter.h
similarity index 97%
rename from lib/al/Library/Yaml/ByamlIter.h
rename to lib/al/include/Library/Yaml/ByamlIter.h
index 371ef3b9..11099b1c 100755
--- a/lib/al/Library/Yaml/ByamlIter.h
+++ b/lib/al/include/Library/Yaml/ByamlIter.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Yaml/ByamlData.h"
-#include "al/Library/Yaml/ByamlHeader.h"
+#include "Library/Yaml/ByamlData.h"
+#include "Library/Yaml/ByamlHeader.h"
 
 namespace al {
 class ByamlIter {
diff --git a/lib/al/Library/Yaml/ByamlUtil.h b/lib/al/include/Library/Yaml/ByamlUtil.h
similarity index 98%
rename from lib/al/Library/Yaml/ByamlUtil.h
rename to lib/al/include/Library/Yaml/ByamlUtil.h
index fcd95fb2..add572e2 100755
--- a/lib/al/Library/Yaml/ByamlUtil.h
+++ b/lib/al/include/Library/Yaml/ByamlUtil.h
@@ -3,8 +3,8 @@
 #include <gfx/seadColor.h>
 #include <math/seadBoundBox.h>
 #include <math/seadVector.h>
-#include "al/Library/Yaml/ByamlData.h"
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlData.h"
+#include "Library/Yaml/ByamlIter.h"
 
 namespace sead {
 class WriteStream;
diff --git a/lib/al/Library/Yaml/Writer/ByamlWriter.h b/lib/al/include/Library/Yaml/Writer/ByamlWriter.h
similarity index 100%
rename from lib/al/Library/Yaml/Writer/ByamlWriter.h
rename to lib/al/include/Library/Yaml/Writer/ByamlWriter.h
diff --git a/lib/al/Library/Yaml/Writer/ByamlWriterBigDataList.h b/lib/al/include/Library/Yaml/Writer/ByamlWriterBigDataList.h
similarity index 100%
rename from lib/al/Library/Yaml/Writer/ByamlWriterBigDataList.h
rename to lib/al/include/Library/Yaml/Writer/ByamlWriterBigDataList.h
diff --git a/lib/al/Library/Yaml/Writer/ByamlWriterData.h b/lib/al/include/Library/Yaml/Writer/ByamlWriterData.h
similarity index 100%
rename from lib/al/Library/Yaml/Writer/ByamlWriterData.h
rename to lib/al/include/Library/Yaml/Writer/ByamlWriterData.h
diff --git a/lib/al/Library/Yaml/Writer/ByamlWriterStringTable.h b/lib/al/include/Library/Yaml/Writer/ByamlWriterStringTable.h
similarity index 100%
rename from lib/al/Library/Yaml/Writer/ByamlWriterStringTable.h
rename to lib/al/include/Library/Yaml/Writer/ByamlWriterStringTable.h
diff --git a/lib/al/Project/HitSensor/HitSensor.h b/lib/al/include/Project/HitSensor/HitSensor.h
similarity index 96%
rename from lib/al/Project/HitSensor/HitSensor.h
rename to lib/al/include/Project/HitSensor/HitSensor.h
index 57d249da..1ee26c9d 100755
--- a/lib/al/Project/HitSensor/HitSensor.h
+++ b/lib/al/include/Project/HitSensor/HitSensor.h
@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Project/HitSensor/SensorHitGroup.h"
+#include "Project/HitSensor/SensorHitGroup.h"
 
 namespace al {
 class LiveActor;
diff --git a/lib/al/Project/HitSensor/SensorHitGroup.h b/lib/al/include/Project/HitSensor/SensorHitGroup.h
similarity index 100%
rename from lib/al/Project/HitSensor/SensorHitGroup.h
rename to lib/al/include/Project/HitSensor/SensorHitGroup.h
diff --git a/lib/al/Project/Item/ActorScoreKeeper.h b/lib/al/include/Project/Item/ActorScoreKeeper.h
similarity index 100%
rename from lib/al/Project/Item/ActorScoreKeeper.h
rename to lib/al/include/Project/Item/ActorScoreKeeper.h
diff --git a/lib/al/Project/Light/ActorPrepassLightKeeper.h b/lib/al/include/Project/Light/ActorPrepassLightKeeper.h
similarity index 100%
rename from lib/al/Project/Light/ActorPrepassLightKeeper.h
rename to lib/al/include/Project/Light/ActorPrepassLightKeeper.h
diff --git a/lib/al/Project/Play/Graphics/GridMeshXZ.h b/lib/al/include/Project/Play/Graphics/GridMeshXZ.h
similarity index 64%
rename from lib/al/Project/Play/Graphics/GridMeshXZ.h
rename to lib/al/include/Project/Play/Graphics/GridMeshXZ.h
index 8e427620..692c2aca 100644
--- a/lib/al/Project/Play/Graphics/GridMeshXZ.h
+++ b/lib/al/include/Project/Play/Graphics/GridMeshXZ.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Project/Play/Graphics/IUseGridMesh.h"
+#include "Project/Play/Graphics/IUseGridMesh.h"
 
 namespace al {
 class GridMeshXZ : public IUseGridMesh {};
diff --git a/lib/al/Project/Play/Graphics/IUseGridMesh.h b/lib/al/include/Project/Play/Graphics/IUseGridMesh.h
similarity index 95%
rename from lib/al/Project/Play/Graphics/IUseGridMesh.h
rename to lib/al/include/Project/Play/Graphics/IUseGridMesh.h
index 0597b2e8..b83bc02d 100644
--- a/lib/al/Project/Play/Graphics/IUseGridMesh.h
+++ b/lib/al/include/Project/Play/Graphics/IUseGridMesh.h
@@ -2,7 +2,7 @@
 
 #include <basis/seadTypes.h>
 #include <common/aglDrawContext.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace agl {
 class IndexStream;
diff --git a/lib/al/Project/Rail/BezierCurve.h b/lib/al/include/Project/Rail/BezierCurve.h
similarity index 100%
rename from lib/al/Project/Rail/BezierCurve.h
rename to lib/al/include/Project/Rail/BezierCurve.h
diff --git a/lib/al/Project/Rail/LinearCurve.h b/lib/al/include/Project/Rail/LinearCurve.h
similarity index 100%
rename from lib/al/Project/Rail/LinearCurve.h
rename to lib/al/include/Project/Rail/LinearCurve.h
diff --git a/lib/al/Project/Scene/SceneCreator.h b/lib/al/include/Project/Scene/SceneCreator.h
similarity index 100%
rename from lib/al/Project/Scene/SceneCreator.h
rename to lib/al/include/Project/Scene/SceneCreator.h
diff --git a/lib/al/Project/Scene/SceneInitInfo.h b/lib/al/include/Project/Scene/SceneInitInfo.h
similarity index 100%
rename from lib/al/Project/Scene/SceneInitInfo.h
rename to lib/al/include/Project/Scene/SceneInitInfo.h
diff --git a/src/al/Library/Base/String.cpp b/lib/al/src/Library/Base/String.cpp
similarity index 97%
rename from src/al/Library/Base/String.cpp
rename to lib/al/src/Library/Base/String.cpp
index dacf33ce..6407e9e6 100755
--- a/src/al/Library/Base/String.cpp
+++ b/lib/al/src/Library/Base/String.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Base/String.h"
+#include "Library/Base/String.h"
 
 #include <cstring>
 #include <resource/seadResource.h>
diff --git a/src/al/Library/Camera/CameraPoser.cpp b/lib/al/src/Library/Camera/CameraPoser.cpp
similarity index 74%
rename from src/al/Library/Camera/CameraPoser.cpp
rename to lib/al/src/Library/Camera/CameraPoser.cpp
index ecb77869..6449825f 100644
--- a/src/al/Library/Camera/CameraPoser.cpp
+++ b/lib/al/src/Library/Camera/CameraPoser.cpp
@@ -1,7 +1,7 @@
-#include "al/Library/Camera/CameraPoser.h"
+#include "Library/Camera/CameraPoser.h"
 
-#include "al/Library/Camera/CameraPoserFunction.h"
-#include "al/Library/Camera/SnapShotCameraCtrl.h"
+#include "Library/Camera/CameraPoserFunction.h"
+#include "Library/Camera/SnapShotCameraCtrl.h"
 
 namespace al {
 void CameraPoser::startSnapShotModeCore() {
diff --git a/src/al/Library/Camera/SnapShotCameraCtrl.cpp b/lib/al/src/Library/Camera/SnapShotCameraCtrl.cpp
similarity index 82%
rename from src/al/Library/Camera/SnapShotCameraCtrl.cpp
rename to lib/al/src/Library/Camera/SnapShotCameraCtrl.cpp
index 20dfa66c..80fc7e5f 100644
--- a/src/al/Library/Camera/SnapShotCameraCtrl.cpp
+++ b/lib/al/src/Library/Camera/SnapShotCameraCtrl.cpp
@@ -1,5 +1,5 @@
-#include "al/Library/Camera/SnapShotCameraCtrl.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Camera/SnapShotCameraCtrl.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace al {
 
diff --git a/src/al/Library/Clipping/ViewIdHolder.cpp b/lib/al/src/Library/Clipping/ViewIdHolder.cpp
similarity index 81%
rename from src/al/Library/Clipping/ViewIdHolder.cpp
rename to lib/al/src/Library/Clipping/ViewIdHolder.cpp
index fe0bfdf0..ef5bccdc 100644
--- a/src/al/Library/Clipping/ViewIdHolder.cpp
+++ b/lib/al/src/Library/Clipping/ViewIdHolder.cpp
@@ -1,7 +1,7 @@
-#include "al/Library/Clipping/ViewIdHolder.h"
-#include "al/Library/Placement/PlacementFunction.h"
-#include "al/Library/Placement/PlacementId.h"
-#include "al/Library/Placement/PlacementInfo.h"
+#include "Library/Clipping/ViewIdHolder.h"
+#include "Library/Placement/PlacementFunction.h"
+#include "Library/Placement/PlacementId.h"
+#include "Library/Placement/PlacementInfo.h"
 
 namespace al {
 ViewIdHolder::ViewIdHolder() {}
diff --git a/src/al/Library/Controller/InputFunction.cpp b/lib/al/src/Library/Controller/InputFunction.cpp
similarity index 99%
rename from src/al/Library/Controller/InputFunction.cpp
rename to lib/al/src/Library/Controller/InputFunction.cpp
index a9510fed..a7d4d4d8 100644
--- a/src/al/Library/Controller/InputFunction.cpp
+++ b/lib/al/src/Library/Controller/InputFunction.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Controller/InputFunction.h"
+#include "Library/Controller/InputFunction.h"
 
 namespace al {
 
diff --git a/src/al/Library/Execute/ActorExecuteInfo.cpp b/lib/al/src/Library/Execute/ActorExecuteInfo.cpp
similarity index 88%
rename from src/al/Library/Execute/ActorExecuteInfo.cpp
rename to lib/al/src/Library/Execute/ActorExecuteInfo.cpp
index 2d9f4a9e..9a3f5b61 100644
--- a/src/al/Library/Execute/ActorExecuteInfo.cpp
+++ b/lib/al/src/Library/Execute/ActorExecuteInfo.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Execute/ActorExecuteInfo.h"
+#include "Library/Execute/ActorExecuteInfo.h"
 
 namespace al {
 ActorExecuteInfo::ActorExecuteInfo(ExecuteRequestKeeper* keeper) {
diff --git a/src/al/Library/Execute/ExecuteDirector.cpp b/lib/al/src/Library/Execute/ExecuteDirector.cpp
similarity index 95%
rename from src/al/Library/Execute/ExecuteDirector.cpp
rename to lib/al/src/Library/Execute/ExecuteDirector.cpp
index 4d3c9e2c..cc687504 100644
--- a/src/al/Library/Execute/ExecuteDirector.cpp
+++ b/lib/al/src/Library/Execute/ExecuteDirector.cpp
@@ -1,12 +1,12 @@
-#include "al/Library/Execute/ExecuteDirector.h"
+#include "Library/Execute/ExecuteDirector.h"
 
-#include "al/Library/Base/String.h"
-#include "al/Library/Execute/ActorExecuteInfo.h"
-#include "al/Library/Execute/ExecuteRequestKeeper.h"
-#include "al/Library/Execute/ExecuteTablesImpl.h"
-#include "al/Library/Execute/LayoutExecuteInfo.h"
-#include "al/Library/Layout/LayoutActor.h"
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/Base/String.h"
+#include "Library/Execute/ActorExecuteInfo.h"
+#include "Library/Execute/ExecuteRequestKeeper.h"
+#include "Library/Execute/ExecuteTablesImpl.h"
+#include "Library/Execute/LayoutExecuteInfo.h"
+#include "Library/Layout/LayoutActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 
diff --git a/src/al/Library/Execute/IUseExecutor.cpp b/lib/al/src/Library/Execute/IUseExecutor.cpp
similarity index 61%
rename from src/al/Library/Execute/IUseExecutor.cpp
rename to lib/al/src/Library/Execute/IUseExecutor.cpp
index 15624685..2648dc50 100644
--- a/src/al/Library/Execute/IUseExecutor.cpp
+++ b/lib/al/src/Library/Execute/IUseExecutor.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Execute/IUseExecutor.h"
+#include "Library/Execute/IUseExecutor.h"
 
 namespace al {
 
diff --git a/src/al/Library/Execute/LayoutExecuteInfo.cpp b/lib/al/src/Library/Execute/LayoutExecuteInfo.cpp
similarity index 87%
rename from src/al/Library/Execute/LayoutExecuteInfo.cpp
rename to lib/al/src/Library/Execute/LayoutExecuteInfo.cpp
index 35417724..075b0ccb 100644
--- a/src/al/Library/Execute/LayoutExecuteInfo.cpp
+++ b/lib/al/src/Library/Execute/LayoutExecuteInfo.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Execute/LayoutExecuteInfo.h"
+#include "Library/Execute/LayoutExecuteInfo.h"
 
 namespace al {
 LayoutExecuteInfo::LayoutExecuteInfo() {}
diff --git a/src/al/Library/Layout/LayoutActor.cpp b/lib/al/src/Library/Layout/LayoutActor.cpp
similarity index 85%
rename from src/al/Library/Layout/LayoutActor.cpp
rename to lib/al/src/Library/Layout/LayoutActor.cpp
index a22607c8..8d048b7b 100644
--- a/src/al/Library/Layout/LayoutActor.cpp
+++ b/lib/al/src/Library/Layout/LayoutActor.cpp
@@ -1,8 +1,8 @@
-#include "al/Library/Layout/LayoutActor.h"
-#include "al/Library/Audio/AudioKeeper.h"
-#include "al/Library/Layout/LayoutActorUtil.h"
-#include "al/Library/Layout/LayoutPartsActorKeeper.h"
-#include "al/Library/Layout/LayoutSceneInfo.h"
+#include "Library/Layout/LayoutActor.h"
+#include "Library/Audio/AudioKeeper.h"
+#include "Library/Layout/LayoutActorUtil.h"
+#include "Library/Layout/LayoutPartsActorKeeper.h"
+#include "Library/Layout/LayoutSceneInfo.h"
 
 namespace al {
 void LayoutActor::appear() {
diff --git a/src/al/Library/Layout/LayoutPartsActorKeeper.cpp b/lib/al/src/Library/Layout/LayoutPartsActorKeeper.cpp
similarity index 84%
rename from src/al/Library/Layout/LayoutPartsActorKeeper.cpp
rename to lib/al/src/Library/Layout/LayoutPartsActorKeeper.cpp
index 1e44d5db..ea31a1dc 100644
--- a/src/al/Library/Layout/LayoutPartsActorKeeper.cpp
+++ b/lib/al/src/Library/Layout/LayoutPartsActorKeeper.cpp
@@ -1,5 +1,5 @@
-#include "al/Library/Layout/LayoutPartsActorKeeper.h"
-#include "al/Library/Layout/LayoutActor.h"
+#include "Library/Layout/LayoutPartsActorKeeper.h"
+#include "Library/Layout/LayoutActor.h"
 
 namespace al {
 void LayoutPartsActorKeeper::resisterPartsActor(LayoutActor* actor) {
diff --git a/src/al/Library/LiveActor/ActorClippingFunction.cpp b/lib/al/src/Library/LiveActor/ActorClippingFunction.cpp
similarity index 79%
rename from src/al/Library/LiveActor/ActorClippingFunction.cpp
rename to lib/al/src/Library/LiveActor/ActorClippingFunction.cpp
index ba4c00e4..64db2aff 100644
--- a/src/al/Library/LiveActor/ActorClippingFunction.cpp
+++ b/lib/al/src/Library/LiveActor/ActorClippingFunction.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 bool isClipped(const LiveActor* actor) {
diff --git a/src/al/Library/LiveActor/ActorFactory.cpp b/lib/al/src/Library/LiveActor/ActorFactory.cpp
similarity index 68%
rename from src/al/Library/LiveActor/ActorFactory.cpp
rename to lib/al/src/Library/LiveActor/ActorFactory.cpp
index a815ea2f..d97bb42f 100644
--- a/src/al/Library/LiveActor/ActorFactory.cpp
+++ b/lib/al/src/Library/LiveActor/ActorFactory.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/LiveActor/ActorFactory.h"
+#include "Library/LiveActor/ActorFactory.h"
 
 namespace al {
 ActorFactory::ActorFactory(const char* pName) : Factory(pName) {}
diff --git a/src/al/Library/LiveActor/ActorFlagFunction.cpp b/lib/al/src/Library/LiveActor/ActorFlagFunction.cpp
similarity index 94%
rename from src/al/Library/LiveActor/ActorFlagFunction.cpp
rename to lib/al/src/Library/LiveActor/ActorFlagFunction.cpp
index 5d8eac68..6653461d 100644
--- a/src/al/Library/LiveActor/ActorFlagFunction.cpp
+++ b/lib/al/src/Library/LiveActor/ActorFlagFunction.cpp
@@ -1,5 +1,5 @@
-#include "al/Library/LiveActor/ActorFlagFunction.h"
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/ActorFlagFunction.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 bool isAlive(const LiveActor* actor) {
diff --git a/src/al/Library/LiveActor/ActorInitInfo.cpp b/lib/al/src/Library/LiveActor/ActorInitInfo.cpp
similarity index 96%
rename from src/al/Library/LiveActor/ActorInitInfo.cpp
rename to lib/al/src/Library/LiveActor/ActorInitInfo.cpp
index d3be6942..27cf03ab 100644
--- a/src/al/Library/LiveActor/ActorInitInfo.cpp
+++ b/lib/al/src/Library/LiveActor/ActorInitInfo.cpp
@@ -1,5 +1,5 @@
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/Clipping/ViewIdHolder.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/Clipping/ViewIdHolder.h"
 
 namespace al {
 ActorInitInfo::ActorInitInfo() = default;
diff --git a/src/al/Library/LiveActor/ActorMovementFunction.cpp b/lib/al/src/Library/LiveActor/ActorMovementFunction.cpp
similarity index 84%
rename from src/al/Library/LiveActor/ActorMovementFunction.cpp
rename to lib/al/src/Library/LiveActor/ActorMovementFunction.cpp
index 000a3428..b61c84e3 100644
--- a/src/al/Library/LiveActor/ActorMovementFunction.cpp
+++ b/lib/al/src/Library/LiveActor/ActorMovementFunction.cpp
@@ -1,14 +1,14 @@
 #include <math/seadVector.h>
-#include "al/Library/Audio/AudioKeeper.h"
-#include "al/Library/Collision/Collider.h"
-#include "al/Library/HitSensor/SensorFunction.h"
-#include "al/Library/LiveActor/ActorCollisionFunction.h"
-#include "al/Library/LiveActor/ActorMovementFunction.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Screen/ScreenPointKeeper.h"
-#include "al/Library/Se/SeKeeper.h"
+#include "Library/Audio/AudioKeeper.h"
+#include "Library/Collision/Collider.h"
+#include "Library/HitSensor/SensorFunction.h"
+#include "Library/LiveActor/ActorCollisionFunction.h"
+#include "Library/LiveActor/ActorMovementFunction.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Screen/ScreenPointKeeper.h"
+#include "Library/Se/SeKeeper.h"
 
 namespace al {
 
diff --git a/src/al/Library/LiveActor/ActorPoseKeeper.cpp b/lib/al/src/Library/LiveActor/ActorPoseKeeper.cpp
similarity index 99%
rename from src/al/Library/LiveActor/ActorPoseKeeper.cpp
rename to lib/al/src/Library/LiveActor/ActorPoseKeeper.cpp
index d0402415..186ae164 100644
--- a/src/al/Library/LiveActor/ActorPoseKeeper.cpp
+++ b/lib/al/src/Library/LiveActor/ActorPoseKeeper.cpp
@@ -1,7 +1,7 @@
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
 
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Math/VectorUtil.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Math/VectorUtil.h"
 
 namespace al {
 
diff --git a/src/al/Library/LiveActor/LiveActor.cpp b/lib/al/src/Library/LiveActor/LiveActor.cpp
similarity index 90%
rename from src/al/Library/LiveActor/LiveActor.cpp
rename to lib/al/src/Library/LiveActor/LiveActor.cpp
index b31a963a..586a16c9 100755
--- a/src/al/Library/LiveActor/LiveActor.cpp
+++ b/lib/al/src/Library/LiveActor/LiveActor.cpp
@@ -1,11 +1,11 @@
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 #include <string.h>
-#include "al/Library/LiveActor/ActorFlagFunction.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Rail/RailKeeper.h"
-#include "al/Library/Shadow/ShadowKeeper.h"
-#include "al/Project/Light/ActorPrepassLightKeeper.h"
+#include "Library/LiveActor/ActorFlagFunction.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Rail/RailKeeper.h"
+#include "Library/Shadow/ShadowKeeper.h"
+#include "Project/Light/ActorPrepassLightKeeper.h"
 
 namespace al {
 
diff --git a/src/al/Library/LiveActor/LiveActorFlag.cpp b/lib/al/src/Library/LiveActor/LiveActorFlag.cpp
similarity index 57%
rename from src/al/Library/LiveActor/LiveActorFlag.cpp
rename to lib/al/src/Library/LiveActor/LiveActorFlag.cpp
index d645565f..35c0d384 100644
--- a/src/al/Library/LiveActor/LiveActorFlag.cpp
+++ b/lib/al/src/Library/LiveActor/LiveActorFlag.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 LiveActorFlag::LiveActorFlag() = default;
diff --git a/src/al/Library/LiveActor/LiveActorGroup.cpp b/lib/al/src/Library/LiveActor/LiveActorGroup.cpp
similarity index 95%
rename from src/al/Library/LiveActor/LiveActorGroup.cpp
rename to lib/al/src/Library/LiveActor/LiveActorGroup.cpp
index ae8b19ed..7cc46805 100755
--- a/src/al/Library/LiveActor/LiveActorGroup.cpp
+++ b/lib/al/src/Library/LiveActor/LiveActorGroup.cpp
@@ -1,5 +1,5 @@
-#include "al/Library/LiveActor/LiveActorGroup.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
+#include "Library/LiveActor/LiveActorGroup.h"
+#include "Library/LiveActor/LiveActorUtil.h"
 
 namespace al {
 LiveActorGroup::LiveActorGroup(const char* groupName, s32 maxActors)
diff --git a/src/al/Library/LiveActor/SubActorKeeper.cpp b/lib/al/src/Library/LiveActor/SubActorKeeper.cpp
similarity index 95%
rename from src/al/Library/LiveActor/SubActorKeeper.cpp
rename to lib/al/src/Library/LiveActor/SubActorKeeper.cpp
index 726d619c..849d08d2 100644
--- a/src/al/Library/LiveActor/SubActorKeeper.cpp
+++ b/lib/al/src/Library/LiveActor/SubActorKeeper.cpp
@@ -1,16 +1,16 @@
-#include "al/Library/LiveActor/SubActorKeeper.h"
-#include "al/Library/Base/String.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
-#include "al/Library/LiveActor/ActorResourceFunction.h"
-#include "al/Library/LiveActor/ActorSensorFunction.h"
-#include "al/Library/Obj/BreakModel.h"
-#include "al/Library/Obj/CollisionObj.h"
-#include "al/Library/Obj/DepthShadowModel.h"
-#include "al/Library/Obj/ModelDrawParts.h"
-#include "al/Library/Obj/PartsModel.h"
-#include "al/Library/Obj/SilhouetteModel.h"
-#include "al/Library/Obj/SimpleCircleShadowXZ.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/LiveActor/SubActorKeeper.h"
+#include "Library/Base/String.h"
+#include "Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/ActorResourceFunction.h"
+#include "Library/LiveActor/ActorSensorFunction.h"
+#include "Library/Obj/BreakModel.h"
+#include "Library/Obj/CollisionObj.h"
+#include "Library/Obj/DepthShadowModel.h"
+#include "Library/Obj/ModelDrawParts.h"
+#include "Library/Obj/PartsModel.h"
+#include "Library/Obj/SilhouetteModel.h"
+#include "Library/Obj/SimpleCircleShadowXZ.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace al {
 SubActorInfo::SubActorInfo() = default;
diff --git a/src/al/Library/MapObj/FixMapParts.cpp b/lib/al/src/Library/MapObj/FixMapParts.cpp
similarity index 77%
rename from src/al/Library/MapObj/FixMapParts.cpp
rename to lib/al/src/Library/MapObj/FixMapParts.cpp
index c71569ec..0d78fc5f 100644
--- a/src/al/Library/MapObj/FixMapParts.cpp
+++ b/lib/al/src/Library/MapObj/FixMapParts.cpp
@@ -1,10 +1,10 @@
-#include "al/Library/MapObj/FixMapParts.h"
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorSensorMsgFunction.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Stage/StageSwitchUtil.h"
-#include "al/Library/Placement/PlacementFunction.h"
+#include "Library/MapObj/FixMapParts.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorSensorMsgFunction.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Stage/StageSwitchUtil.h"
+#include "Library/Placement/PlacementFunction.h"
 
 namespace al {
 FixMapParts::FixMapParts(const char* name) : LiveActor(name) {}
diff --git a/src/al/Library/Math/MathRandomUtil.cpp b/lib/al/src/Library/Math/MathRandomUtil.cpp
similarity index 96%
rename from src/al/Library/Math/MathRandomUtil.cpp
rename to lib/al/src/Library/Math/MathRandomUtil.cpp
index bd5ed809..fb22ddf7 100644
--- a/src/al/Library/Math/MathRandomUtil.cpp
+++ b/lib/al/src/Library/Math/MathRandomUtil.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Math/MathRandomUtil.h"
+#include "Library/Math/MathRandomUtil.h"
 
 #include <random/seadGlobalRandom.h>
 
diff --git a/src/al/Library/Math/MathUtil.cpp b/lib/al/src/Library/Math/MathUtil.cpp
similarity index 97%
rename from src/al/Library/Math/MathUtil.cpp
rename to lib/al/src/Library/Math/MathUtil.cpp
index 1a2ccea0..44402f1a 100755
--- a/src/al/Library/Math/MathUtil.cpp
+++ b/lib/al/src/Library/Math/MathUtil.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Math/MathUtil.h"
+#include "Library/Math/MathUtil.h"
 #include <cmath>
 #include <math/seadMathCalcCommon.h>
 
diff --git a/src/al/Library/Nerve/Nerve.cpp b/lib/al/src/Library/Nerve/Nerve.cpp
similarity index 71%
rename from src/al/Library/Nerve/Nerve.cpp
rename to lib/al/src/Library/Nerve/Nerve.cpp
index 102be9f4..9cd916e0 100644
--- a/src/al/Library/Nerve/Nerve.cpp
+++ b/lib/al/src/Library/Nerve/Nerve.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Nerve/Nerve.h"
+#include "Library/Nerve/Nerve.h"
 
 namespace al {
 void Nerve::executeOnEnd(NerveKeeper* keeper) const {}
diff --git a/src/al/Library/Nerve/NerveAction.cpp b/lib/al/src/Library/Nerve/NerveAction.cpp
similarity index 89%
rename from src/al/Library/Nerve/NerveAction.cpp
rename to lib/al/src/Library/Nerve/NerveAction.cpp
index 5ea1b77b..ee67822b 100755
--- a/src/al/Library/Nerve/NerveAction.cpp
+++ b/lib/al/src/Library/Nerve/NerveAction.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Nerve/NerveAction.h"
+#include "Library/Nerve/NerveAction.h"
 
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/Nerve/NerveUtil.h"
 
 namespace al {
 NerveAction::NerveAction() {
diff --git a/src/al/Library/Nerve/NerveExecutor.cpp b/lib/al/src/Library/Nerve/NerveExecutor.cpp
similarity index 83%
rename from src/al/Library/Nerve/NerveExecutor.cpp
rename to lib/al/src/Library/Nerve/NerveExecutor.cpp
index 2d4f1a0a..8d4c9ade 100755
--- a/src/al/Library/Nerve/NerveExecutor.cpp
+++ b/lib/al/src/Library/Nerve/NerveExecutor.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Nerve/NerveExecutor.h"
+#include "Library/Nerve/NerveExecutor.h"
 
-#include "al/Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/NerveKeeper.h"
 
 namespace al {
 
diff --git a/src/al/Library/Nerve/NerveKeeper.cpp b/lib/al/src/Library/Nerve/NerveKeeper.cpp
similarity index 89%
rename from src/al/Library/Nerve/NerveKeeper.cpp
rename to lib/al/src/Library/Nerve/NerveKeeper.cpp
index 997c278a..f603ce14 100755
--- a/src/al/Library/Nerve/NerveKeeper.cpp
+++ b/lib/al/src/Library/Nerve/NerveKeeper.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Nerve/NerveKeeper.h"
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveStateCtrl.h"
+#include "Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveStateCtrl.h"
 
 namespace al {
 NerveKeeper::NerveKeeper(IUseNerve* parent, const Nerve* nerve, s32 maxStates) : mParent(parent), mNextNerve(nullptr) {
diff --git a/src/al/Library/Nerve/NerveStateBase.cpp b/lib/al/src/Library/Nerve/NerveStateBase.cpp
similarity index 94%
rename from src/al/Library/Nerve/NerveStateBase.cpp
rename to lib/al/src/Library/Nerve/NerveStateBase.cpp
index f5f958cf..eabc4896 100755
--- a/src/al/Library/Nerve/NerveStateBase.cpp
+++ b/lib/al/src/Library/Nerve/NerveStateBase.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Nerve/NerveStateBase.h"
+#include "Library/Nerve/NerveStateBase.h"
 
 namespace al {
 NerveStateBase::NerveStateBase(const char* stateName) : NerveExecutor(stateName) {}
diff --git a/src/al/Library/Nerve/NerveStateCtrl.cpp b/lib/al/src/Library/Nerve/NerveStateCtrl.cpp
similarity index 95%
rename from src/al/Library/Nerve/NerveStateCtrl.cpp
rename to lib/al/src/Library/Nerve/NerveStateCtrl.cpp
index e49e605c..f1c4ded5 100755
--- a/src/al/Library/Nerve/NerveStateCtrl.cpp
+++ b/lib/al/src/Library/Nerve/NerveStateCtrl.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Nerve/NerveStateCtrl.h"
+#include "Library/Nerve/NerveStateCtrl.h"
 
-#include "al/Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/NerveKeeper.h"
 
 namespace al {
 // todo -- some scheduling problems with mStateCount's incrementation
diff --git a/src/al/Library/Nerve/NerveUtil.cpp b/lib/al/src/Library/Nerve/NerveUtil.cpp
similarity index 95%
rename from src/al/Library/Nerve/NerveUtil.cpp
rename to lib/al/src/Library/Nerve/NerveUtil.cpp
index fc5f536d..93fdc555 100755
--- a/src/al/Library/Nerve/NerveUtil.cpp
+++ b/lib/al/src/Library/Nerve/NerveUtil.cpp
@@ -1,8 +1,8 @@
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/Nerve/NerveUtil.h"
 #include <algorithm>
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Nerve/NerveKeeper.h"
-#include "al/Library/Nerve/NerveStateCtrl.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/NerveStateCtrl.h"
 
 namespace al {
 void setNerve(IUseNerve* user, const Nerve* nerve) {
diff --git a/src/al/Library/Obj/BreakModel.cpp b/lib/al/src/Library/Obj/BreakModel.cpp
similarity index 80%
rename from src/al/Library/Obj/BreakModel.cpp
rename to lib/al/src/Library/Obj/BreakModel.cpp
index b8caa8b3..78f2e320 100644
--- a/src/al/Library/Obj/BreakModel.cpp
+++ b/lib/al/src/Library/Obj/BreakModel.cpp
@@ -1,14 +1,14 @@
-#include "al/Library/Obj/BreakModel.h"
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorClippingFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/LiveActor/ActorResourceFunction.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
-#include "al/Library/Yaml/ByamlIter.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Obj/BreakModel.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/LiveActor/ActorResourceFunction.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace {
 using namespace al;
diff --git a/src/al/Library/Obj/PartsModel.cpp b/lib/al/src/Library/Obj/PartsModel.cpp
similarity index 89%
rename from src/al/Library/Obj/PartsModel.cpp
rename to lib/al/src/Library/Obj/PartsModel.cpp
index 3e97f086..695e34db 100644
--- a/src/al/Library/Obj/PartsModel.cpp
+++ b/lib/al/src/Library/Obj/PartsModel.cpp
@@ -1,17 +1,17 @@
-#include "al/Library/Obj/PartsModel.h"
+#include "Library/Obj/PartsModel.h"
 
-#include "al/Library/Base/String.h"
-#include "al/Library/LiveActor/ActorClippingFunction.h"
-#include "al/Library/LiveActor/ActorFlagFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/LiveActor/ActorResourceFunction.h"
-#include "al/Library/LiveActor/SubActorFunction.h"
-#include "al/Library/LiveActor/SubActorKeeper.h"
-#include "al/Library/MapObj/MtxUtil.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Base/String.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorFlagFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/LiveActor/ActorResourceFunction.h"
+#include "Library/LiveActor/SubActorFunction.h"
+#include "Library/LiveActor/SubActorKeeper.h"
+#include "Library/MapObj/MtxUtil.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace al {
 PartsModel::PartsModel(const char* name) : LiveActor(name) {}
diff --git a/src/al/Library/Obj/SilhouetteModel.cpp b/lib/al/src/Library/Obj/SilhouetteModel.cpp
similarity index 78%
rename from src/al/Library/Obj/SilhouetteModel.cpp
rename to lib/al/src/Library/Obj/SilhouetteModel.cpp
index d18ffa06..55ad0efc 100644
--- a/src/al/Library/Obj/SilhouetteModel.cpp
+++ b/lib/al/src/Library/Obj/SilhouetteModel.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Obj/SilhouetteModel.h"
-#include "al/Library/LiveActor/ActorClippingFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
+#include "Library/Obj/SilhouetteModel.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
 
 namespace al {
 SilhouetteModel::SilhouetteModel(LiveActor* parent, const ActorInitInfo& initInfo,
diff --git a/src/al/Library/Placement/PlacementFunction.cpp b/lib/al/src/Library/Placement/PlacementFunction.cpp
similarity index 93%
rename from src/al/Library/Placement/PlacementFunction.cpp
rename to lib/al/src/Library/Placement/PlacementFunction.cpp
index ad9d2163..e8de10db 100755
--- a/src/al/Library/Placement/PlacementFunction.cpp
+++ b/lib/al/src/Library/Placement/PlacementFunction.cpp
@@ -1,9 +1,9 @@
-#include "al/Library/Placement/PlacementFunction.h"
+#include "Library/Placement/PlacementFunction.h"
 
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/Placement/PlacementId.h"
-#include "al/Library/Placement/PlacementInfo.h"
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/Placement/PlacementId.h"
+#include "Library/Placement/PlacementInfo.h"
+#include "Library/Yaml/ByamlIter.h"
 
 namespace al {
 int getCountPlacementInfo(const al::PlacementInfo& rInfo) {
diff --git a/src/al/Library/Placement/PlacementId.cpp b/lib/al/src/Library/Placement/PlacementId.cpp
similarity index 89%
rename from src/al/Library/Placement/PlacementId.cpp
rename to lib/al/src/Library/Placement/PlacementId.cpp
index 31b9415b..00f9a248 100755
--- a/src/al/Library/Placement/PlacementId.cpp
+++ b/lib/al/src/Library/Placement/PlacementId.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Placement/PlacementId.h"
+#include "Library/Placement/PlacementId.h"
 
-#include "al/Library/Placement/PlacementInfo.h"
+#include "Library/Placement/PlacementInfo.h"
 
 namespace al {
 PlacementId::PlacementId()
diff --git a/src/al/Library/Placement/PlacementInfo.cpp b/lib/al/src/Library/Placement/PlacementInfo.cpp
similarity index 82%
rename from src/al/Library/Placement/PlacementInfo.cpp
rename to lib/al/src/Library/Placement/PlacementInfo.cpp
index 209d08c2..597f40f3 100755
--- a/src/al/Library/Placement/PlacementInfo.cpp
+++ b/lib/al/src/Library/Placement/PlacementInfo.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Placement/PlacementInfo.h"
+#include "Library/Placement/PlacementInfo.h"
 
 namespace al {
 PlacementInfo::PlacementInfo() = default;
diff --git a/src/al/Library/Play/Camera/CameraVerticalAbsorber.cpp b/lib/al/src/Library/Play/Camera/CameraVerticalAbsorber.cpp
similarity index 96%
rename from src/al/Library/Play/Camera/CameraVerticalAbsorber.cpp
rename to lib/al/src/Library/Play/Camera/CameraVerticalAbsorber.cpp
index 4baf99e5..84b83f29 100644
--- a/src/al/Library/Play/Camera/CameraVerticalAbsorber.cpp
+++ b/lib/al/src/Library/Play/Camera/CameraVerticalAbsorber.cpp
@@ -1,8 +1,8 @@
-#include "al/Library/Play/Camera/CameraVerticalAbsorber.h"
+#include "Library/Play/Camera/CameraVerticalAbsorber.h"
 
-#include "al/Library/Camera/CameraPoser.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Camera/CameraPoser.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace {
 using namespace al;
diff --git a/src/al/Library/Player/PlayerHolder.cpp b/lib/al/src/Library/Player/PlayerHolder.cpp
similarity index 96%
rename from src/al/Library/Player/PlayerHolder.cpp
rename to lib/al/src/Library/Player/PlayerHolder.cpp
index 0ce7e317..c7e611a9 100644
--- a/src/al/Library/Player/PlayerHolder.cpp
+++ b/lib/al/src/Library/Player/PlayerHolder.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Player/PlayerHolder.h"
+#include "Library/Player/PlayerHolder.h"
 
 namespace al {
 
diff --git a/src/al/Library/Player/PlayerUtil.cpp b/lib/al/src/Library/Player/PlayerUtil.cpp
similarity index 85%
rename from src/al/Library/Player/PlayerUtil.cpp
rename to lib/al/src/Library/Player/PlayerUtil.cpp
index a974c820..4f9e243b 100644
--- a/src/al/Library/Player/PlayerUtil.cpp
+++ b/lib/al/src/Library/Player/PlayerUtil.cpp
@@ -1,10 +1,10 @@
-#include "al/Library/Player/PlayerUtil.h"
+#include "Library/Player/PlayerUtil.h"
 
-#include "al/Library/Player/PlayerHolder.h"
-#include "al/Library/LiveActor/ActorFlagFunction.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/Player/PlayerHolder.h"
+#include "Library/LiveActor/ActorFlagFunction.h"
+#include "Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
 
 namespace al {
 
diff --git a/src/al/Library/Rail/Graph.cpp b/lib/al/src/Library/Rail/Graph.cpp
similarity index 98%
rename from src/al/Library/Rail/Graph.cpp
rename to lib/al/src/Library/Rail/Graph.cpp
index d5f0e854..b31c18fb 100644
--- a/src/al/Library/Rail/Graph.cpp
+++ b/lib/al/src/Library/Rail/Graph.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Rail/Graph.h"
+#include "Library/Rail/Graph.h"
 
 namespace al {
 
diff --git a/src/al/Library/Rail/Rail.cpp b/lib/al/src/Library/Rail/Rail.cpp
similarity index 97%
rename from src/al/Library/Rail/Rail.cpp
rename to lib/al/src/Library/Rail/Rail.cpp
index af773779..747d6097 100644
--- a/src/al/Library/Rail/Rail.cpp
+++ b/lib/al/src/Library/Rail/Rail.cpp
@@ -1,10 +1,10 @@
-#include "al/Library/Rail/Rail.h"
+#include "Library/Rail/Rail.h"
 #include <limits>
 
-#include "al/Library/Placement/PlacementInfo.h"
-#include "al/Library/Rail/RailPart.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Placement/PlacementFunction.h"
+#include "Library/Placement/PlacementInfo.h"
+#include "Library/Rail/RailPart.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Placement/PlacementFunction.h"
 #include "math/seadMathCalcCommon.h"
 #include "math/seadVector.h"
 
diff --git a/src/al/Library/Rail/RailKeeper.cpp b/lib/al/src/Library/Rail/RailKeeper.cpp
similarity index 68%
rename from src/al/Library/Rail/RailKeeper.cpp
rename to lib/al/src/Library/Rail/RailKeeper.cpp
index 2d8026f4..869c7606 100644
--- a/src/al/Library/Rail/RailKeeper.cpp
+++ b/lib/al/src/Library/Rail/RailKeeper.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Rail/Rail.h"
-#include "al/Library/Rail/RailKeeper.h"
-#include "al/Library/Rail/RailRider.h"
+#include "Library/Rail/Rail.h"
+#include "Library/Rail/RailKeeper.h"
+#include "Library/Rail/RailRider.h"
 
 namespace al {
 RailKeeper::RailKeeper(const PlacementInfo& info) {
diff --git a/src/al/Library/Rail/RailPart.cpp b/lib/al/src/Library/Rail/RailPart.cpp
similarity index 94%
rename from src/al/Library/Rail/RailPart.cpp
rename to lib/al/src/Library/Rail/RailPart.cpp
index 1a8e64cf..a14b2aed 100644
--- a/src/al/Library/Rail/RailPart.cpp
+++ b/lib/al/src/Library/Rail/RailPart.cpp
@@ -1,9 +1,9 @@
-#include "al/Library/Rail/RailPart.h"
+#include "Library/Rail/RailPart.h"
 
-#include "al/Project/Rail/BezierCurve.h"
-#include "al/Project/Rail/LinearCurve.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Math/VectorUtil.h"
+#include "Project/Rail/BezierCurve.h"
+#include "Project/Rail/LinearCurve.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Math/VectorUtil.h"
 #include "math/seadVector.h"
 
 namespace al {
diff --git a/src/al/Library/Rail/RailRider.cpp b/lib/al/src/Library/Rail/RailRider.cpp
similarity index 71%
rename from src/al/Library/Rail/RailRider.cpp
rename to lib/al/src/Library/Rail/RailRider.cpp
index 8347fbb3..67fade6f 100644
--- a/src/al/Library/Rail/RailRider.cpp
+++ b/lib/al/src/Library/Rail/RailRider.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Rail/RailRider.h"
+#include "Library/Rail/RailRider.h"
 
-#include "al/Library/Rail/Rail.h"
+#include "Library/Rail/Rail.h"
 
 namespace al {
 RailRider::RailRider(const Rail* rail) : mRail(rail), mCoord(rail->normalizeLength(0)) {
diff --git a/src/al/Library/Resource/Resource.cpp b/lib/al/src/Library/Resource/Resource.cpp
similarity index 94%
rename from src/al/Library/Resource/Resource.cpp
rename to lib/al/src/Library/Resource/Resource.cpp
index ea044bcd..4918cf47 100755
--- a/src/al/Library/Resource/Resource.cpp
+++ b/lib/al/src/Library/Resource/Resource.cpp
@@ -1,10 +1,10 @@
-#include "al/Library/Resource/Resource.h"
+#include "Library/Resource/Resource.h"
 #include <filedevice/seadFileDevice.h>
 #include <g3d/aglNW4FToNN.h>
 #include <heap/seadHeap.h>
 #include <heap/seadHeapMgr.h>
 #include <resource/seadResource.h>
-#include "al/Library/File/FileUtil.h"
+#include "Library/File/FileUtil.h"
 
 namespace al {
 Resource::Resource(const sead::SafeString& path)
diff --git a/src/al/Library/Scene/ISceneObj.cpp b/lib/al/src/Library/Scene/ISceneObj.cpp
similarity index 85%
rename from src/al/Library/Scene/ISceneObj.cpp
rename to lib/al/src/Library/Scene/ISceneObj.cpp
index 94df326c..2ecc7f44 100644
--- a/src/al/Library/Scene/ISceneObj.cpp
+++ b/lib/al/src/Library/Scene/ISceneObj.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Scene/ISceneObj.h"
+#include "Library/Scene/ISceneObj.h"
 
 namespace al {
 
diff --git a/src/al/Library/Scene/SceneObjHolder.cpp b/lib/al/src/Library/Scene/SceneObjHolder.cpp
similarity index 93%
rename from src/al/Library/Scene/SceneObjHolder.cpp
rename to lib/al/src/Library/Scene/SceneObjHolder.cpp
index c7dea684..f4c32d38 100644
--- a/src/al/Library/Scene/SceneObjHolder.cpp
+++ b/lib/al/src/Library/Scene/SceneObjHolder.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Scene/SceneObjHolder.h"
+#include "Library/Scene/SceneObjHolder.h"
 
-#include "al/Library/Scene/ISceneObj.h"
+#include "Library/Scene/ISceneObj.h"
 
 namespace al {
 
diff --git a/src/al/Library/Screen/ScreenFunction.cpp b/lib/al/src/Library/Screen/ScreenFunction.cpp
similarity index 90%
rename from src/al/Library/Screen/ScreenFunction.cpp
rename to lib/al/src/Library/Screen/ScreenFunction.cpp
index e033b672..fc5fea15 100644
--- a/src/al/Library/Screen/ScreenFunction.cpp
+++ b/lib/al/src/Library/Screen/ScreenFunction.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Screen/ScreenFunction.h"
+#include "Library/Screen/ScreenFunction.h"
 
 namespace al {
 
diff --git a/src/al/Library/Sequence/IUseSceneCreator.cpp b/lib/al/src/Library/Sequence/IUseSceneCreator.cpp
similarity index 62%
rename from src/al/Library/Sequence/IUseSceneCreator.cpp
rename to lib/al/src/Library/Sequence/IUseSceneCreator.cpp
index c9fc7ea7..9f0edaf8 100644
--- a/src/al/Library/Sequence/IUseSceneCreator.cpp
+++ b/lib/al/src/Library/Sequence/IUseSceneCreator.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Sequence/IUseSceneCreator.h"
+#include "Library/Sequence/IUseSceneCreator.h"
 
 namespace al {
 
diff --git a/lib/al/src/Library/Shadow/DepthShadowMapCtrl.cpp b/lib/al/src/Library/Shadow/DepthShadowMapCtrl.cpp
new file mode 100644
index 00000000..844f8557
--- /dev/null
+++ b/lib/al/src/Library/Shadow/DepthShadowMapCtrl.cpp
@@ -0,0 +1,3 @@
+#include "Library/Shadow/DepthShadowMapCtrl.h"
+
+namespace al {}
diff --git a/src/al/Library/Shadow/ShadowKeeper.cpp b/lib/al/src/Library/Shadow/ShadowKeeper.cpp
similarity index 84%
rename from src/al/Library/Shadow/ShadowKeeper.cpp
rename to lib/al/src/Library/Shadow/ShadowKeeper.cpp
index d4d6df3f..0642a04b 100644
--- a/src/al/Library/Shadow/ShadowKeeper.cpp
+++ b/lib/al/src/Library/Shadow/ShadowKeeper.cpp
@@ -1,7 +1,7 @@
-#include "al/Library/Shadow/ShadowKeeper.h"
+#include "Library/Shadow/ShadowKeeper.h"
 
-#include "al/Library/Shadow/DepthShadowMapCtrl.h"
-#include "al/Library/Shadow/ShadowMaskCtrl.h"
+#include "Library/Shadow/DepthShadowMapCtrl.h"
+#include "Library/Shadow/ShadowMaskCtrl.h"
 
 namespace al {
 
diff --git a/lib/al/src/Library/Shadow/ShadowMaskCtrl.cpp b/lib/al/src/Library/Shadow/ShadowMaskCtrl.cpp
new file mode 100644
index 00000000..4f064909
--- /dev/null
+++ b/lib/al/src/Library/Shadow/ShadowMaskCtrl.cpp
@@ -0,0 +1,3 @@
+#include "Library/Shadow/ShadowMaskCtrl.h"
+
+namespace al {}
diff --git a/src/al/Library/Stage/StageInfo.cpp b/lib/al/src/Library/Stage/StageInfo.cpp
similarity index 84%
rename from src/al/Library/Stage/StageInfo.cpp
rename to lib/al/src/Library/Stage/StageInfo.cpp
index 2d734fd0..eb54e393 100644
--- a/src/al/Library/Stage/StageInfo.cpp
+++ b/lib/al/src/Library/Stage/StageInfo.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Stage/StageInfo.h"
+#include "Library/Stage/StageInfo.h"
 
-#include "al/Library/Placement/PlacementInfo.h"
+#include "Library/Placement/PlacementInfo.h"
 
 namespace al {
 
diff --git a/src/al/Library/Thread/AsyncFunctorThread.cpp b/lib/al/src/Library/Thread/AsyncFunctorThread.cpp
similarity index 96%
rename from src/al/Library/Thread/AsyncFunctorThread.cpp
rename to lib/al/src/Library/Thread/AsyncFunctorThread.cpp
index 618e4b60..de47b728 100644
--- a/src/al/Library/Thread/AsyncFunctorThread.cpp
+++ b/lib/al/src/Library/Thread/AsyncFunctorThread.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Thread/AsyncFunctorThread.h"
+#include "Library/Thread/AsyncFunctorThread.h"
 
 #include <prim/seadDelegate.h>
 #include <thread/seadDelegateThread.h>
diff --git a/src/al/Library/Thread/FunctorV0M.cpp b/lib/al/src/Library/Thread/FunctorV0M.cpp
similarity index 90%
rename from src/al/Library/Thread/FunctorV0M.cpp
rename to lib/al/src/Library/Thread/FunctorV0M.cpp
index 02fc01ce..0369d859 100644
--- a/src/al/Library/Thread/FunctorV0M.cpp
+++ b/lib/al/src/Library/Thread/FunctorV0M.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Thread/FunctorV0M.h"
+#include "Library/Thread/FunctorV0M.h"
 
 namespace al {
 
diff --git a/src/al/Library/Yaml/ByamlContainerHeader.cpp b/lib/al/src/Library/Yaml/ByamlContainerHeader.cpp
similarity index 84%
rename from src/al/Library/Yaml/ByamlContainerHeader.cpp
rename to lib/al/src/Library/Yaml/ByamlContainerHeader.cpp
index e2827253..14e5bbb2 100755
--- a/src/al/Library/Yaml/ByamlContainerHeader.cpp
+++ b/lib/al/src/Library/Yaml/ByamlContainerHeader.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Yaml/ByamlContainerHeader.h"
+#include "Library/Yaml/ByamlContainerHeader.h"
 
 #include <byteswap.h>
 
diff --git a/src/al/Library/Yaml/ByamlData.cpp b/lib/al/src/Library/Yaml/ByamlData.cpp
similarity index 99%
rename from src/al/Library/Yaml/ByamlData.cpp
rename to lib/al/src/Library/Yaml/ByamlData.cpp
index fa8b7806..4ce2f76f 100755
--- a/src/al/Library/Yaml/ByamlData.cpp
+++ b/lib/al/src/Library/Yaml/ByamlData.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/Yaml/ByamlData.h"
+#include "Library/Yaml/ByamlData.h"
 
 namespace al {
 
diff --git a/src/al/Library/Yaml/ByamlHeader.cpp b/lib/al/src/Library/Yaml/ByamlHeader.cpp
similarity index 99%
rename from src/al/Library/Yaml/ByamlHeader.cpp
rename to lib/al/src/Library/Yaml/ByamlHeader.cpp
index 73525a6b..44a635da 100755
--- a/src/al/Library/Yaml/ByamlHeader.cpp
+++ b/lib/al/src/Library/Yaml/ByamlHeader.cpp
@@ -1,10 +1,10 @@
-#include "al/Library/Yaml/ByamlHeader.h"
+#include "Library/Yaml/ByamlHeader.h"
 
 #include <byteswap.h>
 #include <cstring>
 #include <prim/seadEndian.h>
 #include <stream/seadStream.h>
-#include "al/Library/Yaml/ByamlData.h"
+#include "Library/Yaml/ByamlData.h"
 
 #define BYAML_LE_TAG 'YB'
 
diff --git a/src/al/Library/Yaml/ByamlIter.cpp b/lib/al/src/Library/Yaml/ByamlIter.cpp
similarity index 98%
rename from src/al/Library/Yaml/ByamlIter.cpp
rename to lib/al/src/Library/Yaml/ByamlIter.cpp
index 9b726e12..2a68fff8 100644
--- a/src/al/Library/Yaml/ByamlIter.cpp
+++ b/lib/al/src/Library/Yaml/ByamlIter.cpp
@@ -1,8 +1,8 @@
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlIter.h"
 
-#include "al/Library/Yaml/ByamlContainerHeader.h"
-#include "al/Library/Yaml/ByamlData.h"
-#include "al/Library/Yaml/ByamlHeader.h"
+#include "Library/Yaml/ByamlContainerHeader.h"
+#include "Library/Yaml/ByamlData.h"
+#include "Library/Yaml/ByamlHeader.h"
 
 namespace al {
 ByamlIter::ByamlIter() : mData(nullptr), mRootNode(nullptr) {}
diff --git a/src/al/Library/Yaml/ByamlUtil.cpp b/lib/al/src/Library/Yaml/ByamlUtil.cpp
similarity index 99%
rename from src/al/Library/Yaml/ByamlUtil.cpp
rename to lib/al/src/Library/Yaml/ByamlUtil.cpp
index 4eb73306..24187a59 100755
--- a/src/al/Library/Yaml/ByamlUtil.cpp
+++ b/lib/al/src/Library/Yaml/ByamlUtil.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Yaml/ByamlUtil.h"
-#include "al/Library/Yaml/ByamlData.h"
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlUtil.h"
+#include "Library/Yaml/ByamlData.h"
+#include "Library/Yaml/ByamlIter.h"
 #include "math/seadBoundBox.h"
 
 namespace al {
diff --git a/src/al/Library/Yaml/Writer/ByamlWriter.cpp b/lib/al/src/Library/Yaml/Writer/ByamlWriter.cpp
similarity index 97%
rename from src/al/Library/Yaml/Writer/ByamlWriter.cpp
rename to lib/al/src/Library/Yaml/Writer/ByamlWriter.cpp
index 9cc94549..41edab4b 100644
--- a/src/al/Library/Yaml/Writer/ByamlWriter.cpp
+++ b/lib/al/src/Library/Yaml/Writer/ByamlWriter.cpp
@@ -1,11 +1,11 @@
-#include "al/Library/Yaml/Writer/ByamlWriter.h"
+#include "Library/Yaml/Writer/ByamlWriter.h"
 
 #include <heap/seadHeapMgr.h>
 #include <stream/seadStream.h>
-#include "al/Library/Yaml/ByamlIter.h"
-#include "al/Library/Yaml/Writer/ByamlWriterBigDataList.h"
-#include "al/Library/Yaml/Writer/ByamlWriterData.h"
-#include "al/Library/Yaml/Writer/ByamlWriterStringTable.h"
+#include "Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/Writer/ByamlWriterBigDataList.h"
+#include "Library/Yaml/Writer/ByamlWriterData.h"
+#include "Library/Yaml/Writer/ByamlWriterStringTable.h"
 
 namespace al {
 
diff --git a/src/al/Library/Yaml/Writer/ByamlWriterBigDataList.cpp b/lib/al/src/Library/Yaml/Writer/ByamlWriterBigDataList.cpp
similarity index 88%
rename from src/al/Library/Yaml/Writer/ByamlWriterBigDataList.cpp
rename to lib/al/src/Library/Yaml/Writer/ByamlWriterBigDataList.cpp
index fb3f0374..3fa08a6f 100644
--- a/src/al/Library/Yaml/Writer/ByamlWriterBigDataList.cpp
+++ b/lib/al/src/Library/Yaml/Writer/ByamlWriterBigDataList.cpp
@@ -1,6 +1,6 @@
-#include "al/Library/Yaml/Writer/ByamlWriterBigDataList.h"
+#include "Library/Yaml/Writer/ByamlWriterBigDataList.h"
 
-#include "al/Library/Yaml/Writer/ByamlWriterData.h"
+#include "Library/Yaml/Writer/ByamlWriterData.h"
 
 namespace al {
 
diff --git a/src/al/Library/Yaml/Writer/ByamlWriterData.cpp b/lib/al/src/Library/Yaml/Writer/ByamlWriterData.cpp
similarity index 97%
rename from src/al/Library/Yaml/Writer/ByamlWriterData.cpp
rename to lib/al/src/Library/Yaml/Writer/ByamlWriterData.cpp
index 98f03cc1..432432a0 100644
--- a/src/al/Library/Yaml/Writer/ByamlWriterData.cpp
+++ b/lib/al/src/Library/Yaml/Writer/ByamlWriterData.cpp
@@ -1,9 +1,9 @@
-#include "al/Library/Yaml/Writer/ByamlWriterData.h"
+#include "Library/Yaml/Writer/ByamlWriterData.h"
 
 #include <stream/seadStream.h>
-#include "al/Library/Yaml/Writer/ByamlWriterBigDataList.h"
-#include "al/Library/Yaml/Writer/ByamlWriterStringTable.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Yaml/Writer/ByamlWriterBigDataList.h"
+#include "Library/Yaml/Writer/ByamlWriterStringTable.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace al {
 
diff --git a/src/al/Library/Yaml/Writer/ByamlWriterStringTable.cpp b/lib/al/src/Library/Yaml/Writer/ByamlWriterStringTable.cpp
similarity index 96%
rename from src/al/Library/Yaml/Writer/ByamlWriterStringTable.cpp
rename to lib/al/src/Library/Yaml/Writer/ByamlWriterStringTable.cpp
index 6b6ea987..18dccf78 100644
--- a/src/al/Library/Yaml/Writer/ByamlWriterStringTable.cpp
+++ b/lib/al/src/Library/Yaml/Writer/ByamlWriterStringTable.cpp
@@ -1,8 +1,8 @@
-#include "al/Library/Yaml/Writer/ByamlWriterStringTable.h"
+#include "Library/Yaml/Writer/ByamlWriterStringTable.h"
 
 #include <cstring>
 #include <stream/seadStream.h>
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 namespace al {
 
diff --git a/src/al/Project/HitSensor/HitSensor.cpp b/lib/al/src/Project/HitSensor/HitSensor.cpp
similarity index 96%
rename from src/al/Project/HitSensor/HitSensor.cpp
rename to lib/al/src/Project/HitSensor/HitSensor.cpp
index 0ebbd92f..8b76c618 100755
--- a/src/al/Project/HitSensor/HitSensor.cpp
+++ b/lib/al/src/Project/HitSensor/HitSensor.cpp
@@ -1,4 +1,4 @@
-#include "al/Project/HitSensor/HitSensor.h"
+#include "Project/HitSensor/HitSensor.h"
 
 namespace al {
 void HitSensor::setFollowPosPtr(const sead::Vector3<float>* pFollowPos) {
diff --git a/src/al/Project/HitSensor/SensorHitGroup.cpp b/lib/al/src/Project/HitSensor/SensorHitGroup.cpp
similarity index 90%
rename from src/al/Project/HitSensor/SensorHitGroup.cpp
rename to lib/al/src/Project/HitSensor/SensorHitGroup.cpp
index c3ee8192..d8fc8389 100644
--- a/src/al/Project/HitSensor/SensorHitGroup.cpp
+++ b/lib/al/src/Project/HitSensor/SensorHitGroup.cpp
@@ -1,4 +1,4 @@
-#include "al/Project/HitSensor/SensorHitGroup.h"
+#include "Project/HitSensor/SensorHitGroup.h"
 
 namespace al {
 
diff --git a/src/al/Project/Item/ActorScoreKeeper.cpp b/lib/al/src/Project/Item/ActorScoreKeeper.cpp
similarity index 91%
rename from src/al/Project/Item/ActorScoreKeeper.cpp
rename to lib/al/src/Project/Item/ActorScoreKeeper.cpp
index fd9ed940..cfbfa143 100644
--- a/src/al/Project/Item/ActorScoreKeeper.cpp
+++ b/lib/al/src/Project/Item/ActorScoreKeeper.cpp
@@ -1,6 +1,6 @@
-#include "al/Project/Item/ActorScoreKeeper.h"
+#include "Project/Item/ActorScoreKeeper.h"
 
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlIter.h"
 
 namespace al {
 ActorScoreKeeper::ActorScoreKeeper() = default;
diff --git a/src/al/Project/Rail/BezierCurve.cpp b/lib/al/src/Project/Rail/BezierCurve.cpp
similarity index 99%
rename from src/al/Project/Rail/BezierCurve.cpp
rename to lib/al/src/Project/Rail/BezierCurve.cpp
index 4d6e1774..ea1d9201 100644
--- a/src/al/Project/Rail/BezierCurve.cpp
+++ b/lib/al/src/Project/Rail/BezierCurve.cpp
@@ -1,4 +1,4 @@
-#include "al/Project/Rail/BezierCurve.h"
+#include "Project/Rail/BezierCurve.h"
 #include "math/seadVector.h"
 
 namespace al {
diff --git a/src/al/Project/Rail/LinearCurve.cpp b/lib/al/src/Project/Rail/LinearCurve.cpp
similarity index 96%
rename from src/al/Project/Rail/LinearCurve.cpp
rename to lib/al/src/Project/Rail/LinearCurve.cpp
index 3fa53c2d..505628cd 100644
--- a/src/al/Project/Rail/LinearCurve.cpp
+++ b/lib/al/src/Project/Rail/LinearCurve.cpp
@@ -1,6 +1,6 @@
-#include "al/Project/Rail/LinearCurve.h"
+#include "Project/Rail/LinearCurve.h"
 
-#include "al/Library/Math/VectorUtil.h"
+#include "Library/Math/VectorUtil.h"
 
 namespace al {
 
diff --git a/lib/game/Boss/Mofumofu/MofumofuWarpHole.h b/lib/game/Boss/Mofumofu/MofumofuWarpHole.h
index 95914bbe..ffe91792 100644
--- a/lib/game/Boss/Mofumofu/MofumofuWarpHole.h
+++ b/lib/game/Boss/Mofumofu/MofumofuWarpHole.h
@@ -2,8 +2,8 @@
 
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Nerve/NerveUtil.h"
 
 class MofumofuWarpHole : public al::LiveActor {
 public:
diff --git a/lib/game/Item/Coin.h b/lib/game/Item/Coin.h
index 3eec2401..db7140ed 100644
--- a/lib/game/Item/Coin.h
+++ b/lib/game/Item/Coin.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/ActorInitInfo.h"
 
 class Coin : public al::LiveActor {
 public:
diff --git a/lib/game/Layout/CoinCounter.h b/lib/game/Layout/CoinCounter.h
index 003b4d46..af6b745c 100644
--- a/lib/game/Layout/CoinCounter.h
+++ b/lib/game/Layout/CoinCounter.h
@@ -4,6 +4,6 @@
  * VTable Loc: 1CC3170
  */
 
-#include "al/layout/LayoutActor.h"
+#include "layout/LayoutActor.h"
 
-class CoinCounter : public al::LayoutActor {};
\ No newline at end of file
+class CoinCounter : public al::LayoutActor {};
diff --git a/lib/game/Layout/StageSceneLayout.h b/lib/game/Layout/StageSceneLayout.h
index 7f7eae9d..7d7b2e37 100644
--- a/lib/game/Layout/StageSceneLayout.h
+++ b/lib/game/Layout/StageSceneLayout.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/Nerve/NerveStateBase.h"
+#include "Library/Nerve/NerveStateBase.h"
 
 namespace al {
 class PlayerHolder;
diff --git a/lib/game/MapObj/AnagramAlphabet.h b/lib/game/MapObj/AnagramAlphabet.h
index 96c9607f..9c16f591 100644
--- a/lib/game/MapObj/AnagramAlphabet.h
+++ b/lib/game/MapObj/AnagramAlphabet.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Nerve/NerveSetupUtil.h"
 
 class AnagramAlphabetCharacter;
 
diff --git a/lib/game/MapObj/AnagramAlphabetCharacter.h b/lib/game/MapObj/AnagramAlphabetCharacter.h
index 52d7829a..7370ee11 100644
--- a/lib/game/MapObj/AnagramAlphabetCharacter.h
+++ b/lib/game/MapObj/AnagramAlphabetCharacter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 class HackerJudgeNormalFall;
 class HackerJudgeStartRun;
diff --git a/lib/game/MapObj/CapTargetParts.h b/lib/game/MapObj/CapTargetParts.h
index d38e80f0..c64968d7 100644
--- a/lib/game/MapObj/CapTargetParts.h
+++ b/lib/game/MapObj/CapTargetParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/Obj/PartsModel.h"
+#include "Library/Obj/PartsModel.h"
 
 class CapTargetParts : public al::PartsModel {
 public:
diff --git a/lib/game/MapObj/FireDrum2D.h b/lib/game/MapObj/FireDrum2D.h
index e53c103d..c37f2672 100644
--- a/lib/game/MapObj/FireDrum2D.h
+++ b/lib/game/MapObj/FireDrum2D.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Nerve/NerveUtil.h"
 #include "game/Util/IUseDimension.h"
 
 namespace al {
diff --git a/lib/game/MapObj/WorldMapEarth.h b/lib/game/MapObj/WorldMapEarth.h
index 036b1a56..63ec205b 100644
--- a/lib/game/MapObj/WorldMapEarth.h
+++ b/lib/game/MapObj/WorldMapEarth.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 class WorldMapEarth : al::LiveActor {
 public:
diff --git a/lib/game/MapObj/WorldMapParts.h b/lib/game/MapObj/WorldMapParts.h
index 0ff09bde..77ed1403 100644
--- a/lib/game/MapObj/WorldMapParts.h
+++ b/lib/game/MapObj/WorldMapParts.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <math/seadMatrix.h>
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 class WorldMapParts : public al::LiveActor {
 public:
diff --git a/lib/game/Npc/AchievementInfoReader.h b/lib/game/Npc/AchievementInfoReader.h
index 66c4cfb4..88acdcb3 100644
--- a/lib/game/Npc/AchievementInfoReader.h
+++ b/lib/game/Npc/AchievementInfoReader.h
@@ -2,7 +2,7 @@
 
 #include <container/seadPtrArray.h>
 
-#include "al/Library/Base/String.h"
+#include "Library/Base/String.h"
 
 class AchievementInfo {
 public:
diff --git a/lib/game/Player/HackCap.h b/lib/game/Player/HackCap.h
index 7265923f..4c67e758 100644
--- a/lib/game/Player/HackCap.h
+++ b/lib/game/Player/HackCap.h
@@ -5,7 +5,7 @@
  * Vtable loc: 1D75520
  */
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 #define HACKSIZE sizeof(al::LiveActor)
 
diff --git a/lib/game/Player/HackerJudge.h b/lib/game/Player/HackerJudge.h
index 8bb33c3b..086b2a64 100644
--- a/lib/game/Player/HackerJudge.h
+++ b/lib/game/Player/HackerJudge.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 #include "game/Player/IJudge.h"
 
 class IUsePlayerHack;
diff --git a/lib/game/Player/Player.h b/lib/game/Player/Player.h
index 4b629313..dd93a461 100644
--- a/lib/game/Player/Player.h
+++ b/lib/game/Player/Player.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 class Player : public al::LiveActor {
 public:
diff --git a/lib/game/Player/PlayerActorBase.h b/lib/game/Player/PlayerActorBase.h
index 337ff9c8..2a2ef523 100644
--- a/lib/game/Player/PlayerActorBase.h
+++ b/lib/game/Player/PlayerActorBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 #include "game/Player/IUsePlayerHack.h"
 
 class IUsePlayerCollision;
diff --git a/lib/game/Player/PlayerConst.h b/lib/game/Player/PlayerConst.h
index 7de74088..7b1f4fb2 100644
--- a/lib/game/Player/PlayerConst.h
+++ b/lib/game/Player/PlayerConst.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Yaml/ByamlIter.h"
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/Yaml/ByamlIter.h"
+#include "Library/HostIO/HioNode.h"
 
 class PlayerConst : al::HioNode {
 public:
diff --git a/lib/game/Player/PlayerHackKeeper.h b/lib/game/Player/PlayerHackKeeper.h
index 7f2eb658..e36a8382 100644
--- a/lib/game/Player/PlayerHackKeeper.h
+++ b/lib/game/Player/PlayerHackKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 class PlayerRecoverySafetyPoint;
 class HackCap;
diff --git a/lib/game/Player/PlayerModelChangerHakoniwa.h b/lib/game/Player/PlayerModelChangerHakoniwa.h
index 898f96bc..73e13ba6 100644
--- a/lib/game/Player/PlayerModelChangerHakoniwa.h
+++ b/lib/game/Player/PlayerModelChangerHakoniwa.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
-#include "al/player/IPlayerModelChanger.h"
+#include "Library/HostIO/HioNode.h"
+#include "player/IPlayerModelChanger.h"
 
 namespace al {
 class LiveActor;
diff --git a/lib/game/Scene/ProjectActorFactory.h b/lib/game/Scene/ProjectActorFactory.h
index df3b21a0..db52377c 100644
--- a/lib/game/Scene/ProjectActorFactory.h
+++ b/lib/game/Scene/ProjectActorFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/ActorFactory.h"
+#include "Library/LiveActor/ActorFactory.h"
 
 namespace al {
 
diff --git a/lib/game/Scene/ProjectAppearSwitchFactory.h b/lib/game/Scene/ProjectAppearSwitchFactory.h
index 05a0ba14..9b73da80 100644
--- a/lib/game/Scene/ProjectAppearSwitchFactory.h
+++ b/lib/game/Scene/ProjectAppearSwitchFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/ActorFactory.h"
+#include "Library/LiveActor/ActorFactory.h"
 
 namespace al {
 
diff --git a/lib/game/Scene/StageScene.h b/lib/game/Scene/StageScene.h
index 60ed0d96..0cc2cde5 100644
--- a/lib/game/Scene/StageScene.h
+++ b/lib/game/Scene/StageScene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/scene/Scene.h"
+#include "scene/Scene.h"
 #include "game/StageScene/StageSceneLayout.h"
 
 #define INHERITSIZE sizeof(al::Scene)
diff --git a/lib/game/Scene/StageSceneStateWorldMap.h b/lib/game/Scene/StageSceneStateWorldMap.h
index 459ad70f..9b0e2192 100644
--- a/lib/game/Scene/StageSceneStateWorldMap.h
+++ b/lib/game/Scene/StageSceneStateWorldMap.h
@@ -2,10 +2,10 @@
 
 #include <container/seadPtrArray.h>
 
-#include "al/Library/Layout/LayoutActor.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/Nerve/NerveStateBase.h"
-#include "al/Library/Scene/Scene.h"
+#include "Library/Layout/LayoutActor.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/Nerve/NerveStateBase.h"
+#include "Library/Scene/Scene.h"
 
 #include "game/MapObj/WorldMapParts.h"
 #include "game/MapObj/WorldMapRoute.h"
diff --git a/lib/game/Sequence/HakoniwaSequence.h b/lib/game/Sequence/HakoniwaSequence.h
index eab72821..e2331d41 100644
--- a/lib/game/Sequence/HakoniwaSequence.h
+++ b/lib/game/Sequence/HakoniwaSequence.h
@@ -2,8 +2,8 @@
 
 #include "types.h"
 
-#include "al/audio/AudioDirector.h"
-#include "al/scene/Scene.h"
+#include "audio/AudioDirector.h"
+#include "scene/Scene.h"
 #include "game/GameData/GameDataHolderAccessor.h"
 #include "game/StageScene/StageScene.h"
 #include "game/WorldList/WorldResourceLoader.h"
@@ -53,4 +53,4 @@ public:
     undefined* field_0x2b8;
     undefined padding_0x160[160];
     undefined8 field_0x360;
-};
\ No newline at end of file
+};
diff --git a/lib/game/Sequence/WorldResourceLoader.h b/lib/game/Sequence/WorldResourceLoader.h
index 47fcdc4a..4f1c5b65 100644
--- a/lib/game/Sequence/WorldResourceLoader.h
+++ b/lib/game/Sequence/WorldResourceLoader.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <heap/seadFrameHeap.h>
-#include "al/Library/Resource/Resource.h"
-#include "al/Library/Thread/AsyncFunctorThread.h"
+#include "Library/Resource/Resource.h"
+#include "Library/Thread/AsyncFunctorThread.h"
 #include "game/System/GameDataHolder.h"
 
 class WorldResourceLoader {
diff --git a/lib/game/System/ByamlSave.h b/lib/game/System/ByamlSave.h
index 77b58071..cea8ccbd 100644
--- a/lib/game/System/ByamlSave.h
+++ b/lib/game/System/ByamlSave.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class ByamlIter;
diff --git a/lib/game/System/GameDataFunction.h b/lib/game/System/GameDataFunction.h
index d2e7e6d0..b3c1ed54 100644
--- a/lib/game/System/GameDataFunction.h
+++ b/lib/game/System/GameDataFunction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 #include "game/System/GameDataHolder.h"
 #include "game/System/GameDataHolderAccessor.h"
 #include "game/System/GameDataHolderWriter.h"
diff --git a/lib/game/System/GameDataHolder.h b/lib/game/System/GameDataHolder.h
index 82f9d3c4..da5f9f48 100644
--- a/lib/game/System/GameDataHolder.h
+++ b/lib/game/System/GameDataHolder.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "al/Library/Message/MessageSystem.h"
-#include "al/Library/Scene/GameDataHolderBase.h"
+#include "Library/Message/MessageSystem.h"
+#include "Library/Scene/GameDataHolderBase.h"
 #include "game/System/GameDataFile.h"
 #include "game/System/WorldList.h"
 
diff --git a/lib/game/System/GameSystem.h b/lib/game/System/GameSystem.h
index d398decd..bbfb83c5 100644
--- a/lib/game/System/GameSystem.h
+++ b/lib/game/System/GameSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Nerve/NerveExecutor.h"
-#include "al/Library/System/GameSystemInfo.h"
+#include "Library/Nerve/NerveExecutor.h"
+#include "Library/System/GameSystemInfo.h"
 
 namespace al {
 class Sequence;
diff --git a/src/al/Library/Shadow/DepthShadowMapCtrl.cpp b/src/al/Library/Shadow/DepthShadowMapCtrl.cpp
deleted file mode 100644
index d4a132b6..00000000
--- a/src/al/Library/Shadow/DepthShadowMapCtrl.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "al/Library/Shadow/DepthShadowMapCtrl.h"
-
-namespace al {}
diff --git a/src/al/Library/Shadow/ShadowMaskCtrl.cpp b/src/al/Library/Shadow/ShadowMaskCtrl.cpp
deleted file mode 100644
index f06580f4..00000000
--- a/src/al/Library/Shadow/ShadowMaskCtrl.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "al/Library/Shadow/ShadowMaskCtrl.h"
-
-namespace al {}
diff --git a/src/game/Boss/Mofumofu/MofumofuWarpHole.cpp b/src/game/Boss/Mofumofu/MofumofuWarpHole.cpp
index 21e16fe7..90129eac 100644
--- a/src/game/Boss/Mofumofu/MofumofuWarpHole.cpp
+++ b/src/game/Boss/Mofumofu/MofumofuWarpHole.cpp
@@ -2,14 +2,14 @@
 
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Math/VectorUtil.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Math/VectorUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveUtil.h"
 
 namespace {
 
diff --git a/src/game/MapObj/AnagramAlphabetCharacter.cpp b/src/game/MapObj/AnagramAlphabetCharacter.cpp
index 620c12f6..524676ae 100644
--- a/src/game/MapObj/AnagramAlphabetCharacter.cpp
+++ b/src/game/MapObj/AnagramAlphabetCharacter.cpp
@@ -1,18 +1,18 @@
 #include "game/MapObj/AnagramAlphabetCharacter.h"
 
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorClippingFunction.h"
-#include "al/Library/LiveActor/ActorCollisionFunction.h"
-#include "al/Library/LiveActor/ActorFlagFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorMovementFunction.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/LiveActor/ActorSensorFunction.h"
-#include "al/Library/LiveActor/ActorSensorMsgFunction.h"
-#include "al/Library/LiveActor/LiveActorFunction.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorCollisionFunction.h"
+#include "Library/LiveActor/ActorFlagFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorMovementFunction.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/LiveActor/ActorSensorFunction.h"
+#include "Library/LiveActor/ActorSensorMsgFunction.h"
+#include "Library/LiveActor/LiveActorFunction.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveUtil.h"
 #include "game/MapObj/AnagramAlphabet.h"
 #include "game/MapObj/CapTargetParts.h"
 #include "game/Player/HackerJudge.h"
diff --git a/src/game/MapObj/CapTargetParts.cpp b/src/game/MapObj/CapTargetParts.cpp
index 68513116..301a658e 100644
--- a/src/game/MapObj/CapTargetParts.cpp
+++ b/src/game/MapObj/CapTargetParts.cpp
@@ -1,7 +1,7 @@
 #include "game/MapObj/CapTargetParts.h"
 
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorModelFunction.h"
 
 CapTargetParts::CapTargetParts(al::LiveActor* actor, const al::ActorInitInfo& initInfo)
     : al::PartsModel("帽子の的パーツ") {
diff --git a/src/game/MapObj/FireDrum2D.cpp b/src/game/MapObj/FireDrum2D.cpp
index a24e0d38..f372ef64 100644
--- a/src/game/MapObj/FireDrum2D.cpp
+++ b/src/game/MapObj/FireDrum2D.cpp
@@ -1,11 +1,11 @@
 #include "game/MapObj/FireDrum2D.h"
 
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorSensorMsgFunction.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorSensorMsgFunction.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveUtil.h"
 #include "game/Util/ActorDimensionKeeper.h"
 #include "game/Util/Sensor.h"
 
diff --git a/src/game/MapObj/WorldMapEarth.cpp b/src/game/MapObj/WorldMapEarth.cpp
index 4d30a018..99d97a19 100644
--- a/src/game/MapObj/WorldMapEarth.cpp
+++ b/src/game/MapObj/WorldMapEarth.cpp
@@ -1,8 +1,8 @@
 #include "game/MapObj/WorldMapEarth.h"
 
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/Math/MathUtil.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/Math/MathUtil.h"
 
 WorldMapEarth::WorldMapEarth(const char* name) : al::LiveActor(name) {}
 
diff --git a/src/game/MapObj/WorldMapParts.cpp b/src/game/MapObj/WorldMapParts.cpp
index 76deb784..18d0f6db 100644
--- a/src/game/MapObj/WorldMapParts.cpp
+++ b/src/game/MapObj/WorldMapParts.cpp
@@ -1,9 +1,9 @@
 #include "game/MapObj/WorldMapParts.h"
 
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/Math/MathUtil.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/Math/MathUtil.h"
 
 void localFunc_34B9A8(WorldMapParts* mapParts) {
     al::invalidateOcclusionQuery(mapParts);
diff --git a/src/game/Npc/AchievementHolder.cpp b/src/game/Npc/AchievementHolder.cpp
index 17e8ca5f..f8183e68 100644
--- a/src/game/Npc/AchievementHolder.cpp
+++ b/src/game/Npc/AchievementHolder.cpp
@@ -2,9 +2,9 @@
 
 #include "game/Npc/Achievement.h"
 #include "game/Npc/AchievementInfoReader.h"
-#include "al/Library/Resource/ResourceUtil.h"
+#include "Library/Resource/ResourceUtil.h"
 #include "game/Util/ResourceUtil.h"
-#include "al/Library/Base/String.h"
+#include "Library/Base/String.h"
 
 AchievementHolder::AchievementHolder() = default;
 
diff --git a/src/game/Npc/AchievementInfoReader.cpp b/src/game/Npc/AchievementInfoReader.cpp
index ad540580..a68a2714 100644
--- a/src/game/Npc/AchievementInfoReader.cpp
+++ b/src/game/Npc/AchievementInfoReader.cpp
@@ -1,8 +1,8 @@
 #include "game/Npc/AchievementInfoReader.h"
 
-#include "al/Library/Yaml/ByamlIter.h"
-#include "al/Library/Resource/ResourceUtil.h"
-#include "al/Library/Base/String.h"
+#include "Library/Yaml/ByamlIter.h"
+#include "Library/Resource/ResourceUtil.h"
+#include "Library/Base/String.h"
 
 AchievementInfoReader::AchievementInfoReader() = default;
 
diff --git a/src/game/Player/HackCapThrowParam.cpp b/src/game/Player/HackCapThrowParam.cpp
index 9a2f02f9..776cacc9 100644
--- a/src/game/Player/HackCapThrowParam.cpp
+++ b/src/game/Player/HackCapThrowParam.cpp
@@ -1,6 +1,6 @@
 #include "game/Player/HackCapThrowParam.h"
 
-#include "al/Library/LiveActor/LiveActorUtil.h"
+#include "Library/LiveActor/LiveActorUtil.h"
 
 HackCapThrowParam::HackCapThrowParam(al::LiveActor* actor) {
     mHackThrowHeight = al::findActorParamF32(actor, "投げる高さ");
diff --git a/src/game/Player/Player.cpp b/src/game/Player/Player.cpp
index e11206be..d6841b73 100644
--- a/src/game/Player/Player.cpp
+++ b/src/game/Player/Player.cpp
@@ -1,13 +1,13 @@
 #include "game/Player/Player.h"
-#include "al/Library/Controller/InputFunction.h"
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorClippingFunction.h"
-#include "al/Library/LiveActor/ActorInitInfo.h"
-#include "al/Library/LiveActor/ActorMovementFunction.h"
-#include "al/Library/LiveActor/ActorPoseKeeper.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Nerve/NerveSetupUtil.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/Controller/InputFunction.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorClippingFunction.h"
+#include "Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorMovementFunction.h"
+#include "Library/LiveActor/ActorPoseKeeper.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveUtil.h"
 
 namespace {
 NERVE_IMPL(Player, Wait);
diff --git a/src/game/Player/PlayerCostumeInfo.cpp b/src/game/Player/PlayerCostumeInfo.cpp
index efe331bf..81dc1424 100644
--- a/src/game/Player/PlayerCostumeInfo.cpp
+++ b/src/game/Player/PlayerCostumeInfo.cpp
@@ -1,7 +1,7 @@
 #include "game/Player/PlayerCostumeInfo.h"
 
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Base/String.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Base/String.h"
 
 PlayerHeadCostumeInfo::PlayerHeadCostumeInfo(char const* a1) {
     _0 = a1;
diff --git a/src/game/Player/PlayerEquipmentUser.cpp b/src/game/Player/PlayerEquipmentUser.cpp
index e5d543bf..bfca434e 100644
--- a/src/game/Player/PlayerEquipmentUser.cpp
+++ b/src/game/Player/PlayerEquipmentUser.cpp
@@ -1,6 +1,6 @@
 #include "game/Player/PlayerEquipmentUser.h"
 
-#include "al/Library/LiveActor/ActorSensorMsgFunction.h"
+#include "Library/LiveActor/ActorSensorMsgFunction.h"
 #include "game/Util/Sensor.h"
 
 PlayerEquipmentUser::PlayerEquipmentUser(const PlayerInput* input,
diff --git a/src/game/Player/PlayerInput.cpp b/src/game/Player/PlayerInput.cpp
index c6d0bec6..52ae4661 100644
--- a/src/game/Player/PlayerInput.cpp
+++ b/src/game/Player/PlayerInput.cpp
@@ -1,10 +1,10 @@
 #include "game/Player/PlayerInput.h"
 
-#include "al/Library/Controller/InputFunction.h"
-#include "al/Library/Controller/JoyPadAccelPoseAnalyzer.h"
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Math/MathUtil.h"
-#include "al/Library/Math/VectorUtil.h"
+#include "Library/Controller/InputFunction.h"
+#include "Library/Controller/JoyPadAccelPoseAnalyzer.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Math/MathUtil.h"
+#include "Library/Math/VectorUtil.h"
 #include "game/Player/PlayerFunction.h"
 #include "game/Player/PlayerInputFunction.h"
 #include "game/Util/ActorDimensionKeeper.h"
diff --git a/src/game/Player/PlayerInputFunction.cpp b/src/game/Player/PlayerInputFunction.cpp
index 2cf08553..0f09067e 100644
--- a/src/game/Player/PlayerInputFunction.cpp
+++ b/src/game/Player/PlayerInputFunction.cpp
@@ -1,7 +1,7 @@
 #include "game/Player/PlayerInputFunction.h"
 
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Controller/InputFunction.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Controller/InputFunction.h"
 
 bool PlayerInputFunction::isTriggerAction(const al::LiveActor* actor, int port) {
     if (rs::isSeparatePlay(actor) && al::isPadTypeJoySingle(port)) {
diff --git a/src/game/Player/PlayerModelHolder.cpp b/src/game/Player/PlayerModelHolder.cpp
index 4a52331f..a7c558f0 100644
--- a/src/game/Player/PlayerModelHolder.cpp
+++ b/src/game/Player/PlayerModelHolder.cpp
@@ -1,6 +1,6 @@
 #include "game/Player/PlayerModelHolder.h"
 
-#include "al/Library/Base/String.h"
+#include "Library/Base/String.h"
 
 PlayerModelHolder::PlayerModelHolder(unsigned int bufferSize) {
     mBuffer.allocBuffer(bufferSize, nullptr);
diff --git a/src/game/Player/PlayerPainPartsKeeper.cpp b/src/game/Player/PlayerPainPartsKeeper.cpp
index 61fa6a78..6fae4a6d 100644
--- a/src/game/Player/PlayerPainPartsKeeper.cpp
+++ b/src/game/Player/PlayerPainPartsKeeper.cpp
@@ -1,10 +1,10 @@
 #include "game/Player/PlayerPainPartsKeeper.h"
 
-#include "al/Library/LiveActor/ActorActionFunction.h"
-#include "al/Library/LiveActor/ActorModelFunction.h"
-#include "al/Library/LiveActor/ActorMovementFunction.h"
-#include "al/Library/LiveActor/LiveActorUtil.h"
-#include "al/Library/Model/PartsModel.h"
+#include "Library/LiveActor/ActorActionFunction.h"
+#include "Library/LiveActor/ActorModelFunction.h"
+#include "Library/LiveActor/ActorMovementFunction.h"
+#include "Library/LiveActor/LiveActorUtil.h"
+#include "Library/Model/PartsModel.h"
 #include "game/Player/Player.h"
 #include "game/Player/PlayerCostumeInfo.h"
 #include "game/Player/PlayerModelHolder.h"
diff --git a/src/game/Scene/ProjectActorFactory.cpp b/src/game/Scene/ProjectActorFactory.cpp
index 6b37b397..0c7f5c6b 100644
--- a/src/game/Scene/ProjectActorFactory.cpp
+++ b/src/game/Scene/ProjectActorFactory.cpp
@@ -1,5 +1,5 @@
 #include "game/Scene/ProjectActorFactory.h"
-#include "al/Library/Factory/Factory.h"
+#include "Library/Factory/Factory.h"
 
 namespace al {
 
diff --git a/src/game/Sequence/WorldResourceLoader.cpp b/src/game/Sequence/WorldResourceLoader.cpp
index 6677b6fb..43ec3dbe 100644
--- a/src/game/Sequence/WorldResourceLoader.cpp
+++ b/src/game/Sequence/WorldResourceLoader.cpp
@@ -1,12 +1,12 @@
 #include "game/Sequence/WorldResourceLoader.h"
 
 #include <thread/seadThread.h>
-#include "al/Library/Base/String.h"
-#include "al/Library/File/FileUtil.h"
-#include "al/Library/Memory/HeapUtil.h"
-#include "al/Library/Resource/ResourceHolder.h"
-#include "al/Library/Yaml/ByamlIter.h"
-#include "al/Library/Yaml/ByamlUtil.h"
+#include "Library/Base/String.h"
+#include "Library/File/FileUtil.h"
+#include "Library/Memory/HeapUtil.h"
+#include "Library/Resource/ResourceHolder.h"
+#include "Library/Yaml/ByamlIter.h"
+#include "Library/Yaml/ByamlUtil.h"
 
 s32 priority = sead::Thread::cDefaultPriority;
 
diff --git a/src/game/System/GameConfigData.cpp b/src/game/System/GameConfigData.cpp
index 3095c0f8..089af7d3 100644
--- a/src/game/System/GameConfigData.cpp
+++ b/src/game/System/GameConfigData.cpp
@@ -1,7 +1,7 @@
 #include "game/System/GameConfigData.h"
 
-#include "al/Library/Yaml/ByamlUtil.h"
-#include "al/Library/Yaml/Writer/ByamlWriter.h"
+#include "Library/Yaml/ByamlUtil.h"
+#include "Library/Yaml/Writer/ByamlWriter.h"
 
 void GameConfigData::init() {
     mCameraStickSensitivityLevel = -1;
diff --git a/src/game/System/GameDataFile.cpp b/src/game/System/GameDataFile.cpp
index 17a015aa..4c2c28e7 100644
--- a/src/game/System/GameDataFile.cpp
+++ b/src/game/System/GameDataFile.cpp
@@ -1,6 +1,6 @@
 #include "game/System/GameDataFile.h"
 
-#include "al/Library/Base/String.h"
+#include "Library/Base/String.h"
 #include "game/System/GameDataFunction.h"
 
 void GameDataFile::HintInfo::clear() {
diff --git a/src/game/System/GameDataHolderAccessor.cpp b/src/game/System/GameDataHolderAccessor.cpp
index 4296dd8f..d41933d1 100644
--- a/src/game/System/GameDataHolderAccessor.cpp
+++ b/src/game/System/GameDataHolderAccessor.cpp
@@ -1,8 +1,8 @@
 #include "game/System/GameDataHolderAccessor.h"
 
-#include "al/Library/Scene/ISceneObj.h"
-#include "al/Library/Scene/SceneObjHolder.h"
-#include "al/Library/Scene/SceneUtil.h"
+#include "Library/Scene/ISceneObj.h"
+#include "Library/Scene/SceneObjHolder.h"
+#include "Library/Scene/SceneUtil.h"
 
 GameDataHolderAccessor::GameDataHolderAccessor(const al::IUseSceneObjHolder* holder) {
     mSceneObj = al::getSceneObj(holder, 18);
diff --git a/src/game/System/GameSystem.cpp b/src/game/System/GameSystem.cpp
index 6fd0ceb0..dde9ef67 100644
--- a/src/game/System/GameSystem.cpp
+++ b/src/game/System/GameSystem.cpp
@@ -1,6 +1,6 @@
 #include "game/System/GameSystem.h"
 
-#include "al/Library/Nerve/NerveSetupUtil.h"
+#include "Library/Nerve/NerveSetupUtil.h"
 
 namespace {
 
diff --git a/src/game/System/ProjectInterface.cpp b/src/game/System/ProjectInterface.cpp
index ccddd7c0..72965575 100644
--- a/src/game/System/ProjectInterface.cpp
+++ b/src/game/System/ProjectInterface.cpp
@@ -1,4 +1,4 @@
-#include "al/Library/System/SystemKit.h"
+#include "Library/System/SystemKit.h"
 #include "game/System/Application.h"
 
 al::SystemKit* alProjectInterface::getSystemKit() {
diff --git a/src/game/System/RootTask.cpp b/src/game/System/RootTask.cpp
index 6d067529..e0da836c 100644
--- a/src/game/System/RootTask.cpp
+++ b/src/game/System/RootTask.cpp
@@ -1,7 +1,7 @@
 #include "game/System/RootTask.h"
 
 #include <heap/seadHeapMgr.h>
-#include "al/Library/Memory/HeapUtil.h"
+#include "Library/Memory/HeapUtil.h"
 #include "game/System/GameSystem.h"
 
 void RootTask::enter() {}