diff --git a/build.gradle b/build.gradle
index 747e235f..29f76b16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,9 +123,11 @@ jar {
     }
 }
 
-// Temporary fix for resources not being available during testing
-// Comment this out upon publishing
-// sourceSets {main { output.resourcesDir = output.classesDir }}
+// Only apply this config when running the project from IntelliJ IDEA
+// This fixes resources being stale during development
+if (System.getProperty("idea.active") == "true") {
+    sourceSets {main { output.resourcesDir = output.classesDir }}
+}
 
 // Example configuration to allow publishing using the maven-publish task
 // This is the preferred method to reobfuscate your jar file
diff --git a/src/main/java/goblinbob/mobends/standard/animation/bit/wolf/WolfSittingAnimationBit.java b/src/main/java/goblinbob/mobends/standard/animation/bit/wolf/WolfSittingAnimationBit.java
index f38977ec..03c1a9a3 100644
--- a/src/main/java/goblinbob/mobends/standard/animation/bit/wolf/WolfSittingAnimationBit.java
+++ b/src/main/java/goblinbob/mobends/standard/animation/bit/wolf/WolfSittingAnimationBit.java
@@ -9,7 +9,7 @@ public class WolfSittingAnimationBit extends KeyframeAnimationBit<WolfData>
 {
 
     private static final String[] ACTIONS = new String[] { "sitting" };
-    private static final ResourceLocation SITTING_ANIMATION = new ResourceLocation(ModStatics.MODID, "animations/wolf_sitting_down.json");
+    private static final ResourceLocation SITTING_ANIMATION = new ResourceLocation(ModStatics.MODID, "bends/animations/wolf_sitting_down.json");
 
     public WolfSittingAnimationBit(float animationSpeed)
     {
diff --git a/src/main/java/goblinbob/mobends/standard/animation/controller/WolfController.java b/src/main/java/goblinbob/mobends/standard/animation/controller/WolfController.java
index 06660127..ca2fe6b6 100644
--- a/src/main/java/goblinbob/mobends/standard/animation/controller/WolfController.java
+++ b/src/main/java/goblinbob/mobends/standard/animation/controller/WolfController.java
@@ -25,7 +25,7 @@
  */
 public class WolfController implements IAnimationController<WolfData>
 {
-    protected static final ResourceLocation WOLF_ANIMATOR = new ResourceLocation(ModStatics.MODID, "animators/wolf.json");
+    protected static final ResourceLocation WOLF_ANIMATOR = new ResourceLocation(ModStatics.MODID, "bends/animators/wolf.json");
     protected AnimatorTemplate animatorTemplate;
     protected KumoAnimatorState<WolfData> kumoAnimatorState;
 
diff --git a/src/main/resources/assets/mobends/animations/player_anim_harvest.json b/src/main/resources/assets/mobends/bends/animations/player_anim_harvest.json
similarity index 100%
rename from src/main/resources/assets/mobends/animations/player_anim_harvest.json
rename to src/main/resources/assets/mobends/bends/animations/player_anim_harvest.json
diff --git a/src/main/resources/assets/mobends/animations/wolf_breathing.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_breathing.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_breathing.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_breathing.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_idle.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_idle.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_idle.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_idle.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_run.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_run.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_run.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_run.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_sitting.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_sitting.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_sitting.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_sitting.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_sitting_down.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_sitting_down.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_sitting_down.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_sitting_down.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_standing_up.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_standing_up.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_standing_up.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_standing_up.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_test.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_test.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_test.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_test.bendsanim
diff --git a/src/main/resources/assets/mobends/animations/wolf_walking.bendsanim b/src/main/resources/assets/mobends/bends/animations/wolf_walking.bendsanim
similarity index 100%
rename from src/main/resources/assets/mobends/animations/wolf_walking.bendsanim
rename to src/main/resources/assets/mobends/bends/animations/wolf_walking.bendsanim
diff --git a/src/main/resources/assets/mobends/animators/wolf.json b/src/main/resources/assets/mobends/bends/animators/wolf.json
similarity index 86%
rename from src/main/resources/assets/mobends/animators/wolf.json
rename to src/main/resources/assets/mobends/bends/animators/wolf.json
index 92d6a783..a36c4837 100644
--- a/src/main/resources/assets/mobends/animators/wolf.json
+++ b/src/main/resources/assets/mobends/bends/animators/wolf.json
@@ -7,7 +7,7 @@
         {
           "comment": "NODE 0 - Idle",
           "type": "core:standard",
-          "animationKey": "mobends:animations/wolf_idle.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_idle.bendsanim",
           "playbackSpeed": 1,
           "looping": true,
           "connections": [
@@ -32,7 +32,7 @@
         {
           "comment": "NODE 1 - Walking",
           "type": "core:movement",
-          "animationKey": "mobends:animations/wolf_walking.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_walking.bendsanim",
           "playbackSpeed": 4,
           "connections": [
             {
@@ -56,7 +56,7 @@
         {
           "comment": "NODE 2 - Sitting Down",
           "type": "core:standard",
-          "animationKey": "mobends:animations/wolf_sitting_down.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_sitting_down.bendsanim",
           "playbackSpeed": 2,
           "startFrame": 6,
           "connections": [
@@ -70,7 +70,7 @@
         {
           "comment": "NODE 3 - Sitting",
           "type": "core:standard",
-          "animationKey": "mobends:animations/wolf_sitting.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_sitting.bendsanim",
           "playbackSpeed": 1,
           "startFrame": 0,
           "looping": true,
@@ -91,7 +91,7 @@
         {
           "comment": "NODE 4 - Standing Up",
           "type": "core:standard",
-          "animationKey": "mobends:animations/wolf_standing_up.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_standing_up.bendsanim",
           "playbackSpeed": 2,
           "startFrame": 4,
           "connections": [
@@ -110,16 +110,13 @@
       "additive": true,
       "mask": {
         "mode": "INCLUDE_ONLY",
-        "includedParts": [
-          "tongue",
-          "mouth"
-        ]
+        "includedParts": ["tongue", "mouth"]
       },
       "nodes": [
         {
           "comment": "NODE 0 - Idle",
           "type": "core:standard",
-          "animationKey": "mobends:animations/wolf_idle.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_idle.bendsanim",
           "playbackSpeed": 1,
           "looping": true,
           "connections": [
@@ -136,7 +133,7 @@
         {
           "comment": "NODE 1 - Breathing",
           "type": "core:standard",
-          "animationKey": "mobends:animations/wolf_breathing.bendsanim",
+          "animationKey": "mobends:bends/animations/wolf_breathing.bendsanim",
           "playbackSpeed": 1.2,
           "looping": true,
           "connections": [
@@ -153,4 +150,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}