refactor and integrate

src/test/java/baritone/builder/NavigableSurfaceTest.java

@@ -1,4 +1,21 @@
-package com.github.leijurv;
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.builder;
 
 import baritone.api.utils.BetterBlockPos;
 import org.junit.Test;

src/test/java/com/github/btrekkie/arbitrary_order_collection/ArbitraryOrderNode.java

@@ -1,6 +1,6 @@
 package com.github.btrekkie.arbitrary_order_collection;
 
-import com.github.btrekkie.red_black_node.RedBlackNode;
+import baritone.builder.utils.com.github.btrekkie.red_black_node.RedBlackNode;
 
 /**
  * A node in an ArbitraryOrderCollection tree.  See ArbitraryOrderCollection.

src/test/java/com/github/btrekkie/connectivity/test/ConnGraphTest.java

@@ -1,8 +1,8 @@
 package com.github.btrekkie.connectivity.test;
 
-import com.github.btrekkie.connectivity.ConnGraph;
-import com.github.btrekkie.connectivity.ConnVertex;
-import com.github.leijurv.EulerTourForest;
+import baritone.builder.EulerTourForest;
+import baritone.builder.utils.com.github.btrekkie.connectivity.ConnGraph;
+import baritone.builder.utils.com.github.btrekkie.connectivity.ConnVertex;
 import org.junit.Test;
 
 import java.util.ArrayList;

src/test/java/com/github/btrekkie/connectivity/test/SumAndMax.java

@@ -1,6 +1,6 @@
 package com.github.btrekkie.connectivity.test;
 
-import com.github.btrekkie.connectivity.Augmentation;
+import baritone.builder.utils.com.github.btrekkie.connectivity.Augmentation;
 
 /**
  * Stores two values: a sum and a maximum. Used for testing augmentation in ConnGraph.

src/test/java/com/github/btrekkie/interval_tree/IntervalTreeNode.java

@@ -1,6 +1,6 @@
 package com.github.btrekkie.interval_tree;
 
-import com.github.btrekkie.red_black_node.RedBlackNode;
+import baritone.builder.utils.com.github.btrekkie.red_black_node.RedBlackNode;
 
 /**
  * A node in an IntervalTree.  See the comments for the implementation of IntervalTree.  Its compareTo method orders

src/test/java/com/github/btrekkie/red_black_node/test/TestRedBlackNode.java

@@ -1,6 +1,6 @@
 package com.github.btrekkie.red_black_node.test;
 
-import com.github.btrekkie.red_black_node.RedBlackNode;
+import baritone.builder.utils.com.github.btrekkie.red_black_node.RedBlackNode;
 
 /**
  * A RedBlackNode for RedBlackNodeTest.

src/test/java/com/github/btrekkie/sub_array_min/SubArrayMinNode.java

@@ -1,6 +1,6 @@
 package com.github.btrekkie.sub_array_min;
 
-import com.github.btrekkie.red_black_node.RedBlackNode;
+import baritone.builder.utils.com.github.btrekkie.red_black_node.RedBlackNode;
 
 /**
  * A node in a SubArrayMin object.  See the comments for the implementation of that class.