12 files changed, 26 insertions, 17 deletions
diff --git a/scl/src/main/java/bjc/dicelang/scl/StreamControlEngine.java b/scl/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
index 5224b6f..fa1055a 100644
--- a/scl/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
+++ b/scl/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
@@ -3,6 +3,14 @@ package bjc.dicelang.scl;
 import java.util.HashMap;
 import java.util.Map;
 
+import bjc.dicelang.scl.tokens.ArraySCLToken;
+import bjc.dicelang.scl.tokens.BooleanSCLToken;
+import bjc.dicelang.scl.tokens.IntSCLToken;
+import bjc.dicelang.scl.tokens.SCLToken;
+import bjc.dicelang.scl.tokens.StringLitSCLToken;
+import bjc.dicelang.scl.tokens.WordListSCLToken;
+import bjc.dicelang.scl.tokens.WordSCLToken;
+import bjc.dicelang.scl.tokens.WordsSCLToken;
 import bjc.utils.esodata.SimpleStack;
 import bjc.utils.esodata.Stack;
 import bjc.utils.funcdata.FunctionalList;
@@ -10,8 +18,8 @@ import bjc.utils.funcdata.IList;
 import bjc.utils.parserutils.TokenUtils;
 
 import static bjc.dicelang.scl.Errors.ErrorKey.*;
-import static bjc.dicelang.scl.SCLToken.Type.*;
-import static bjc.dicelang.scl.WordSCLToken.Word.*;
+import static bjc.dicelang.scl.tokens.SCLToken.Type.*;
+import static bjc.dicelang.scl.tokens.WordSCLToken.Word.*;
 
 /*
  * @TODO 10/08/17 Ben Culkin :SCLReorg
@@ -389,7 +397,7 @@ public class StreamControlEngine {
 
 		String strang = TokenUtils.descapeString(sb.toString());
 
-		curStack.push(new StringSCLToken(false, strang));
+		curStack.push(new StringLitSCLToken(strang));
 
 		return n;
 	}
diff --git a/scl/src/main/java/bjc/dicelang/scl/ArraySCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
index ff86f48..28cab78 100644
--- a/scl/src/main/java/bjc/dicelang/scl/ArraySCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/ArraySCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 import bjc.utils.funcdata.IList;
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/BooleanSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/BooleanSCLToken.java
index e2e8e12..bb6d1a2 100644
--- a/scl/src/main/java/bjc/dicelang/scl/BooleanSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/BooleanSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 public class BooleanSCLToken extends SCLToken {
 	/* Used for BLIT */
diff --git a/scl/src/main/java/bjc/dicelang/scl/FloatSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/FloatSCLToken.java
index f02c796..835e881 100644
--- a/scl/src/main/java/bjc/dicelang/scl/FloatSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/FloatSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 public class FloatSCLToken extends SCLToken {
 	/* Used for FLIT */
diff --git a/scl/src/main/java/bjc/dicelang/scl/IntSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/IntSCLToken.java
index 9e88dbe..b185926 100644
--- a/scl/src/main/java/bjc/dicelang/scl/IntSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/IntSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 public class IntSCLToken extends SCLToken {
 	/* Used for ILIT */
diff --git a/scl/src/main/java/bjc/dicelang/scl/SCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
index c4056e0..c0158d0 100644
--- a/scl/src/main/java/bjc/dicelang/scl/SCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
@@ -1,12 +1,13 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import bjc.dicelang.scl.Errors;
 import bjc.utils.parserutils.TokenUtils;
 
 import static bjc.dicelang.scl.Errors.ErrorKey.*;
-import static bjc.dicelang.scl.SCLToken.Type.*;
+import static bjc.dicelang.scl.tokens.SCLToken.Type.*;
 
 public class SCLToken {
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/StringLitSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/StringLitSCLToken.java
index caf425a..85c6cb0 100644
--- a/scl/src/main/java/bjc/dicelang/scl/StringLitSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/StringLitSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 public class StringLitSCLToken extends StringSCLToken {
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/StringSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/StringSCLToken.java
index 1436bc3..fcd339c 100644
--- a/scl/src/main/java/bjc/dicelang/scl/StringSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/StringSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 public class StringSCLToken extends SCLToken {
 	/* Used for SYMBOL & SLIT */
diff --git a/scl/src/main/java/bjc/dicelang/scl/SymbolSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/SymbolSCLToken.java
index f841654..c9ba43a 100644
--- a/scl/src/main/java/bjc/dicelang/scl/SymbolSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/SymbolSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 public class SymbolSCLToken extends StringSCLToken {
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/WordListSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java
index ffa0e85..f6ae63b 100644
--- a/scl/src/main/java/bjc/dicelang/scl/WordListSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/WordListSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 import bjc.utils.funcdata.IList;
 
diff --git a/scl/src/main/java/bjc/dicelang/scl/WordSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
index ea3118e..dcbef72 100644
--- a/scl/src/main/java/bjc/dicelang/scl/WordSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
@@ -1,10 +1,10 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
+
+import static bjc.dicelang.scl.tokens.WordSCLToken.Word.*;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static bjc.dicelang.scl.WordSCLToken.Word.*;
-
 public class WordSCLToken extends SCLToken {
 	public static enum Word {
 		/* Array manipulation */
diff --git a/scl/src/main/java/bjc/dicelang/scl/WordsSCLToken.java b/scl/src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java
index 9a57176..02d720c 100644
--- a/scl/src/main/java/bjc/dicelang/scl/WordsSCLToken.java
+++ b/scl/src/main/java/bjc/dicelang/scl/tokens/WordsSCLToken.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.scl;
+package bjc.dicelang.scl.tokens;
 
 import bjc.utils.funcdata.IList;