diff --git a/src/main/java/baritone/pathfinding/goals/Goal.java b/src/main/java/baritone/bot/pathfinding/goals/Goal.java
similarity index 95%
rename from src/main/java/baritone/pathfinding/goals/Goal.java
rename to src/main/java/baritone/bot/pathfinding/goals/Goal.java
index 244b61da..327f01fa 100644
--- a/src/main/java/baritone/pathfinding/goals/Goal.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/Goal.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import net.minecraft.util.math.BlockPos;
 
diff --git a/src/main/java/baritone/pathfinding/goals/GoalBlock.java b/src/main/java/baritone/bot/pathfinding/goals/GoalBlock.java
similarity index 90%
rename from src/main/java/baritone/pathfinding/goals/GoalBlock.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalBlock.java
index 1e9bf627..b23011cb 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalBlock.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalBlock.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import baritone.Baritone;
 import baritone.pathfinding.actions.Action;
@@ -39,6 +39,10 @@ public class GoalBlock implements Goal {
     public boolean isInGoal(BlockPos pos) {
         return pos.getX() == this.x && pos.getY() == this.y && pos.getZ() == this.z;
     }
+
+    /**
+     * The range over which to begin considering Y coordinate in the heuristic
+     */
     static final double MIN = 20;
     static final double MAX = 150;
 
@@ -55,6 +59,7 @@ public class GoalBlock implements Goal {
         double heuristic = 0;
         double baseline = (Action.PLACE_ONE_BLOCK_COST + Action.FALL_ONE_BLOCK_COST) * 32;
         if (pythaDist < MAX) {//if we are more than MAX away, ignore the Y coordinate. It really doesn't matter how far away your Y coordinate is if you X coordinate is 1000 blocks away.
+            //as we get closer, slowly reintroduce the Y coordinate as a heuristic cost
             double multiplier = pythaDist < MIN ? 1 : 1 - (pythaDist - MIN) / (MAX - MIN);
             if (yDiff < 0) {//pos.getY()-this.y<0 therefore pos.getY()<this.y, so target is above current
                 heuristic -= yDiff * (Action.PLACE_ONE_BLOCK_COST * 0.7 + Action.JUMP_ONE_BLOCK_COST);//target above current
@@ -66,6 +71,7 @@ public class GoalBlock implements Goal {
         } else {
             heuristic += baseline;
         }
+        //use the pythagorean and manhattan mixture from GoalXZ
         heuristic += GoalXZ.calculate(xDiff, zDiff, pythaDist);
         return heuristic;
     }
diff --git a/src/main/java/baritone/pathfinding/goals/GoalComposite.java b/src/main/java/baritone/bot/pathfinding/goals/GoalComposite.java
similarity index 97%
rename from src/main/java/baritone/pathfinding/goals/GoalComposite.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalComposite.java
index 6ecd6b7d..2651685a 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalComposite.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalComposite.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/src/main/java/baritone/pathfinding/goals/GoalGetToBlock.java b/src/main/java/baritone/bot/pathfinding/goals/GoalGetToBlock.java
similarity index 96%
rename from src/main/java/baritone/pathfinding/goals/GoalGetToBlock.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalGetToBlock.java
index e8ee960d..877083bb 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalGetToBlock.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalGetToBlock.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import baritone.Baritone;
 import net.minecraft.util.EnumFacing;
diff --git a/src/main/java/baritone/pathfinding/goals/GoalRunAway.java b/src/main/java/baritone/bot/pathfinding/goals/GoalRunAway.java
similarity index 97%
rename from src/main/java/baritone/pathfinding/goals/GoalRunAway.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalRunAway.java
index b8865d75..37c24fa2 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalRunAway.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalRunAway.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import java.util.Arrays;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/baritone/pathfinding/goals/GoalTwoBlocks.java b/src/main/java/baritone/bot/pathfinding/goals/GoalTwoBlocks.java
similarity index 97%
rename from src/main/java/baritone/pathfinding/goals/GoalTwoBlocks.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalTwoBlocks.java
index bc84c53a..e6f12154 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalTwoBlocks.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalTwoBlocks.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import net.minecraft.util.math.BlockPos;
 
diff --git a/src/main/java/baritone/pathfinding/goals/GoalXZ.java b/src/main/java/baritone/bot/pathfinding/goals/GoalXZ.java
similarity index 98%
rename from src/main/java/baritone/pathfinding/goals/GoalXZ.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalXZ.java
index c9df9629..e78cd32c 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalXZ.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalXZ.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import baritone.pathfinding.actions.Action;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/baritone/pathfinding/goals/GoalYLevel.java b/src/main/java/baritone/bot/pathfinding/goals/GoalYLevel.java
similarity index 95%
rename from src/main/java/baritone/pathfinding/goals/GoalYLevel.java
rename to src/main/java/baritone/bot/pathfinding/goals/GoalYLevel.java
index f0f6223c..d1989e8d 100644
--- a/src/main/java/baritone/pathfinding/goals/GoalYLevel.java
+++ b/src/main/java/baritone/bot/pathfinding/goals/GoalYLevel.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package baritone.pathfinding.goals;
+package baritone.bot.goals;
 
 import net.minecraft.util.math.BlockPos;