diff --git a/src/api b/src/api
index 13d32ae42..6141ae147 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit 13d32ae42518a70ea3cc80677a7d3e611a2aef9b
+Subproject commit 6141ae1472dcd944c3797927c66b1ad4892e2a53
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java
index a0509090a..1f7db6f5c 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java
@@ -4,6 +4,9 @@ import noppes.npcs.api.handler.IActionManager;
 import noppes.npcs.api.handler.data.IAction;
 import noppes.npcs.api.handler.data.IActionChain;
 import noppes.npcs.api.handler.data.actions.IConditionalAction;
+import noppes.npcs.controllers.data.action.action.ConditionalAction;
+import noppes.npcs.controllers.data.action.chain.ActionChain;
+import noppes.npcs.controllers.data.action.chain.ParallelActionChain;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedDeque;
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java
index b8f5f3361..ae5db82d6 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java
@@ -104,7 +104,7 @@ public class ActionThread {
         return runningTasks.stream().anyMatch(task -> !task.isDone());
     }
 
-    protected void execute(String taskKey, Runnable task) {
+    public void execute(String taskKey, Runnable task) {
         if (threadPaused && pauseUntil != null && pauseUntil.apply(action))
             resume();
 
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java
similarity index 96%
rename from src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
rename to src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java
index 4e53bef50..c7be5b407 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java
@@ -1,7 +1,9 @@
-package noppes.npcs.controllers.data.action;
+package noppes.npcs.controllers.data.action.action;
 
 import noppes.npcs.api.handler.data.IAction;
 import noppes.npcs.api.handler.data.actions.IConditionalAction;
+import noppes.npcs.controllers.data.action.Action;
+import noppes.npcs.controllers.data.action.ActionManager;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import java.util.function.Consumer;
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java
similarity index 90%
rename from src/main/java/noppes/npcs/controllers/data/action/ActionChain.java
rename to src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java
index 20d5c9d01..acef1564a 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java
@@ -1,7 +1,8 @@
-package noppes.npcs.controllers.data.action;
+package noppes.npcs.controllers.data.action.chain;
 
 import noppes.npcs.api.handler.data.IAction;
 import noppes.npcs.api.handler.data.IActionChain;
+import noppes.npcs.controllers.data.action.ActionManager;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java
similarity index 86%
rename from src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java
rename to src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java
index 869766ddd..88b76e8d4 100644
--- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java
+++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java
@@ -1,7 +1,8 @@
-package noppes.npcs.controllers.data.action;
+package noppes.npcs.controllers.data.action.chain;
 
 import noppes.npcs.api.handler.data.IAction;
 import noppes.npcs.api.handler.data.IActionChain;
+import noppes.npcs.controllers.data.action.ActionManager;
 
 import java.util.function.Consumer;