diff --git a/build.gradle b/build.gradle
index abb75959..0e0e3fa2 100755
--- a/build.gradle
+++ b/build.gradle
@@ -54,6 +54,10 @@ sourceSets {
     launch {
         compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
     }
+    tenor {}
+    main {
+        compileClasspath += tenor.compileClasspath
+    }
 }
 
 minecraft {
diff --git a/src/main/java/tenor/Bot.java b/src/tenor/java/tenor/Bot.java
similarity index 100%
rename from src/main/java/tenor/Bot.java
rename to src/tenor/java/tenor/Bot.java
diff --git a/src/main/java/tenor/BotTaskRegistry.java b/src/tenor/java/tenor/BotTaskRegistry.java
similarity index 100%
rename from src/main/java/tenor/BotTaskRegistry.java
rename to src/tenor/java/tenor/BotTaskRegistry.java
diff --git a/src/main/java/tenor/DependencyType.java b/src/tenor/java/tenor/DependencyType.java
similarity index 100%
rename from src/main/java/tenor/DependencyType.java
rename to src/tenor/java/tenor/DependencyType.java
diff --git a/src/main/java/tenor/IChildTaskRelationship.java b/src/tenor/java/tenor/IChildTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/IChildTaskRelationship.java
rename to src/tenor/java/tenor/IChildTaskRelationship.java
diff --git a/src/main/java/tenor/IClaimProvider.java b/src/tenor/java/tenor/IClaimProvider.java
similarity index 100%
rename from src/main/java/tenor/IClaimProvider.java
rename to src/tenor/java/tenor/IClaimProvider.java
diff --git a/src/main/java/tenor/IParentTaskRelationship.java b/src/tenor/java/tenor/IParentTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/IParentTaskRelationship.java
rename to src/tenor/java/tenor/IParentTaskRelationship.java
diff --git a/src/main/java/tenor/IQuantityRelationship.java b/src/tenor/java/tenor/IQuantityRelationship.java
similarity index 100%
rename from src/main/java/tenor/IQuantityRelationship.java
rename to src/tenor/java/tenor/IQuantityRelationship.java
diff --git a/src/main/java/tenor/IQuantizedChildTaskRelationship.java b/src/tenor/java/tenor/IQuantizedChildTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/IQuantizedChildTaskRelationship.java
rename to src/tenor/java/tenor/IQuantizedChildTaskRelationship.java
diff --git a/src/main/java/tenor/IQuantizedDependentCostCalculator.java b/src/tenor/java/tenor/IQuantizedDependentCostCalculator.java
similarity index 100%
rename from src/main/java/tenor/IQuantizedDependentCostCalculator.java
rename to src/tenor/java/tenor/IQuantizedDependentCostCalculator.java
diff --git a/src/main/java/tenor/IQuantizedParentTaskRelationship.java b/src/tenor/java/tenor/IQuantizedParentTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/IQuantizedParentTaskRelationship.java
rename to src/tenor/java/tenor/IQuantizedParentTaskRelationship.java
diff --git a/src/main/java/tenor/IQuantizedTask.java b/src/tenor/java/tenor/IQuantizedTask.java
similarity index 100%
rename from src/main/java/tenor/IQuantizedTask.java
rename to src/tenor/java/tenor/IQuantizedTask.java
diff --git a/src/main/java/tenor/IQuantizedTaskNode.java b/src/tenor/java/tenor/IQuantizedTaskNode.java
similarity index 100%
rename from src/main/java/tenor/IQuantizedTaskNode.java
rename to src/tenor/java/tenor/IQuantizedTaskNode.java
diff --git a/src/main/java/tenor/ISingleParentQuantizedPriorityAllocator.java b/src/tenor/java/tenor/ISingleParentQuantizedPriorityAllocator.java
similarity index 100%
rename from src/main/java/tenor/ISingleParentQuantizedPriorityAllocator.java
rename to src/tenor/java/tenor/ISingleParentQuantizedPriorityAllocator.java
diff --git a/src/main/java/tenor/ISingleParentSingularPriorityAllocator.java b/src/tenor/java/tenor/ISingleParentSingularPriorityAllocator.java
similarity index 100%
rename from src/main/java/tenor/ISingleParentSingularPriorityAllocator.java
rename to src/tenor/java/tenor/ISingleParentSingularPriorityAllocator.java
diff --git a/src/main/java/tenor/ISingularChildTaskRelationship.java b/src/tenor/java/tenor/ISingularChildTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/ISingularChildTaskRelationship.java
rename to src/tenor/java/tenor/ISingularChildTaskRelationship.java
diff --git a/src/main/java/tenor/ISingularParentTaskRelationship.java b/src/tenor/java/tenor/ISingularParentTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/ISingularParentTaskRelationship.java
rename to src/tenor/java/tenor/ISingularParentTaskRelationship.java
diff --git a/src/main/java/tenor/ISingularTask.java b/src/tenor/java/tenor/ISingularTask.java
similarity index 100%
rename from src/main/java/tenor/ISingularTask.java
rename to src/tenor/java/tenor/ISingularTask.java
diff --git a/src/main/java/tenor/ISingularTaskNode.java b/src/tenor/java/tenor/ISingularTaskNode.java
similarity index 100%
rename from src/main/java/tenor/ISingularTaskNode.java
rename to src/tenor/java/tenor/ISingularTaskNode.java
diff --git a/src/main/java/tenor/ITask.java b/src/tenor/java/tenor/ITask.java
similarity index 100%
rename from src/main/java/tenor/ITask.java
rename to src/tenor/java/tenor/ITask.java
diff --git a/src/main/java/tenor/ITaskNodeBase.java b/src/tenor/java/tenor/ITaskNodeBase.java
similarity index 100%
rename from src/main/java/tenor/ITaskNodeBase.java
rename to src/tenor/java/tenor/ITaskNodeBase.java
diff --git a/src/main/java/tenor/ITaskRelationshipBase.java b/src/tenor/java/tenor/ITaskRelationshipBase.java
similarity index 100%
rename from src/main/java/tenor/ITaskRelationshipBase.java
rename to src/tenor/java/tenor/ITaskRelationshipBase.java
diff --git a/src/main/java/tenor/QuantizedTaskLeaf.java b/src/tenor/java/tenor/QuantizedTaskLeaf.java
similarity index 100%
rename from src/main/java/tenor/QuantizedTaskLeaf.java
rename to src/tenor/java/tenor/QuantizedTaskLeaf.java
diff --git a/src/main/java/tenor/QuantizedTaskNode.java b/src/tenor/java/tenor/QuantizedTaskNode.java
similarity index 100%
rename from src/main/java/tenor/QuantizedTaskNode.java
rename to src/tenor/java/tenor/QuantizedTaskNode.java
diff --git a/src/main/java/tenor/QuantizedToQuantizedTaskRelationship.java b/src/tenor/java/tenor/QuantizedToQuantizedTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/QuantizedToQuantizedTaskRelationship.java
rename to src/tenor/java/tenor/QuantizedToQuantizedTaskRelationship.java
diff --git a/src/main/java/tenor/QuantizedToSingularTaskRelationship.java b/src/tenor/java/tenor/QuantizedToSingularTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/QuantizedToSingularTaskRelationship.java
rename to src/tenor/java/tenor/QuantizedToSingularTaskRelationship.java
diff --git a/src/main/java/tenor/ScarceParentPriorityAllocator.java b/src/tenor/java/tenor/ScarceParentPriorityAllocator.java
similarity index 100%
rename from src/main/java/tenor/ScarceParentPriorityAllocator.java
rename to src/tenor/java/tenor/ScarceParentPriorityAllocator.java
diff --git a/src/main/java/tenor/SingularTaskLeaf.java b/src/tenor/java/tenor/SingularTaskLeaf.java
similarity index 100%
rename from src/main/java/tenor/SingularTaskLeaf.java
rename to src/tenor/java/tenor/SingularTaskLeaf.java
diff --git a/src/main/java/tenor/SingularTaskNode.java b/src/tenor/java/tenor/SingularTaskNode.java
similarity index 100%
rename from src/main/java/tenor/SingularTaskNode.java
rename to src/tenor/java/tenor/SingularTaskNode.java
diff --git a/src/main/java/tenor/SingularToQuantizedTaskRelationship.java b/src/tenor/java/tenor/SingularToQuantizedTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/SingularToQuantizedTaskRelationship.java
rename to src/tenor/java/tenor/SingularToQuantizedTaskRelationship.java
diff --git a/src/main/java/tenor/SingularToSingularTaskRelationship.java b/src/tenor/java/tenor/SingularToSingularTaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/SingularToSingularTaskRelationship.java
rename to src/tenor/java/tenor/SingularToSingularTaskRelationship.java
diff --git a/src/main/java/tenor/Task.java b/src/tenor/java/tenor/Task.java
similarity index 100%
rename from src/main/java/tenor/Task.java
rename to src/tenor/java/tenor/Task.java
diff --git a/src/main/java/tenor/TaskLeaf.java b/src/tenor/java/tenor/TaskLeaf.java
similarity index 100%
rename from src/main/java/tenor/TaskLeaf.java
rename to src/tenor/java/tenor/TaskLeaf.java
diff --git a/src/main/java/tenor/TaskNode.java b/src/tenor/java/tenor/TaskNode.java
similarity index 100%
rename from src/main/java/tenor/TaskNode.java
rename to src/tenor/java/tenor/TaskNode.java
diff --git a/src/main/java/tenor/TaskRelationship.java b/src/tenor/java/tenor/TaskRelationship.java
similarity index 100%
rename from src/main/java/tenor/TaskRelationship.java
rename to src/tenor/java/tenor/TaskRelationship.java
diff --git a/src/main/java/tenor/game/AquireCraftingItems.java b/src/tenor/java/tenor/game/AquireCraftingItems.java
similarity index 100%
rename from src/main/java/tenor/game/AquireCraftingItems.java
rename to src/tenor/java/tenor/game/AquireCraftingItems.java
diff --git a/src/main/java/tenor/game/AquireItemTask.java b/src/tenor/java/tenor/game/AquireItemTask.java
similarity index 100%
rename from src/main/java/tenor/game/AquireItemTask.java
rename to src/tenor/java/tenor/game/AquireItemTask.java
diff --git a/src/main/java/tenor/game/CraftingTask.java b/src/tenor/java/tenor/game/CraftingTask.java
similarity index 89%
rename from src/main/java/tenor/game/CraftingTask.java
rename to src/tenor/java/tenor/game/CraftingTask.java
index 33f12655..11601d23 100644
--- a/src/main/java/tenor/game/CraftingTask.java
+++ b/src/tenor/java/tenor/game/CraftingTask.java
@@ -17,7 +17,6 @@
 
 package tenor.game;
 
-import net.minecraft.util.Tuple;
 import tenor.*;
 
 import java.util.List;
@@ -25,7 +24,7 @@ import java.util.List;
 public class CraftingTask extends QuantizedTaskNode implements ISingleParentQuantizedPriorityAllocator {
 
     int outputQuantity;
-    List<Tuple<AquireItemTask, Integer>> recipe;
+    List<RecipeInput> recipe;
 
     final AquireCraftingItems inputs;
     final GetToCraftingTableTask step2;
@@ -62,11 +61,17 @@ public class CraftingTask extends QuantizedTaskNode implements ISingleParentQuan
     }
 
     public int inputSizeFor(AquireItemTask task) {
-        for (Tuple<AquireItemTask, Integer> tup : recipe) {
-            if (tup.getFirst().equals(task)) {
-                return tup.getSecond();
+        for (RecipeInput item : recipe) {
+            if (item.task.equals(task)) {
+                return item.quantity;
             }
         }
         throw new IllegalStateException();
     }
+
+    private class RecipeInput {
+
+        private AquireItemTask task;
+        private int quantity;
+    }
 }
diff --git a/src/main/java/tenor/game/DoCraft.java b/src/tenor/java/tenor/game/DoCraft.java
similarity index 100%
rename from src/main/java/tenor/game/DoCraft.java
rename to src/tenor/java/tenor/game/DoCraft.java
diff --git a/src/main/java/tenor/game/DoMine.java b/src/tenor/java/tenor/game/DoMine.java
similarity index 100%
rename from src/main/java/tenor/game/DoMine.java
rename to src/tenor/java/tenor/game/DoMine.java
diff --git a/src/main/java/tenor/game/GetToCraftingTableTask.java b/src/tenor/java/tenor/game/GetToCraftingTableTask.java
similarity index 100%
rename from src/main/java/tenor/game/GetToCraftingTableTask.java
rename to src/tenor/java/tenor/game/GetToCraftingTableTask.java
diff --git a/src/main/java/tenor/game/MineTask.java b/src/tenor/java/tenor/game/MineTask.java
similarity index 100%
rename from src/main/java/tenor/game/MineTask.java
rename to src/tenor/java/tenor/game/MineTask.java
diff --git a/src/main/java/tenor/game/MineWithToolTask.java b/src/tenor/java/tenor/game/MineWithToolTask.java
similarity index 100%
rename from src/main/java/tenor/game/MineWithToolTask.java
rename to src/tenor/java/tenor/game/MineWithToolTask.java