58 files changed, 154 insertions, 169 deletions

diff --git a/dice-lang/src/bjc/dicelang/BindingDiceExpression.java b/dice-lang/src/bjc/dicelang/v1/BindingDiceExpression.java
index f41c364..019f5ee 100644
--- a/dice-lang/src/bjc/dicelang/BindingDiceExpression.java
+++ b/dice-lang/src/bjc/dicelang/v1/BindingDiceExpression.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 import java.util.Map;
 
diff --git a/dice-lang/src/bjc/dicelang/ComplexDice.java b/dice-lang/src/bjc/dicelang/v1/ComplexDice.java
index 81699ae..62d59c6 100644
--- a/dice-lang/src/bjc/dicelang/ComplexDice.java
+++ b/dice-lang/src/bjc/dicelang/v1/ComplexDice.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 /**
  * Implements a collection of one or more of a particular die, where the
diff --git a/dice-lang/src/bjc/dicelang/CompoundDice.java b/dice-lang/src/bjc/dicelang/v1/CompoundDice.java
index 497f9b2..2d53540 100644
--- a/dice-lang/src/bjc/dicelang/CompoundDice.java
+++ b/dice-lang/src/bjc/dicelang/v1/CompoundDice.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 /**
  * Implements a "compound dice"
diff --git a/dice-lang/src/bjc/dicelang/DiceExpressionBuilder.java b/dice-lang/src/bjc/dicelang/v1/DiceExpressionBuilder.java
index 7e42ad4..eb19c2a 100644
--- a/dice-lang/src/bjc/dicelang/DiceExpressionBuilder.java
+++ b/dice-lang/src/bjc/dicelang/v1/DiceExpressionBuilder.java
@@ -1,9 +1,9 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
-import static bjc.dicelang.DiceExpressionType.ADD;
-import static bjc.dicelang.DiceExpressionType.DIVIDE;
-import static bjc.dicelang.DiceExpressionType.MULTIPLY;
-import static bjc.dicelang.DiceExpressionType.SUBTRACT;
+import static bjc.dicelang.v1.DiceExpressionType.ADD;
+import static bjc.dicelang.v1.DiceExpressionType.DIVIDE;
+import static bjc.dicelang.v1.DiceExpressionType.MULTIPLY;
+import static bjc.dicelang.v1.DiceExpressionType.SUBTRACT;
 
 /**
  * Build a dice expression piece by piece
diff --git a/dice-lang/src/bjc/dicelang/DiceExpressionParser.java b/dice-lang/src/bjc/dicelang/v1/DiceExpressionParser.java
index c58bccd..fd8f37b 100644
--- a/dice-lang/src/bjc/dicelang/DiceExpressionParser.java
+++ b/dice-lang/src/bjc/dicelang/v1/DiceExpressionParser.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 import java.util.Map;
 import java.util.Stack;
diff --git a/dice-lang/src/bjc/dicelang/DiceExpressionType.java b/dice-lang/src/bjc/dicelang/v1/DiceExpressionType.java
index aaa8543..0c22f2a 100644
--- a/dice-lang/src/bjc/dicelang/DiceExpressionType.java
+++ b/dice-lang/src/bjc/dicelang/v1/DiceExpressionType.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 /**
  * Enumeration for basic dice expression operators
diff --git a/dice-lang/src/bjc/dicelang/Die.java b/dice-lang/src/bjc/dicelang/v1/Die.java
index 89b085b..14c7a83 100644
--- a/dice-lang/src/bjc/dicelang/Die.java
+++ b/dice-lang/src/bjc/dicelang/v1/Die.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 import java.util.Random;
 
diff --git a/dice-lang/src/bjc/dicelang/IDiceExpression.java b/dice-lang/src/bjc/dicelang/v1/IDiceExpression.java
index 9d29960..a0b78b8 100644
--- a/dice-lang/src/bjc/dicelang/IDiceExpression.java
+++ b/dice-lang/src/bjc/dicelang/v1/IDiceExpression.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 import bjc.utils.funcutils.StringUtils;
 
diff --git a/dice-lang/src/bjc/dicelang/OperatorDiceExpression.java b/dice-lang/src/bjc/dicelang/v1/OperatorDiceExpression.java
index 63bf548..ac630a8 100644
--- a/dice-lang/src/bjc/dicelang/OperatorDiceExpression.java
+++ b/dice-lang/src/bjc/dicelang/v1/OperatorDiceExpression.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 /**
  * Implements a class for combining two dice with an operator
diff --git a/dice-lang/src/bjc/dicelang/PolyhedralDice.java b/dice-lang/src/bjc/dicelang/v1/PolyhedralDice.java
index 3ac9420..4af521b 100644
--- a/dice-lang/src/bjc/dicelang/PolyhedralDice.java
+++ b/dice-lang/src/bjc/dicelang/v1/PolyhedralDice.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 /**
  * Utility class that produces common polyhedral dice
diff --git a/dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java b/dice-lang/src/bjc/dicelang/v1/ReferenceDiceExpression.java
index 2c4d300..bb7ce02 100644
--- a/dice-lang/src/bjc/dicelang/ReferenceDiceExpression.java
+++ b/dice-lang/src/bjc/dicelang/v1/ReferenceDiceExpression.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 import java.util.Map;
 
diff --git a/dice-lang/src/bjc/dicelang/ScalarDie.java b/dice-lang/src/bjc/dicelang/v1/ScalarDie.java
index a99fb4f..94cf687 100644
--- a/dice-lang/src/bjc/dicelang/ScalarDie.java
+++ b/dice-lang/src/bjc/dicelang/v1/ScalarDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang;
+package bjc.dicelang.v1;
 
 /**
  * A die that represents a static number
diff --git a/dice-lang/src/bjc/dicelang/ast/.gitignore b/dice-lang/src/bjc/dicelang/v1/ast/.gitignore
index 67877fe..67877fe 100644
--- a/dice-lang/src/bjc/dicelang/ast/.gitignore
+++ b/dice-lang/src/bjc/dicelang/v1/ast/.gitignore
diff --git a/dice-lang/src/bjc/dicelang/ast/ArithmeticCollapser.java b/dice-lang/src/bjc/dicelang/v1/ast/ArithmeticCollapser.java
index 70f6af9..5a69bf1 100644
--- a/dice-lang/src/bjc/dicelang/ast/ArithmeticCollapser.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/ArithmeticCollapser.java
@@ -1,16 +1,15 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 import java.util.function.BinaryOperator;
 
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
 import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Pair;
 import bjc.utils.funcdata.IList;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-
 /**
  * Responsible for collapsing arithmetic operators
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/ArrayResult.java b/dice-lang/src/bjc/dicelang/v1/ast/ArrayResult.java
index ac78287..6cb9216 100644
--- a/dice-lang/src/bjc/dicelang/ast/ArrayResult.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/ArrayResult.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 import bjc.utils.funcdata.IList;
 
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTEvaluator.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTEvaluator.java
index f4bfe79..c8c0032 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTEvaluator.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTEvaluator.java
@@ -1,7 +1,16 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 import java.util.function.Supplier;
 
+import bjc.dicelang.v1.ComplexDice;
+import bjc.dicelang.v1.ast.nodes.DiceASTType;
+import bjc.dicelang.v1.ast.nodes.DiceLiteralNode;
+import bjc.dicelang.v1.ast.nodes.DiceLiteralType;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.ILiteralDiceNode;
+import bjc.dicelang.v1.ast.nodes.IntegerLiteralNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
+import bjc.dicelang.v1.ast.nodes.VariableDiceNode;
 import bjc.utils.data.IHolder;
 import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
@@ -14,16 +23,6 @@ import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ComplexDice;
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.DiceLiteralNode;
-import bjc.dicelang.ast.nodes.DiceLiteralType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.ILiteralDiceNode;
-import bjc.dicelang.ast.nodes.IntegerLiteralNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-import bjc.dicelang.ast.nodes.VariableDiceNode;
-
 /**
  * Evaluate a dice AST to an integer value
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTInliner.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTInliner.java
index e9bc4ac..51aba03 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTInliner.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTInliner.java
@@ -1,15 +1,14 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
+import bjc.dicelang.v1.ast.nodes.DiceASTType;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.VariableDiceNode;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.VariableDiceNode;
-
 /**
  * Inline variables in a dice AST
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTOptimizer.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTOptimizer.java
index bababb3..178b175 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTOptimizer.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTOptimizer.java
@@ -1,13 +1,12 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.optimization.IOptimizationPass;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.optimization.IOptimizationPass;
-
 /**
  * Contains optimizations appliable to a dice AST
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTParser.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTParser.java
index dc35d37..d536cc3 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTParser.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTParser.java
@@ -1,10 +1,18 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 import java.util.Deque;
 import java.util.InputMismatchException;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import bjc.dicelang.v1.IDiceExpression;
+import bjc.dicelang.v1.ast.nodes.DiceLiteralNode;
+import bjc.dicelang.v1.ast.nodes.DiceLiteralType;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.ILiteralDiceNode;
+import bjc.dicelang.v1.ast.nodes.IntegerLiteralNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
+import bjc.dicelang.v1.ast.nodes.VariableDiceNode;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.FunctionalMap;
@@ -14,15 +22,6 @@ import bjc.utils.data.Tree;
 import bjc.utils.funcutils.StringUtils;
 import bjc.utils.parserutils.TreeConstructor;
 
-import bjc.dicelang.IDiceExpression;
-import bjc.dicelang.ast.nodes.DiceLiteralNode;
-import bjc.dicelang.ast.nodes.DiceLiteralType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.ILiteralDiceNode;
-import bjc.dicelang.ast.nodes.IntegerLiteralNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-import bjc.dicelang.ast.nodes.VariableDiceNode;
-
 /**
  * Parse a string expression into AST form. Doesn't do anything else
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTReferenceChecker.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTReferenceChecker.java
index 34414c5..5492cf7 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTReferenceChecker.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTReferenceChecker.java
@@ -1,13 +1,12 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 import java.util.function.Consumer;
 
+import bjc.dicelang.v1.ast.nodes.DiceASTType;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.VariableDiceNode;
 import bjc.utils.data.IHolder;
 
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.VariableDiceNode;
-
 /**
  * Check if the specified node references a particular variable
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTReferenceSanitizer.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTReferenceSanitizer.java
index 45eca36..79c0ce7 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTReferenceSanitizer.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTReferenceSanitizer.java
@@ -1,5 +1,8 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
+import bjc.dicelang.v1.ast.nodes.VariableDiceNode;
 import bjc.utils.data.IHolder;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Identity;
@@ -8,10 +11,6 @@ import bjc.utils.funcdata.IMap;
 import bjc.utils.data.TopDownTransformResult;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-import bjc.dicelang.ast.nodes.VariableDiceNode;
-
 /**
  * Sanitize the references in an AST so that a variable that refers to
  * itself in its definition has the occurance of it replaced with its
diff --git a/dice-lang/src/bjc/dicelang/ast/DiceASTUtils.java b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTUtils.java
index 95f62e8..92658b6 100644
--- a/dice-lang/src/bjc/dicelang/ast/DiceASTUtils.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DiceASTUtils.java
@@ -1,15 +1,14 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
+import bjc.dicelang.v1.IDiceExpression;
+import bjc.dicelang.v1.ScalarDie;
+import bjc.dicelang.v1.ast.nodes.DiceASTType;
+import bjc.dicelang.v1.ast.nodes.DiceLiteralNode;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.ILiteralDiceNode;
+import bjc.dicelang.v1.ast.nodes.IntegerLiteralNode;
 import bjc.utils.data.ITree;
 
-import bjc.dicelang.IDiceExpression;
-import bjc.dicelang.ScalarDie;
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.DiceLiteralNode;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.ILiteralDiceNode;
-import bjc.dicelang.ast.nodes.IntegerLiteralNode;
-
 /**
  * Functions that are useful when dealing with dice ASTs
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/DummyResult.java b/dice-lang/src/bjc/dicelang/v1/ast/DummyResult.java
index dec615d..1dd7057 100644
--- a/dice-lang/src/bjc/dicelang/ast/DummyResult.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/DummyResult.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 /**
  * A dummy result
diff --git a/dice-lang/src/bjc/dicelang/ast/IOperatorCollapser.java b/dice-lang/src/bjc/dicelang/v1/ast/IOperatorCollapser.java
index b2fab79..df5f95b 100644
--- a/dice-lang/src/bjc/dicelang/ast/IOperatorCollapser.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/IOperatorCollapser.java
@@ -1,13 +1,12 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 import java.util.function.Function;
 
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
 import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.IList;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-
 /**
  * Alias for operator collapsers. Because 68-char types are too long
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/IResult.java b/dice-lang/src/bjc/dicelang/v1/ast/IResult.java
index 9a3f325..093cfd0 100644
--- a/dice-lang/src/bjc/dicelang/ast/IResult.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/IResult.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 /**
  * Represents a result from an expression evaluation
diff --git a/dice-lang/src/bjc/dicelang/ast/IntegerResult.java b/dice-lang/src/bjc/dicelang/v1/ast/IntegerResult.java
index ce61d38..2934dfa 100644
--- a/dice-lang/src/bjc/dicelang/ast/IntegerResult.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/IntegerResult.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 /**
  * Represents a integer-valued result
diff --git a/dice-lang/src/bjc/dicelang/ast/ResultType.java b/dice-lang/src/bjc/dicelang/v1/ast/ResultType.java
index 9e3b129..73616ee 100644
--- a/dice-lang/src/bjc/dicelang/ast/ResultType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/ResultType.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast;
+package bjc.dicelang.v1.ast;
 
 /**
  * Represents the result of a computation
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/DiceASTType.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceASTType.java
index 9feb461..ea85b2a 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/DiceASTType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceASTType.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * An enum to represent the type of node an AST node is
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/DiceLiteralNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralNode.java
index b398ac6..4e9b560 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/DiceLiteralNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralNode.java
@@ -1,6 +1,6 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
-import bjc.dicelang.IDiceExpression;
+import bjc.dicelang.v1.IDiceExpression;
 
 /**
  * Represents a literal backed by a dice expression
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/DiceLiteralType.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralType.java
index 41c6b05..9440f85 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/DiceLiteralType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralType.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents the type of literals that can be in an AST
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/DiceOperatorType.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceOperatorType.java
index 7cc1e42..35e5680 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/DiceOperatorType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceOperatorType.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents the different type of operators.
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/IDiceASTNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IDiceASTNode.java
index b7bf9a6..219cf4a 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/IDiceASTNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IDiceASTNode.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * The interface for a node in a dice AST
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/ILiteralDiceNode.java
index 8be14fb..11d0d90 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/ILiteralDiceNode.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents a literal of some type in the AST
@@ -44,7 +44,7 @@ public interface ILiteralDiceNode extends IDiceASTNode {
 	 * Check if this node can be optimized to a constant
 	 * 
 	 * @return Whether or not this node can be optimized to a constant
-	 * @see bjc.dicelang.IDiceExpression#canOptimize()
+	 * @see bjc.dicelang.v1.IDiceExpression#canOptimize()
 	 */
 	boolean canOptimize();
 
