diff --git a/src/main/java/noppes/npcs/controllers/AnimationController.java b/src/main/java/noppes/npcs/controllers/AnimationController.java
index 6e9d9e87c..ae9012b75 100644
--- a/src/main/java/noppes/npcs/controllers/AnimationController.java
+++ b/src/main/java/noppes/npcs/controllers/AnimationController.java
@@ -43,8 +43,8 @@ public class AnimationController implements IAnimationHandler {
 
     // Built-in animations loaded from assets folder (read-only, keyed by name)
     public HashMap<String, BuiltInAnimation> builtInAnimations = new HashMap<>();
-    private static final String BUILTIN_ANIMATIONS_PATH = "/assets/customnpcs/animations";
-    private static final String BUILTIN_ANIMATIONS_RESOURCE = "assets/customnpcs/animations";
+    private static final String BUILTIN_ANIMATIONS_PATH = "/assets/customnpcs/cnpc_animations";
+    private static final String BUILTIN_ANIMATIONS_RESOURCE = "assets/customnpcs/cnpc_animations";
 
     public static AnimationController Instance = new AnimationController();
     private int lastUsedID = 0;
@@ -75,7 +75,7 @@ public class AnimationController implements IAnimationHandler {
     }
 
     /**
-     * Load built-in animations from assets/customnpcs/animations/ folder.
+     * Load built-in animations from assets/customnpcs/cnpc_animations/ folder.
      * These animations are read-only and accessed by name only (no IDs).
      * Scans the folder directly instead of using a manifest.
      */
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_BeamDual_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_BeamDual_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_BeamDual_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_BeamDual_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_BeamDual_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Beam_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Beam_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Beam_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Beam_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Beam_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Beam_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Beam_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Beam_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Charge_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Charge_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Charge_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Charge_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Charge_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Charge_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Charge_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Charge_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Cutter_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Cutter_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Cutter_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Cutter_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Cutter_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Cutter_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Cutter_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Cutter_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_DiscDual_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_DiscDual_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_DiscDual_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_DiscDual_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Disc_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Disc_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Disc_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Disc_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Disc_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Disc_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Disc_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Disc_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Generic_Dazed.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Generic_Dazed.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Generic_Dazed.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Generic_Dazed.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Guard_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Guard_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Guard_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Guard_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Guard_Counter.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Guard_Counter.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Guard_Counter.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Guard_Counter.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_HeavyHit_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_HeavyHit_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_HeavyHit_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_HeavyHit_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Laser_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Laser_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Laser_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Laser_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Laser_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Laser_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Laser_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Laser_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbBarrage_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbBarrage_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbBarrage_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbBarrage_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_OrbDual_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbDual_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_OrbDual_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbDual_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_OrbDual_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbDual_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_OrbDual_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_OrbDual_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Orb_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Orb_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Orb_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Orb_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Orb_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Orb_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Orb_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Orb_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Shockwave_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Shockwave_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Shockwave_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Shockwave_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Shockwave_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Shockwave_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Shockwave_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Shockwave_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Slam_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Slam_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Slam_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Slam_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Slam_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Slam_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Slam_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Slam_Windup.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Zone_Active.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Zone_Active.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Zone_Active.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Zone_Active.json
diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Zone_Windup.json b/src/main/resources/assets/customnpcs/cnpc_animations/Ability_Zone_Windup.json
similarity index 100%
rename from src/main/resources/assets/customnpcs/animations/Ability_Zone_Windup.json
rename to src/main/resources/assets/customnpcs/cnpc_animations/Ability_Zone_Windup.json