diff --git a/src/minecraft/assemblyline/common/ai/ArmHelper.java b/src/minecraft/assemblyline/common/machine/armbot/ArmHelper.java
similarity index 96%
rename from src/minecraft/assemblyline/common/ai/ArmHelper.java
rename to src/minecraft/assemblyline/common/machine/armbot/ArmHelper.java
index 329a0c0a..f3a82ca9 100644
--- a/src/minecraft/assemblyline/common/ai/ArmHelper.java
+++ b/src/minecraft/assemblyline/common/machine/armbot/ArmHelper.java
@@ -1,4 +1,4 @@
-package assemblyline.common.ai;
+package assemblyline.common.machine.armbot;
 
 import java.util.List;
 
diff --git a/src/minecraft/assemblyline/common/ai/Task.java b/src/minecraft/assemblyline/common/machine/armbot/Command.java
similarity index 73%
rename from src/minecraft/assemblyline/common/ai/Task.java
rename to src/minecraft/assemblyline/common/machine/armbot/Command.java
index 0d5f7b42..63560b53 100644
--- a/src/minecraft/assemblyline/common/ai/Task.java
+++ b/src/minecraft/assemblyline/common/machine/armbot/Command.java
@@ -1,4 +1,4 @@
-package assemblyline.common.ai;
+package assemblyline.common.machine.armbot;
 
 import assemblyline.common.machine.crafter.TileEntityArmbot;
 
@@ -8,12 +8,17 @@ import assemblyline.common.machine.crafter.TileEntityArmbot;
  * @author Calclavia
  * 
  */
-public abstract class Task
+public abstract class Command
 {
+	/**
+	 * A class of all available commands. Command IDs are the indexes of the array.
+	 */
+	public static Class[] COMMANDS = { CommandIdle.class };
+
 	protected int ticks;
 	protected TileEntityArmbot tileEntity;
 
-	public Task(TileEntityArmbot arm)
+	public Command(TileEntityArmbot arm)
 	{
 		this.tileEntity = arm;
 	}
diff --git a/src/minecraft/assemblyline/common/ai/TaskIdle.java b/src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java
similarity index 64%
rename from src/minecraft/assemblyline/common/ai/TaskIdle.java
rename to src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java
index deec1621..d89673d6 100644
--- a/src/minecraft/assemblyline/common/ai/TaskIdle.java
+++ b/src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java
@@ -1,10 +1,10 @@
-package assemblyline.common.ai;
+package assemblyline.common.machine.armbot;
 
 import assemblyline.common.machine.crafter.TileEntityArmbot;
 
-public class TaskIdle extends Task
+public class CommandIdle extends Command
 {
-	public TaskIdle(TileEntityArmbot arm)
+	public CommandIdle(TileEntityArmbot arm)
 	{
 		super(arm);
 	}
diff --git a/src/minecraft/assemblyline/common/ai/TaskManager.java b/src/minecraft/assemblyline/common/machine/armbot/CommandManager.java
similarity index 81%
rename from src/minecraft/assemblyline/common/ai/TaskManager.java
rename to src/minecraft/assemblyline/common/machine/armbot/CommandManager.java
index 52fdf085..3de605c8 100644
--- a/src/minecraft/assemblyline/common/ai/TaskManager.java
+++ b/src/minecraft/assemblyline/common/machine/armbot/CommandManager.java
@@ -1,4 +1,4 @@
-package assemblyline.common.ai;
+package assemblyline.common.machine.armbot;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -7,9 +7,9 @@ import java.util.List;
 import net.minecraft.tileentity.TileEntity;
 import cpw.mods.fml.common.FMLLog;
 
-public class TaskManager
+public class CommandManager
 {
-	private final List<Task> tasks = new ArrayList<Task>();
+	private final List<Command> tasks = new ArrayList<Command>();
 
 	private int ticks = 0;
 
@@ -23,8 +23,8 @@ public class TaskManager
 		 */
 		try
 		{
-			Task task;
-			Iterator<Task> iter = tasks.iterator();
+			Command task;
+			Iterator<Command> iter = tasks.iterator();
 			while (iter.hasNext())
 			{
 				task = iter.next();
@@ -57,7 +57,7 @@ public class TaskManager
 	 * @param tileEntity TE instance to register the task for
 	 * @param task Task instance to register
 	 */
-	public void addTask(TileEntity tileEntity, Task task)
+	public void addTask(TileEntity tileEntity, Command task)
 	{
 		tasks.add(task);
 		task.onTaskStart();
diff --git a/src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java b/src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java
index b732f732..a421dbdb 100644
--- a/src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java
+++ b/src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java
@@ -1,14 +1,14 @@
 package assemblyline.common.machine.crafter;
 
 import net.minecraft.entity.item.EntityItem;
-import assemblyline.common.ai.Task;
+import assemblyline.common.machine.armbot.Command;
 
 /**
  * Used by arms to collect items in a specific region.
  * 
  * @author Calclavia
  */
-public class TaskArmCollect extends Task
+public class TaskArmCollect extends Command
 {
 
 	/**
diff --git a/src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java b/src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java
index d14629ec..70e19923 100644
--- a/src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java
+++ b/src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java
@@ -4,14 +4,14 @@ import java.util.List;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.util.AxisAlignedBB;
-import assemblyline.common.ai.Task;
+import assemblyline.common.machine.armbot.Command;
 
 /**
  * Used by arms to search for entities in a region
  * 
  * @author Calclavia
  */
-public class TaskArmSearch extends Task
+public class TaskArmSearch extends Command
 {
 
 	/**
diff --git a/src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java b/src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java
index 4a120787..e7bac658 100644
--- a/src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java
+++ b/src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java
@@ -17,7 +17,7 @@ import universalelectricity.core.implement.IJouleStorage;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.prefab.network.IPacketReceiver;
 import universalelectricity.prefab.tile.TileEntityElectricityReceiver;
-import assemblyline.common.ai.TaskManager;
+import assemblyline.common.machine.armbot.CommandManager;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -28,7 +28,7 @@ public class TileEntityArmbot extends TileEntityElectricityReceiver implements I
 	 */
 	protected ItemStack[] containingItems = new ItemStack[this.getSizeInventory()];
 
-	private TaskManager taskManager = new TaskManager();
+	private CommandManager taskManager = new CommandManager();
 
 	/**
 	 * Entity robotic arm to be used with this tileEntity