14 files changed, 34 insertions, 33 deletions
diff --git a/base/src/bjc/dicelang/Define.java b/base/src/bjc/dicelang/Define.java
index b0e8a21..2c0d581 100644
--- a/base/src/bjc/dicelang/Define.java
+++ b/base/src/bjc/dicelang/Define.java
@@ -6,7 +6,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import bjc.utils.data.CircularIterator;
+import bjc.data.CircularIterator;
 
 import static bjc.dicelang.Errors.ErrorKey.*;
 
diff --git a/base/src/bjc/dicelang/DiceLangEngine.java b/base/src/bjc/dicelang/DiceLangEngine.java
index 2f993e8..b19ce77 100644
--- a/base/src/bjc/dicelang/DiceLangEngine.java
+++ b/base/src/bjc/dicelang/DiceLangEngine.java
@@ -14,12 +14,12 @@ import bjc.dicelang.eval.EvaluatorResult;
 import bjc.dicelang.eval.FailureEvaluatorResult;
 import bjc.dicelang.scl.StreamEngine;
 import bjc.dicelang.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.FunctionalStringTokenizer;
-import bjc.utils.funcdata.IList;
-import bjc.utils.funcdata.IMap;
+import bjc.data.ITree;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.FunctionalStringTokenizer;
+import bjc.funcdata.IList;
+import bjc.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 import bjc.utils.parserutils.TokenUtils;
 import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter;
