diff --git a/configure.py b/configure.py
index d742bbe2..352adf60 100755
--- a/configure.py
+++ b/configure.py
@@ -497,7 +497,7 @@ LIBS = [
             "Kyoto/Animation/CPASAnimState",
             "Kyoto/Animation/CPASDatabase",
             "Kyoto/Animation/CPASParmInfo",
-            "Kyoto/Animation/CPrimitive",
+            ["Kyoto/Animation/CPrimitive", True],
             "Kyoto/Animation/CSequenceHelper",
             ["Kyoto/Animation/CTransition", True],
             "Kyoto/Animation/CTransitionManager",
@@ -528,7 +528,7 @@ LIBS = [
             "Kyoto/Animation/CHierarchyPoseBuilder",
             "Kyoto/Animation/CInt32POINode",
             "Kyoto/Animation/CParticlePOINode",
-            "Kyoto/Animation/CPOINode",
+            ["Kyoto/Animation/CPOINode", False],
             "Kyoto/Animation/CSegStatementSet",
             "Kyoto/Animation/CTimeScaleFunctions",
             "Kyoto/Animation/IAnimReader",
@@ -682,7 +682,7 @@ LIBS = [
             "Kyoto/Audio/CDSPStreamManager",
             "Kyoto/CDependencyGroup",
             "Kyoto/Audio/CStreamAudioManager",
-            "Kyoto/Animation/CHalfTransition",
+            ["Kyoto/Animation/CHalfTransition", True],
             "Kyoto/Particles/CElectricDescription",
             "Kyoto/Particles/CSwooshDescription",
             "Kyoto/Particles/CGenDescription",
diff --git a/include/MetroidPrime/CCharAnimTime.hpp b/include/Kyoto/Animation/CCharAnimTime.hpp
similarity index 100%
rename from include/MetroidPrime/CCharAnimTime.hpp
rename to include/Kyoto/Animation/CCharAnimTime.hpp
diff --git a/include/MetroidPrime/CCharacterInfo.hpp b/include/Kyoto/Animation/CCharacterInfo.hpp
similarity index 96%
rename from include/MetroidPrime/CCharacterInfo.hpp
rename to include/Kyoto/Animation/CCharacterInfo.hpp
index 384935f2..2dc39b27 100644
--- a/include/MetroidPrime/CCharacterInfo.hpp
+++ b/include/Kyoto/Animation/CCharacterInfo.hpp
@@ -3,7 +3,7 @@
 
 #include "types.h"
 
-#include "MetroidPrime/CEffectComponent.hpp"
+#include "Kyoto/Animation/CEffectComponent.hpp"
 
 #include "Kyoto/Animation/CPASDatabase.hpp"
 #include "Kyoto/IObjectStore.hpp"
diff --git a/include/MetroidPrime/CEffectComponent.hpp b/include/Kyoto/Animation/CEffectComponent.hpp
similarity index 86%
rename from include/MetroidPrime/CEffectComponent.hpp
rename to include/Kyoto/Animation/CEffectComponent.hpp
index 9fa072dd..f6fe91e7 100644
--- a/include/MetroidPrime/CEffectComponent.hpp
+++ b/include/Kyoto/Animation/CEffectComponent.hpp
@@ -3,7 +3,7 @@
 
 #include "types.h"
 
-#include "MetroidPrime/CParticleData.hpp"
+#include "Kyoto/Animation/CParticleData.hpp"
 
 class CEffectComponent {
 private:
diff --git a/include/MetroidPrime/CPOINode.hpp b/include/Kyoto/Animation/CPOINode.hpp
similarity index 95%
rename from include/MetroidPrime/CPOINode.hpp
rename to include/Kyoto/Animation/CPOINode.hpp
index 11b4470b..1c5184ba 100644
--- a/include/MetroidPrime/CPOINode.hpp
+++ b/include/Kyoto/Animation/CPOINode.hpp
@@ -3,8 +3,8 @@
 
 #include "types.h"
 
-#include "MetroidPrime/CCharAnimTime.hpp"
-#include "MetroidPrime/CParticleData.hpp"
+#include "Kyoto/Animation/CCharAnimTime.hpp"
+#include "Kyoto/Animation/CParticleData.hpp"
 
 #include "rstl/string.hpp"
 
diff --git a/include/MetroidPrime/CParticleData.hpp b/include/Kyoto/Animation/CParticleData.hpp
similarity index 100%
rename from include/MetroidPrime/CParticleData.hpp
rename to include/Kyoto/Animation/CParticleData.hpp
diff --git a/include/Kyoto/Animation/CPrimitive.hpp b/include/Kyoto/Animation/CPrimitive.hpp
index 14980cee..6d66b011 100644
--- a/include/Kyoto/Animation/CPrimitive.hpp
+++ b/include/Kyoto/Animation/CPrimitive.hpp
@@ -5,8 +5,10 @@
 
 #include "rstl/string.hpp"
 
+class CInputStream;
 class CPrimitive {
 public:
+  CPrimitive(CInputStream& in);
   CAssetId GetAnimResId() const { return x0_animId; }
 
 private:
diff --git a/include/Kyoto/Animation/IAnimReader.hpp b/include/Kyoto/Animation/IAnimReader.hpp
index 6661aab5..e0bab4aa 100644
--- a/include/Kyoto/Animation/IAnimReader.hpp
+++ b/include/Kyoto/Animation/IAnimReader.hpp
@@ -4,8 +4,7 @@
 #include "Kyoto/Math/CVector3f.hpp"
 #include "Kyoto/Math/CQuaternion.hpp"
 
-// TODO: wrong module?
-#include "MetroidPrime/CCharAnimTime.hpp"
+#include "Kyoto/Animation/CCharAnimTime.hpp"
 
 #include "rstl/string.hpp"
 
diff --git a/include/MetroidPrime/CAnimData.hpp b/include/MetroidPrime/CAnimData.hpp
index 67d30433..3cd87099 100644
--- a/include/MetroidPrime/CAnimData.hpp
+++ b/include/MetroidPrime/CAnimData.hpp
@@ -6,13 +6,13 @@
 #include "MetroidPrime/ActorCommon.hpp"
 #include "MetroidPrime/CAdditiveAnimPlayback.hpp"
 #include "MetroidPrime/CAnimPlaybackParms.hpp"
-#include "MetroidPrime/CCharAnimTime.hpp"
-#include "MetroidPrime/CCharacterInfo.hpp"
+#include "Kyoto/Animation/CCharacterInfo.hpp"
 #include "MetroidPrime/CHierarchyPoseBuilder.hpp"
-#include "MetroidPrime/CPOINode.hpp"
+#include "Kyoto/Animation/CPOINode.hpp"
 #include "MetroidPrime/CParticleDatabase.hpp"
 #include "MetroidPrime/CPoseAsTransforms.hpp"
 
+#include "Kyoto/Animation/CCharAnimTime.hpp"
 #include "Kyoto/Animation/CSkinnedModel.hpp"
 #include "Kyoto/TToken.hpp"
 
diff --git a/include/MetroidPrime/CParticleGenInfo.hpp b/include/MetroidPrime/CParticleGenInfo.hpp
index 4c1e67bd..21ff9cac 100644
--- a/include/MetroidPrime/CParticleGenInfo.hpp
+++ b/include/MetroidPrime/CParticleGenInfo.hpp
@@ -1,7 +1,7 @@
 #ifndef _CPARTICLEGENINFO
 #define _CPARTICLEGENINFO
 
-#include "MetroidPrime/CParticleData.hpp"
+#include "Kyoto/Animation/CParticleData.hpp"
 
 #include "MetroidPrime/TGameTypes.hpp"
 
diff --git a/src/MetroidPrime/BodyState/CBSAttack.cpp b/src/MetroidPrime/BodyState/CBSAttack.cpp
index 99c69520..e2dae276 100644
--- a/src/MetroidPrime/BodyState/CBSAttack.cpp
+++ b/src/MetroidPrime/BodyState/CBSAttack.cpp
@@ -4,10 +4,10 @@
 #include "MetroidPrime/CActor.hpp"
 #include "MetroidPrime/CAnimData.hpp"
 #include "MetroidPrime/CAnimPlaybackParms.hpp"
-#include "MetroidPrime/CCharAnimTime.hpp"
 #include "MetroidPrime/CPhysicsActor.hpp"
 #include "MetroidPrime/CStateManager.hpp"
 
+#include "Kyoto/Animation/CCharAnimTime.hpp"
 #include "Kyoto/Animation/CPASAnimParmData.hpp"
 #include "Kyoto/Animation/CPASDatabase.hpp"
 
@@ -122,8 +122,9 @@ void CBSAttack::UpdatePhysicsActor(CBodyController& bc, float dt) {
       CVector3f delta = x20_targetPos - act->GetTranslation();
       const float dur = x30_alignTargetPosTime - x2c_alignTargetPosStartTime;
       CVector3f deltaMod = (dur > 0.f) ? (delta * (dt / dur)) : delta;
-      
-      CVector3f impulse = act->GetMoveToORImpulseWR(act->GetTransform().TransposeRotate(deltaMod), dt);
+
+      CVector3f impulse =
+          act->GetMoveToORImpulseWR(act->GetTransform().TransposeRotate(deltaMod), dt);
       act->ApplyImpulseWR(impulse, CAxisAngle::Identity());
     }
   }
diff --git a/src/MetroidPrime/Enemies/CNewIntroBoss.cpp b/src/MetroidPrime/Enemies/CNewIntroBoss.cpp
index 44d543be..97cfb845 100644
--- a/src/MetroidPrime/Enemies/CNewIntroBoss.cpp
+++ b/src/MetroidPrime/Enemies/CNewIntroBoss.cpp
@@ -3,7 +3,7 @@
 #include "MetroidPrime/CCollisionActorManager.hpp"
 #include "MetroidPrime/CGameCollision.hpp"
 #include "MetroidPrime/CHealthInfo.hpp"
-#include "MetroidPrime/CPOINode.hpp"
+#include "Kyoto/Animation/CPOINode.hpp"
 #include "MetroidPrime/CRumbleManager.hpp"
 #include "MetroidPrime/Player/CPlayer.hpp"
 #include "MetroidPrime/Weapons/CBeamProjectile.hpp"