@@ -69,7 +69,7 @@ public interface ILiteralDiceNode extends IDiceASTNode {
 	 * Optimize this node to a constant if possible
 	 * 
 	 * @return This node in constant form if possible
-	 * @see bjc.dicelang.IDiceExpression#optimize()
+	 * @see bjc.dicelang.v1.IDiceExpression#optimize()
 	 */
 	int optimize();
 }
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/IntegerLiteralNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IntegerLiteralNode.java
index 3d43bb1..4a756d6 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/IntegerLiteralNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IntegerLiteralNode.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents an integer literal of some kind
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/OperatorDiceNode.java
index b62c15c..b52ba49 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/OperatorDiceNode.java
@@ -1,8 +1,8 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
-import static bjc.dicelang.ast.nodes.DiceOperatorType.DICE;
-import static bjc.dicelang.ast.nodes.DiceOperatorType.EXPRESSION;
-import static bjc.dicelang.ast.nodes.DiceOperatorType.MATH;
+import static bjc.dicelang.v1.ast.nodes.DiceOperatorType.DICE;
+import static bjc.dicelang.v1.ast.nodes.DiceOperatorType.EXPRESSION;
+import static bjc.dicelang.v1.ast.nodes.DiceOperatorType.MATH;
 
 /**
  * A node that represents an operator
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/VariableDiceNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/VariableDiceNode.java
index da66608..d32b6b0 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/VariableDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/VariableDiceNode.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.ast.nodes;
+package bjc.dicelang.v1.ast.nodes;
 
 /**
  * A node that represents a reference to a variable
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/package-info.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/package-info.java
index f0f7366..098157d 100644
--- a/dice-lang/src/bjc/dicelang/ast/nodes/package-info.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/package-info.java
@@ -4,4 +4,4 @@
  * @author ben
  *
  */