@@ -610,6 +610,7 @@ public class DiceLangEngine {
 					System.out.printf("\t\tEvaluates to %s", res);
 
 					if(res == null) {
+						// Don't need to do anything in this case
 					} else if (res.type == EvaluatorResult.Type.DICE) {
 						String value = ((DiceEvaluatorResult) res).diceVal.value();
 
diff --git a/base/src/bjc/dicelang/Node.java b/base/src/bjc/dicelang/Node.java
index 50a5e59..1a3c2d6 100644
--- a/base/src/bjc/dicelang/Node.java
+++ b/base/src/bjc/dicelang/Node.java
@@ -3,7 +3,7 @@ package bjc.dicelang;
 import bjc.dicelang.eval.EvaluatorResult;
 import bjc.dicelang.eval.FailureEvaluatorResult;
 import bjc.dicelang.tokens.Token;
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
 
 /*
  * @TODO 10/09/17 Ben Culkin :NodeReorg
diff --git a/base/src/bjc/dicelang/Parser.java b/base/src/bjc/dicelang/Parser.java
index 1b2a0bd..49cc312 100644
--- a/base/src/bjc/dicelang/Parser.java
+++ b/base/src/bjc/dicelang/Parser.java
@@ -17,9 +17,9 @@ import java.util.Deque;
 import java.util.LinkedList;
 
 import bjc.dicelang.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
-import bjc.utils.funcdata.IList;
+import bjc.data.ITree;
+import bjc.data.Tree;
+import bjc.funcdata.IList;
 
 /**
  * Parse a series of tree into tokens.
diff --git a/base/src/bjc/dicelang/Shunter.java b/base/src/bjc/dicelang/Shunter.java
index 8284da4..9d250d8 100644
--- a/base/src/bjc/dicelang/Shunter.java
+++ b/base/src/bjc/dicelang/Shunter.java
@@ -6,10 +6,10 @@ import java.util.LinkedList;
 import java.util.Set;
 
 import bjc.dicelang.tokens.Token;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.IList;
-import bjc.utils.funcdata.IMap;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.IList;
+import bjc.funcdata.IMap;
 
 import static bjc.dicelang.Errors.ErrorKey.EK_SHUNT_INVSEP;
 import static bjc.dicelang.Errors.ErrorKey.EK_SHUNT_NOGROUP;
diff --git a/base/src/bjc/dicelang/Tokenizer.java b/base/src/bjc/dicelang/Tokenizer.java
index 66a1505..6b94e4e 100644
--- a/base/src/bjc/dicelang/Tokenizer.java
+++ b/base/src/bjc/dicelang/Tokenizer.java
@@ -7,8 +7,8 @@ import bjc.dicelang.dice.DiceBox;
 import bjc.dicelang.tokens.DiceToken;
 import bjc.dicelang.tokens.FloatToken;
 import bjc.dicelang.tokens.Token;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.IMap;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.IMap;
 import bjc.utils.funcutils.StringUtils;
 import bjc.utils.parserutils.TokenUtils;
 
diff --git a/base/src/bjc/dicelang/cli/DiceLangConsole.java b/base/src/bjc/dicelang/cli/DiceLangConsole.java
index 75fee3b..54dc49d 100644
--- a/base/src/bjc/dicelang/cli/DiceLangConsole.java
+++ b/base/src/bjc/dicelang/cli/DiceLangConsole.java
@@ -3,8 +3,8 @@ package bjc.dicelang.cli;
 import bjc.dicelang.Define;
 import bjc.dicelang.DiceLangEngine;
 import bjc.dicelang.Errors;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.IMap;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.IMap;
 
 import java.io.IOException;
 import java.util.LinkedList;
diff --git a/base/src/bjc/dicelang/eval/Evaluator.java b/base/src/bjc/dicelang/eval/Evaluator.java
index 26bb73b..85b3ad3 100644
--- a/base/src/bjc/dicelang/eval/Evaluator.java
+++ b/base/src/bjc/dicelang/eval/Evaluator.java
@@ -18,11 +18,11 @@ import bjc.dicelang.dice.SimpleDieList;
 import bjc.dicelang.tokens.DiceToken;
 import bjc.dicelang.tokens.FloatToken;
 import bjc.dicelang.tokens.Token;
-import bjc.utils.data.ITree;
-import bjc.utils.data.SingleIterator;
-import bjc.utils.data.TopDownTransformIterator;
-import bjc.utils.data.TopDownTransformResult;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.SingleIterator;
+import bjc.data.TopDownTransformIterator;
+import bjc.data.TopDownTransformResult;
+import bjc.data.Tree;
 
 import static bjc.dicelang.Errors.ErrorKey.*;
 import static bjc.dicelang.eval.EvaluatorResult.Type.*;
diff --git a/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java b/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java
index 6e46a61..1d0ad7b 100644
--- a/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java
+++ b/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java
@@ -1,8 +1,8 @@
 package bjc.dicelang.eval;
 
 import bjc.dicelang.Node;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.ITree;
+import bjc.data.Tree;
 
 /**
  * Represents an evaluation ending in failure.
diff --git a/base/src/bjc/dicelang/expr/ExprREPL.java b/base/src/bjc/dicelang/expr/ExprREPL.java
index 6cc06e2..bbfeeb2 100644
--- a/base/src/bjc/dicelang/expr/ExprREPL.java
+++ b/base/src/bjc/dicelang/expr/ExprREPL.java
@@ -2,8 +2,8 @@ package bjc.dicelang.expr;
 
 import java.util.Scanner;
 
-import bjc.utils.data.ITree;
-import bjc.utils.funcdata.IList;
+import bjc.data.ITree;
+import bjc.funcdata.IList;
 import bjc.utils.parserutils.TreeConstructor;
 
 /**
diff --git a/base/src/bjc/dicelang/expr/Lexer.java b/base/src/bjc/dicelang/expr/Lexer.java
index c43050b..20e2a40 100644
--- a/base/src/bjc/dicelang/expr/Lexer.java
+++ b/base/src/bjc/dicelang/expr/Lexer.java
@@ -3,7 +3,7 @@ package bjc.dicelang.expr;
 import java.util.LinkedList;
 import java.util.List;
 
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.IList;
 import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter;
 
 /*
diff --git a/base/src/bjc/dicelang/expr/Parser.java b/base/src/bjc/dicelang/expr/Parser.java
index db6d547..8f02853 100644
--- a/base/src/bjc/dicelang/expr/Parser.java
+++ b/base/src/bjc/dicelang/expr/Parser.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.expr;
 
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
 
 /**
  * Parser for simple math expressions.
diff --git a/base/src/bjc/dicelang/expr/Shunter.java b/base/src/bjc/dicelang/expr/Shunter.java
index 3d2a523..f1d3414 100644
--- a/base/src/bjc/dicelang/expr/Shunter.java
+++ b/base/src/bjc/dicelang/expr/Shunter.java
@@ -3,8 +3,8 @@ package bjc.dicelang.expr;
 import java.util.Deque;
 import java.util.LinkedList;
 
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.IList;
 
 /**
  * Converts a infix series of tokens into a prefix series of tokens.
diff --git a/base/src/bjc/dicelang/tokens/Token.java b/base/src/bjc/dicelang/tokens/Token.java
index 1a11ccd..e4b97d1 100644
--- a/base/src/bjc/dicelang/tokens/Token.java
+++ b/base/src/bjc/dicelang/tokens/Token.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.tokens;
 
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.IList;
 
 /*
  * @TODO 10/09/17 Ben Culkin :TokenReorg