-package bjc.dicelang.ast.nodes;
\ No newline at end of file
+package bjc.dicelang.v1.ast.nodes;
\ No newline at end of file
diff --git a/dice-lang/src/bjc/dicelang/ast/optimization/ArithmeticCollapser.java b/dice-lang/src/bjc/dicelang/v1/ast/optimization/ArithmeticCollapser.java
index 69cc379..0d10a07 100644
--- a/dice-lang/src/bjc/dicelang/ast/optimization/ArithmeticCollapser.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/optimization/ArithmeticCollapser.java
@@ -1,18 +1,17 @@
-package bjc.dicelang.ast.optimization;
+package bjc.dicelang.v1.ast.optimization;
 
 import java.util.function.BinaryOperator;
 
+import bjc.dicelang.v1.ast.DiceASTUtils;
+import bjc.dicelang.v1.ast.nodes.DiceASTType;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.ILiteralDiceNode;
+import bjc.dicelang.v1.ast.nodes.IntegerLiteralNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.IList;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ast.DiceASTUtils;
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.ILiteralDiceNode;
-import bjc.dicelang.ast.nodes.IntegerLiteralNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-
 class ArithmeticCollapser {
 	private BinaryOperator<Integer>	reducer;
 	private OperatorDiceNode		type;
diff --git a/dice-lang/src/bjc/dicelang/ast/optimization/ConstantCollapser.java b/dice-lang/src/bjc/dicelang/v1/ast/optimization/ConstantCollapser.java
index 38d9825..89f17db 100644
--- a/dice-lang/src/bjc/dicelang/ast/optimization/ConstantCollapser.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/optimization/ConstantCollapser.java
@@ -1,15 +1,14 @@
-package bjc.dicelang.ast.optimization;
+package bjc.dicelang.v1.ast.optimization;
 
+import bjc.dicelang.v1.ComplexDice;
+import bjc.dicelang.v1.ast.DiceASTUtils;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.IntegerLiteralNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.IList;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ComplexDice;
-import bjc.dicelang.ast.DiceASTUtils;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.IntegerLiteralNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-
 /**
  * Collapses operations with constants to constants
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/optimization/IOptimizationPass.java b/dice-lang/src/bjc/dicelang/v1/ast/optimization/IOptimizationPass.java
index bb24cdd..58943fa 100644
--- a/dice-lang/src/bjc/dicelang/ast/optimization/IOptimizationPass.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/optimization/IOptimizationPass.java
@@ -1,10 +1,9 @@
-package bjc.dicelang.ast.optimization;
+package bjc.dicelang.v1.ast.optimization;
 
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.IList;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-
 /**
  * Represents a pass of optimizations over a dice AST
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/optimization/OperationCondenser.java b/dice-lang/src/bjc/dicelang/v1/ast/optimization/OperationCondenser.java
index b3dc4a0..4a34167 100644
--- a/dice-lang/src/bjc/dicelang/ast/optimization/OperationCondenser.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/optimization/OperationCondenser.java
@@ -1,15 +1,14 @@
-package bjc.dicelang.ast.optimization;
+package bjc.dicelang.v1.ast.optimization;
 
+import bjc.dicelang.v1.ast.nodes.DiceASTType;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.nodes.OperatorDiceNode;
 import bjc.utils.data.IHolder;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Identity;
 import bjc.utils.data.TopDownTransformResult;
 import bjc.utils.data.Tree;
 
-import bjc.dicelang.ast.nodes.DiceASTType;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.nodes.OperatorDiceNode;
-
 /**
  * Condenses chained operations into a single level
  * 
diff --git a/dice-lang/src/bjc/dicelang/ast/optimization/package-info.java b/dice-lang/src/bjc/dicelang/v1/ast/optimization/package-info.java
index 6f75bf9..04727d7 100644
--- a/dice-lang/src/bjc/dicelang/ast/optimization/package-info.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/optimization/package-info.java
@@ -4,4 +4,4 @@
  * @author ben
  *
  */
-package bjc.dicelang.ast.optimization;
\ No newline at end of file
+package bjc.dicelang.v1.ast.optimization;
\ No newline at end of file
diff --git a/dice-lang/src/bjc/dicelang/ast/package-info.java b/dice-lang/src/bjc/dicelang/v1/ast/package-info.java
index f6352aa..4c79a45 100644
--- a/dice-lang/src/bjc/dicelang/ast/package-info.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/package-info.java
@@ -4,4 +4,4 @@
  * @author ben
  *
  */
-package bjc.dicelang.ast;
\ No newline at end of file
+package bjc.dicelang.v1.ast;
\ No newline at end of file
diff --git a/dice-lang/src/bjc/dicelang/examples/.gitignore b/dice-lang/src/bjc/dicelang/v1/examples/.gitignore
index a804034..a804034 100644
--- a/dice-lang/src/bjc/dicelang/examples/.gitignore
+++ b/dice-lang/src/bjc/dicelang/v1/examples/.gitignore
diff --git a/dice-lang/src/bjc/dicelang/examples/DiceASTLanguageTest.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTLanguageTest.java
index fa92fd2..117bc98 100644
--- a/dice-lang/src/bjc/dicelang/examples/DiceASTLanguageTest.java
+++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTLanguageTest.java
@@ -1,24 +1,23 @@
-package bjc.dicelang.examples;
+package bjc.dicelang.v1.examples;
 
 import java.util.InputMismatchException;
 import java.util.Scanner;
 
+import bjc.dicelang.v1.ast.DiceASTEvaluator;
+import bjc.dicelang.v1.ast.DiceASTInliner;
+import bjc.dicelang.v1.ast.DiceASTOptimizer;
+import bjc.dicelang.v1.ast.DiceASTParser;
+import bjc.dicelang.v1.ast.DiceASTReferenceSanitizer;
+import bjc.dicelang.v1.ast.IResult;
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
+import bjc.dicelang.v1.ast.optimization.ConstantCollapser;
+import bjc.dicelang.v1.ast.optimization.OperationCondenser;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.FunctionalMap;
 import bjc.utils.funcdata.FunctionalStringTokenizer;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 
-import bjc.dicelang.ast.DiceASTEvaluator;
-import bjc.dicelang.ast.DiceASTInliner;
-import bjc.dicelang.ast.DiceASTOptimizer;
-import bjc.dicelang.ast.DiceASTParser;
-import bjc.dicelang.ast.DiceASTReferenceSanitizer;
-import bjc.dicelang.ast.IResult;
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-import bjc.dicelang.ast.optimization.ConstantCollapser;
-import bjc.dicelang.ast.optimization.OperationCondenser;
-
 /**
  * Test interface for AST-based dice language
  * 
diff --git a/dice-lang/src/bjc/dicelang/examples/DiceASTPragma.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTPragma.java
index 3ca84f8..2fe9d30 100644
--- a/dice-lang/src/bjc/dicelang/examples/DiceASTPragma.java
+++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceASTPragma.java
@@ -1,13 +1,12 @@
-package bjc.dicelang.examples;
+package bjc.dicelang.v1.examples;
 
 import java.util.function.BiConsumer;
 
+import bjc.dicelang.v1.ast.nodes.IDiceASTNode;
 import bjc.utils.data.ITree;
 import bjc.utils.funcdata.FunctionalStringTokenizer;
 import bjc.utils.funcdata.IMap;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
-
 /**
  * Alias for the type of a 'pragma' or special language command
  * 
diff --git a/dice-lang/src/bjc/dicelang/examples/DiceExpressionParserTest.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionParserTest.java
index b31f3a0..68a0da5 100644
--- a/dice-lang/src/bjc/dicelang/examples/DiceExpressionParserTest.java
+++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionParserTest.java
@@ -1,10 +1,10 @@
-package bjc.dicelang.examples;
+package bjc.dicelang.v1.examples;
 
 import java.util.HashMap;
 import java.util.Scanner;
 
-import bjc.dicelang.DiceExpressionParser;
-import bjc.dicelang.IDiceExpression;
+import bjc.dicelang.v1.DiceExpressionParser;
+import bjc.dicelang.v1.IDiceExpression;
 
 /**
  * Driver class for testing expression parser
diff --git a/dice-lang/src/bjc/dicelang/examples/DiceExpressionPreparer.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionPreparer.java
index 14dad7c..f498f51 100644
--- a/dice-lang/src/bjc/dicelang/examples/DiceExpressionPreparer.java
+++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceExpressionPreparer.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.examples;
+package bjc.dicelang.v1.examples;
 
 import java.util.Deque;
 import java.util.LinkedList;
diff --git a/dice-lang/src/bjc/dicelang/examples/DiceLanguageState.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageState.java
index fbb103f..e402d73 100644
--- a/dice-lang/src/bjc/dicelang/examples/DiceLanguageState.java
+++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageState.java
@@ -1,12 +1,11 @@
-package bjc.dicelang.examples;
+package bjc.dicelang.v1.examples;
 
 import java.util.Map;
 
+import bjc.dicelang.v1.DiceExpressionParser;
+import bjc.dicelang.v1.IDiceExpression;
 import bjc.utils.data.Pair;
 
-import bjc.dicelang.DiceExpressionParser;
-import bjc.dicelang.IDiceExpression;
-
 /**
  * Internal state of dice language
  * 
diff --git a/dice-lang/src/bjc/dicelang/examples/DiceLanguageTest.java b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageTest.java
index bd6270e..257e646 100644
--- a/dice-lang/src/bjc/dicelang/examples/DiceLanguageTest.java
+++ b/dice-lang/src/bjc/dicelang/v1/examples/DiceLanguageTest.java
@@ -1,12 +1,12 @@
-package bjc.dicelang.examples;
+package bjc.dicelang.v1.examples;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.function.BiConsumer;
 
-import bjc.dicelang.DiceExpressionParser;
-import bjc.dicelang.IDiceExpression;
+import bjc.dicelang.v1.DiceExpressionParser;
+import bjc.dicelang.v1.IDiceExpression;
 
 /**
  * Test of dice language
diff --git a/dice-lang/src/bjc/dicelang/v2/Define.java b/dice-lang/src/bjc/dicelang/v2/Define.java
index 9a68a98..5af91ea 100644
--- a/dice-lang/src/bjc/dicelang/v2/Define.java
+++ b/dice-lang/src/bjc/dicelang/v2/Define.java
@@ -2,14 +2,14 @@ package bjc.dicelang.v2;
 
 import bjc.utils.data.CircularIterator;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+
 import java.util.Iterator;
 import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
 public class Define implements UnaryOperator<String> {
 	public static enum Type { LINE, TOKEN }
 
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceBox.java b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
index ae0481e..361b766 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceBox.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
@@ -105,7 +105,7 @@ public class DiceBox {
 		}
 
 		public boolean canOptimize() {
-			if(diceSize.canOptimize() && (diceSize.optimize() <= 1) {
+			if(diceSize.canOptimize() && (diceSize.optimize() <= 1)) {
 				return numDice.canOptimize();
 			} else return false;
 		}
@@ -454,7 +454,7 @@ public class DiceBox {
 		if(!isValidExpression(exp)) return null;
 
 		if(scalarDiePattern.matcher(exp).matches()) {
-			Die scal = new ScalarDie(Long.parseLong(exp.substring(0, exp.indexOf('s'))))
+			Die scal = new ScalarDie(Long.parseLong(exp.substring(0, exp.indexOf('s'))));
 
 			return new DieExpression(scal);
 		} else if(simpleDiePattern.matcher(exp).matches()) {
@@ -462,7 +462,7 @@ public class DiceBox {
 
 			long right = Long.parseLong(dieParts[1]);
 			if(dieParts[0].equals("")) {
-				Die scal = new SimpleDie(1, right)
+				Die scal = new SimpleDie(1, right);
 				return new DieExpression(scal);
 			} else {
 				Die scal = new SimpleDie(Long.parseLong(dieParts[0]), right);
@@ -485,7 +485,7 @@ public class DiceBox {
 			DieExpression   left  = parseExpression(dieParts[0]);
 			Predicate<Long> right = deriveCond(dieParts[1]);
 
-			Die scal = new CompoundingDie(left.scalar, right, dieParts[1])
+			Die scal = new CompoundingDie(left.scalar, right, dieParts[1]);
 			return new DieExpression(scal);
 		} else if(explodingDiePattern.matcher(exp).matches()) {
 			String[] dieParts = exp.split("!");
@@ -510,7 +510,7 @@ public class DiceBox {
 			DieExpression right = parseExpression(dieParts[1]);
 			
 			DieList lst = new SimpleDieList(left.scalar, right.scalar);
-			return new DieExpression();
+			return new DieExpression(lst);
 		}
 
 		// @TODO give a specific error message
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java b/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
index 9d69704..7f3c85b 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
@@ -1,5 +1,7 @@
 package bjc.dicelang.v2;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.LinkedList;
@@ -9,8 +11,6 @@ import java.util.regex.Pattern;
 import jline.ConsoleReader;
 import jline.Terminal;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
 public class DiceLangConsole {
 	private int commandNumber;
 
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
index 0798988..8ff20ef 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
@@ -11,6 +11,9 @@ import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 import bjc.utils.funcutils.StringUtils;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.Token.Type.*;
+
 import java.util.Comparator;
 import java.util.Deque;
 import java.util.Iterator;
@@ -19,9 +22,6 @@ import java.util.LinkedList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Token.Type.*;
-
 public class DiceLangEngine {
 	// Input rules for processing tokens
 	private List<IPair<String, String>> opExpansionList;
diff --git a/dice-lang/src/bjc/dicelang/v2/Evaluator.java b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
index 904c8bc..047e12f 100644
--- a/dice-lang/src/bjc/dicelang/v2/Evaluator.java
+++ b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
@@ -6,14 +6,14 @@ import bjc.utils.data.Tree;
 import bjc.utils.data.TopDownTransformIterator;
 import bjc.utils.data.TopDownTransformResult;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.EvaluatorResult.Type.*;
+
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.function.Consumer;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.EvaluatorResult.Type.*;
-
 public class Evaluator {
 	private static enum CoerceSteps {
 		INTEGER, FLOAT;
@@ -128,12 +128,12 @@ public class Evaluator {
 						Iterator<ITree<Node>> nd = stepDebug(child);
 
 						for(; nd.hasNext(); nChild = nd.next()) {
-							ctx.thunk.accept(new SingleIterator(child));
+							ctx.thunk.accept(new SingleIterator<>(child));
 						}
 					} else {
 						nChild = new Tree<>(new Node(Node.Type.RESULT, evaluate(child)));
 
-						if(nChild != null) ctx.thunk.accept(new SingleIterator(nChild));
+						if(nChild != null) ctx.thunk.accept(new SingleIterator<>(nChild));
 					}
 
 					Node childNode      = nChild.getHead();
diff --git a/dice-lang/src/bjc/dicelang/v2/Parser.java b/dice-lang/src/bjc/dicelang/v2/Parser.java
index c939a8b..a47707d 100644
--- a/dice-lang/src/bjc/dicelang/v2/Parser.java
+++ b/dice-lang/src/bjc/dicelang/v2/Parser.java
@@ -1,5 +1,9 @@
 package bjc.dicelang.v2;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.Node.Type.*;
+import static bjc.dicelang.v2.Token.Type.*;
+
 import java.util.Deque;
 import java.util.LinkedList;
 
@@ -7,10 +11,6 @@ import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.funcdata.IList;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Node.Type.*;
-import static bjc.dicelang.v2.Token.Type.*;
-
 public class Parser {
 	public Parser() {
 
diff --git a/dice-lang/src/bjc/dicelang/v2/Shunter.java b/dice-lang/src/bjc/dicelang/v2/Shunter.java
index d5f9135..41bc388 100644
--- a/dice-lang/src/bjc/dicelang/v2/Shunter.java
+++ b/dice-lang/src/bjc/dicelang/v2/Shunter.java
@@ -5,14 +5,14 @@ import bjc.utils.funcdata.FunctionalMap;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.Token.Type.*;
+
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Token.Type.*;
-
 public class Shunter {
 	// The binary operators and their
 	// priorities
diff --git a/dice-lang/src/bjc/dicelang/v2/StreamEngine.java b/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
index 41f01a7..cd43e92 100644
--- a/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
@@ -3,11 +3,12 @@ package bjc.dicelang.v2;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcutils.ListUtils;
-import bjc.utils.esodata.SingleTape;
-import bjc.utils.esodata.Tape;
 
 import static bjc.dicelang.v2.Errors.ErrorKey.*;
 
+import bjc.utils.esodata.SingleTape;
+import bjc.utils.esodata.Tape;
+
 public class StreamEngine {
 	private DiceLangEngine eng;