diff --git a/+TableBlock/convert_hierarchical_grid_to_java.m b/+TableBlock/convert_hierarchical_grid_to_java.m
index a4658d045d73e784925c9a6b2e1bac7760e85570..e719c07f79738ba5e821ec721c81316f24ead53c 100644
--- a/+TableBlock/convert_hierarchical_grid_to_java.m
+++ b/+TableBlock/convert_hierarchical_grid_to_java.m
@@ -13,7 +13,7 @@
 function convert_hierarchical_grid_to_java(grid, java_grid)
 
 for i=1:size(grid,2)
-    new_cell = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalCell;
+    new_cell = ca.mcscert.jtet.tablularexpression.HierarchicalCell;
     
     old_cell = grid(i)
     new_cell.setContents(old_cell.cond_text)
diff --git a/.gitignore b/.gitignore
index 8ae377735c71fd380f00a06e0a585e5c78a939bb..b1711bc18d455f3cba6d098e5158a235f84ec053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/Matlab2SMT/target/
-/Matlab2SMT/gen/
+/jTET/target/
+/jTET/gen/
 .idea/
 .pvscontext
-Matlab2SMT/Matlab2SMT.iml
+/jTET/jtet.iml
diff --git a/@CVC_checker/CVC_checker.m b/@CVC_checker/CVC_checker.m
index f0704ec416334c6a407e9483aff9a83af98d88ba..a7851941d134136fb621d11d4e322f9539e5e74c 100644
--- a/@CVC_checker/CVC_checker.m
+++ b/@CVC_checker/CVC_checker.m
@@ -6,8 +6,8 @@ classdef CVC_checker
         
         command = 'cvc3';
         data = [];
-        generator = ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator();
-        boolean_type = ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType();
+        generator = ca.mcscert.jtet.expression.CVC3Generator();
+        boolean_type = ca.mcscert.jtet.expression.BooleanVariableType();
         
     end
     
diff --git a/@CVC_checker/generate_cvc_grid.m b/@CVC_checker/generate_cvc_grid.m
index 7483588bc79142a4c526845724a7b2462513f499..2a7175b3e1fd34766b46edb977a22ed80ecb84a9 100644
--- a/@CVC_checker/generate_cvc_grid.m
+++ b/@CVC_checker/generate_cvc_grid.m
@@ -18,12 +18,12 @@ function [ code , query] = generate_cvc_grid( object, grid , level, var_def)
 
 % New Junk
 % First build grid in java
-HGrid = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid
+HGrid = ca.mcscert.jtet.tablularexpression.HierarchicalGrid
 TableBlock.convert_hierarchical_grid_to_java(grid.cells, HGrid.getSubHiearchy());
 % generate the formulas for the main grid
 
-gridGenerator = ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator.HierarchicalGridCVC3Generator(var_def, level);
-code = char(ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(HGrid, gridGenerator));
+gridGenerator = ca.mcscert.jtet.cvc3generator.HierarchicalGridCVC3Generator(var_def, level);
+code = char(ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerWalkerGenerator.GenerateCheckerFromGrid(HGrid, gridGenerator));
 query = gridGenerator.getFinalQueries();
 
 
diff --git a/@GUI/smtlib_ext_call.m b/@GUI/smtlib_ext_call.m
index a72825eabfc577ed3ae4e4d2274b002fbd1d4c08..3c12d188e26058c100d3c14074facfc7dbc7b3e0 100644
--- a/@GUI/smtlib_ext_call.m
+++ b/@GUI/smtlib_ext_call.m
@@ -17,16 +17,16 @@ if (~error)
     inputs = TET.getInstance.getVariableParser.parseVariables(object.Data.function_inputs);
     vars = inputs.getVariables().values();
 
-    HGrid = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid
+    HGrid = ca.mcscert.jtet.tablularexpression.HierarchicalGrid
     TableBlock.convert_hierarchical_grid_to_java(object.Data.Grid2.cells, HGrid.getSubHiearchy());
 
-    res = ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker.CheckerRunner.RunZ3(HGrid, inputs);
+    res = ca.mcscert.jtet.smtlibchecker.CheckerRunner.RunZ3(HGrid, inputs);
 
     if object.Data.multi_mode == 0 && size(object.Data.Grid1.cells,2) > 1
-        HGrid = ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid
+        HGrid = ca.mcscert.jtet.tablularexpression.HierarchicalGrid
         TableBlock.convert_hierarchical_grid_to_java(object.Data.Grid1.cells, HGrid.getSubHiearchy());
 
-        res2 = ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker.CheckerRunner.RunZ3(HGrid, inputs);
+        res2 = ca.mcscert.jtet.smtlibchecker.CheckerRunner.RunZ3(HGrid, inputs);
         res.addAll(res2);
     end   
     
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/App.java b/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/App.java
deleted file mode 100644
index a143a2d89acd6c703a177dfd45f4fb3255185f02..0000000000000000000000000000000000000000
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/App.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.antlr.v4.runtime.misc.TestRig;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        String[] args2 = {"ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser", "expression", "-tree"};
-        try {
-            TestRig.main(args2);
-        } catch (Exception ex) {
-            Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        System.out.println( "Hello World!" );
-    }
-
-    public int test(Object p) {
-        return 5;
-    }
-}
diff --git a/TET.m b/TET.m
index 9af9dec1fd1e1854830d706bb82cff49d41cf1d1..7204df24070c10ce37edae93b87ed52e813f7387 100644
--- a/TET.m
+++ b/TET.m
@@ -5,7 +5,7 @@ classdef (Sealed) TET < handle
     %   globals used in the TET.
 
     properties (Access = private)
-        variableParser = ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser
+        variableParser = ca.mcscert.jtet.parsers.VariableParser
     end
 
     methods
diff --git a/TTdiag.m b/TTdiag.m
index 7fa935021117536022c91e621b78249e80ba6c0a..68231728bdb7d85fb0cab7ae93daf9ef24b8f5b8 100644
--- a/TTdiag.m
+++ b/TTdiag.m
@@ -5,7 +5,7 @@ function TTdiag(varargin)
 
 % First find the path.
 path = mfilename('fullpath');
-path = [path(1:size(path, 2)-6) 'Matlab2SMT/Matlab2SMT-1.0-SNAPSHOT-jar-with-dependencies.jar'];
+path = [path(1:size(path, 2)-6) 'jTET/jtet-1.0-SNAPSHOT-jar-with-dependencies.jar'];
 
 % Verify the jar isn't already in the classpath.
 classpath = javaclasspath;
diff --git a/Matlab2SMT/pom.xml b/jTET/pom.xml
similarity index 92%
rename from Matlab2SMT/pom.xml
rename to jTET/pom.xml
index 806ea22aac5d501a8a6ac90c7949a66be8aec7b4..79d1e2884c7d3d2a232d83a6cb6140157714fbce 100644
--- a/Matlab2SMT/pom.xml
+++ b/jTET/pom.xml
@@ -5,12 +5,12 @@
         <maven>3.0</maven>
     </prerequisites>
 
-    <groupId>ca.mcmaster.cas.tabularexpressiontoolbox</groupId>
-    <artifactId>Matlab2SMT</artifactId>
+    <groupId>ca.mcscert.jtet</groupId>
+    <artifactId>jtet</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Matlab2SMT</name>
+    <name>jTET</name>
     <url>http://maven.apache.org</url>
 
     <properties>
@@ -71,11 +71,6 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <mainClass>ca.mcmaster.cas.tabularexpressiontoolbox.expression.App</mainClass>
-                        </manifest>
-                    </archive>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3Generator.java b/jTET/src/main/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3Generator.java
similarity index 90%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3Generator.java
rename to jTET/src/main/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3Generator.java
index 86b804907e4816f2971110a7e45d47f742f88405..4b5a44133f2db73da1f6fc7771b1a273d4da6379 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3Generator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3Generator.java
@@ -26,20 +26,18 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.Cell;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerGenerator;
+package ca.mcscert.jtet.cvc3generator;
+
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.MatlabParser;
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.tablularexpression.Cell;
+import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerGenerator;
 import java.util.ArrayList;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BinaryOperation.java b/jTET/src/main/java/ca/mcscert/jtet/expression/BinaryOperation.java
similarity index 97%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BinaryOperation.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/BinaryOperation.java
index f168df723ff2b5771f68a85636a2539f0602b357..1b679d3e78d0956d2c183b0831c892b173ca3922 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BinaryOperation.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/BinaryOperation.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BooleanVariableType.java b/jTET/src/main/java/ca/mcscert/jtet/expression/BooleanVariableType.java
similarity index 88%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BooleanVariableType.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/BooleanVariableType.java
index 19bc897752acd628a805a57714f3698fbe1bce97..dc04eaff3663894e50623a90d1a00ea2082fc8b1 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/BooleanVariableType.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/BooleanVariableType.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3Generator.java b/jTET/src/main/java/ca/mcscert/jtet/expression/CVC3Generator.java
similarity index 99%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3Generator.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/CVC3Generator.java
index 74467a8c05066b5e94e62572aafa6029c653d0e4..38142aa3683787a0fe437c5c17c363c562dc94be 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3Generator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/CVC3Generator.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CheckerGenerator.java b/jTET/src/main/java/ca/mcscert/jtet/expression/CheckerGenerator.java
similarity index 86%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CheckerGenerator.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/CheckerGenerator.java
index 3ef951b8aa769b91fbe191678958cfbe5f65f1c8..a9ef037073972e1495dc8cd9c1369bdd69560366 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CheckerGenerator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/CheckerGenerator.java
@@ -2,9 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
-
-import java.util.Map;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/EnumerationVariableType.java b/jTET/src/main/java/ca/mcscert/jtet/expression/EnumerationVariableType.java
similarity index 97%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/EnumerationVariableType.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/EnumerationVariableType.java
index affa25855b643946e03bc87d663a0590fd138274..5eaf52c5d9ced18907cfe75a9a2fb3c950fda162 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/EnumerationVariableType.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/EnumerationVariableType.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Expression.java b/jTET/src/main/java/ca/mcscert/jtet/expression/Expression.java
similarity index 89%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Expression.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/Expression.java
index 7d17b1a81304415c3bc1205b8cbde6600d8b2408..05a64bd1175e4bfdbc620f7c43a146617ba1f4d6 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Expression.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/Expression.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionBinaryOperation.java b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionBinaryOperation.java
similarity index 97%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionBinaryOperation.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionBinaryOperation.java
index 05fd9ea5186dff3d84fe2de16cd4c5420be2239f..691e528ad631ad0ed4c5107443dcba737ed63dc6 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionBinaryOperation.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionBinaryOperation.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import java.util.Collection;
 
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionUnaryOperation.java b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionUnaryOperation.java
similarity index 95%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionUnaryOperation.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionUnaryOperation.java
index b1a1ea7dd3010d003ecb15e96bbf14c775989fdf..10fcf8f631b9f380dc101e47eddb4f8186848805 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionUnaryOperation.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionUnaryOperation.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionValue.java b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionValue.java
similarity index 84%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionValue.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionValue.java
index 0493a85b6e8be34e503f28d94719c41ca440b3cd..3fc78ae474a9adda9a5ceb35895b6b8334f5e19b 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionValue.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionValue.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /** This interface means the expression is a value with no further expansion possible.
  * This is just a marker to mean an expression is only a value.
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionWithSubExpression.java b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionWithSubExpression.java
similarity index 82%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionWithSubExpression.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionWithSubExpression.java
index b0ee89d12aab500ad687a95648902f828f248215..bb668c69e1ef6e993d7ca17168d0842044acb4bb 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/ExpressionWithSubExpression.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/ExpressionWithSubExpression.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/FixedPointVariableType.java b/jTET/src/main/java/ca/mcscert/jtet/expression/FixedPointVariableType.java
similarity index 96%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/FixedPointVariableType.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/FixedPointVariableType.java
index db77d5692beb08f5362c772217805e988eed8d84..a4a356d3f9e8ba4525b2e6a9245516a04611c17f 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/FixedPointVariableType.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/FixedPointVariableType.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Literal.java b/jTET/src/main/java/ca/mcscert/jtet/expression/Literal.java
similarity index 93%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Literal.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/Literal.java
index 32e401f0c26c8da42b39af2ccacb83c538f3b359..6b174dcbad66c7517ce465b047352d2858f2109d 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Literal.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/Literal.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/OperationType.java b/jTET/src/main/java/ca/mcscert/jtet/expression/OperationType.java
similarity index 78%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/OperationType.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/OperationType.java
index 804db77725fde2b33efe91157e97c54fd3cbe12e..2c147c409ee86d4996ed46ad146648e3e7e1ca71 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/OperationType.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/OperationType.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/RealVariableType.java b/jTET/src/main/java/ca/mcscert/jtet/expression/RealVariableType.java
similarity index 88%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/RealVariableType.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/RealVariableType.java
index d7b14bc6f8be7412364b8869ee3af33b50950b86..3dd464dbe63d959b16d56c11afa73470df5c17a5 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/RealVariableType.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/RealVariableType.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/SMTLIBGenerator.java b/jTET/src/main/java/ca/mcscert/jtet/expression/SMTLIBGenerator.java
similarity index 99%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/SMTLIBGenerator.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/SMTLIBGenerator.java
index 1988cbf7f64c8101d351ac82c2e367dc5f097deb..967613f4a8faed44234d8257e3d5aca28f040c29 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/SMTLIBGenerator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/SMTLIBGenerator.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import java.util.HashSet;
 import java.util.Map;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/UnaryOperation.java b/jTET/src/main/java/ca/mcscert/jtet/expression/UnaryOperation.java
similarity index 75%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/UnaryOperation.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/UnaryOperation.java
index ddae29ba809fa90bcb3137dfa9cfb644455dc642..8e0f23ae916f974c65f59003ea70e2fbf37649b2 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/UnaryOperation.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/UnaryOperation.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Variable.java b/jTET/src/main/java/ca/mcscert/jtet/expression/Variable.java
similarity index 94%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Variable.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/Variable.java
index ad49cc7da1839606d729a92326893cf529d453f9..998b6606136aca7d2ab1dd661aa118d2d775090d 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/Variable.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/Variable.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableCollection.java b/jTET/src/main/java/ca/mcscert/jtet/expression/VariableCollection.java
similarity index 98%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableCollection.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/VariableCollection.java
index b237cab477df2526d75d56be9a6a653881c9e686..0e988d030df9cf9a226e7c47810647619443c1b6 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableCollection.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/VariableCollection.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableType.java b/jTET/src/main/java/ca/mcscert/jtet/expression/VariableType.java
similarity index 94%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableType.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/VariableType.java
index 37252ebd7852e5ea39d3241ad8f02f62797b7a99..a114b79cda0e6292e9be2e9f11e178954df094ea 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableType.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/VariableType.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableTypeMarker.java b/jTET/src/main/java/ca/mcscert/jtet/expression/VariableTypeMarker.java
similarity index 96%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableTypeMarker.java
rename to jTET/src/main/java/ca/mcscert/jtet/expression/VariableTypeMarker.java
index 3e5b4594981f720b33c0c48ef759df66adc3c391..4060722bb6a751565d96a2e6c7f43cb67c2fa752 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableTypeMarker.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/expression/VariableTypeMarker.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 /**
  * @author Matthew Dawson <matthew@mjdsystems.ca>
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/MatlabParser.g4 b/jTET/src/main/java/ca/mcscert/jtet/parsers/MatlabParser.g4
similarity index 100%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/MatlabParser.g4
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/MatlabParser.g4
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/MatlabParser.java b/jTET/src/main/java/ca/mcscert/jtet/parsers/MatlabParser.java
similarity index 82%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/MatlabParser.java
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/MatlabParser.java
index 6c1ec037f66a37822bc6f91cc390115bb143b283..85659aafe19c9117c6264cfbccd205b0fceb850c 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/MatlabParser.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/parsers/MatlabParser.java
@@ -2,37 +2,37 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BinaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Expression;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionUnaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionValue;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionBinaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionWithSubExpression;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Literal;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.UnaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.G1Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.G2Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.G3Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.G4Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E0Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E1Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E2Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E3Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E4Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E5Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E6Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E7Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E8Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E9Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E10Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.E11Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.Literal_numberContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.Id_plus_indexersContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParserParser.Prefix_operatorContext;
+package ca.mcscert.jtet.parsers;
+
+import ca.mcscert.jtet.expression.BinaryOperation;
+import ca.mcscert.jtet.expression.Expression;
+import ca.mcscert.jtet.expression.ExpressionUnaryOperation;
+import ca.mcscert.jtet.expression.ExpressionValue;
+import ca.mcscert.jtet.expression.ExpressionBinaryOperation;
+import ca.mcscert.jtet.expression.ExpressionWithSubExpression;
+import ca.mcscert.jtet.expression.Literal;
+import ca.mcscert.jtet.expression.UnaryOperation;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.MatlabParserParser.G1Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.G2Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.G3Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.G4Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E0Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E1Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E2Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E3Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E4Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E5Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E6Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E7Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E8Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E9Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E10Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.E11Context;
+import ca.mcscert.jtet.parsers.MatlabParserParser.Literal_numberContext;
+import ca.mcscert.jtet.parsers.MatlabParserParser.Id_plus_indexersContext;
+import ca.mcscert.jtet.parsers.MatlabParserParser.Prefix_operatorContext;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Map;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/PVSSimpleParser.g4 b/jTET/src/main/java/ca/mcscert/jtet/parsers/PVSSimpleParser.g4
similarity index 100%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/PVSSimpleParser.g4
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/PVSSimpleParser.g4
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/PVSSimpleParser.java b/jTET/src/main/java/ca/mcscert/jtet/parsers/PVSSimpleParser.java
similarity index 80%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/PVSSimpleParser.java
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/PVSSimpleParser.java
index 3587cd7a3310e050ca9d70cbe2ee199cd439a8eb..d77896c3002b09e633fe5da5d2064588894e9046 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/PVSSimpleParser.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/parsers/PVSSimpleParser.java
@@ -2,39 +2,39 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BinaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Expression;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionBinaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionUnaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionValue;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionWithSubExpression;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Literal;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.UnaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E0Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E1Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E2Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E3Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E4Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E5Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E6Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E7Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E8Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.E9Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G1Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G2Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G3Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G4Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G5Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G6Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G7Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G8Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.G9Context;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.IdContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParserParser.Literal_numberContext;
+package ca.mcscert.jtet.parsers;
+
+import ca.mcscert.jtet.expression.BinaryOperation;
+import ca.mcscert.jtet.expression.Expression;
+import ca.mcscert.jtet.expression.ExpressionBinaryOperation;
+import ca.mcscert.jtet.expression.ExpressionUnaryOperation;
+import ca.mcscert.jtet.expression.ExpressionValue;
+import ca.mcscert.jtet.expression.ExpressionWithSubExpression;
+import ca.mcscert.jtet.expression.Literal;
+import ca.mcscert.jtet.expression.UnaryOperation;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E0Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E1Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E2Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E3Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E4Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E5Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E6Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E7Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E8Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.E9Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G1Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G2Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G3Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G4Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G5Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G6Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G7Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G8Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.G9Context;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.IdContext;
+import ca.mcscert.jtet.parsers.PVSSimpleParserParser.Literal_numberContext;
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParser.java b/jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParser.java
similarity index 85%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParser.java
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParser.java
index ae57c05cdc05c88b487dd3ae17df1a745ab1caac..52a6d22dda2e66dcafadf877a070b1326e6947ec 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParser.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParser.java
@@ -2,26 +2,26 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.EnumerationVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.FixedPointVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParserParser.Bool_typeContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParserParser.DefaulttypeContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParserParser.Fixed_typeContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParserParser.Real_typeContext;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParserParser.VarContext;
+package ca.mcscert.jtet.parsers;
+
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.EnumerationVariableType;
+import ca.mcscert.jtet.expression.FixedPointVariableType;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.VariableParserParser.Bool_typeContext;
+import ca.mcscert.jtet.parsers.VariableParserParser.DefaulttypeContext;
+import ca.mcscert.jtet.parsers.VariableParserParser.Fixed_typeContext;
+import ca.mcscert.jtet.parsers.VariableParserParser.Real_typeContext;
+import ca.mcscert.jtet.parsers.VariableParserParser.VarContext;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableType;
+import ca.mcscert.jtet.expression.VariableType;
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.misc.NotNull;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParserLexer.g4 b/jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParserLexer.g4
similarity index 100%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParserLexer.g4
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParserLexer.g4
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParserParser.g4 b/jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParserParser.g4
similarity index 100%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/VariableParserParser.g4
rename to jTET/src/main/java/ca/mcscert/jtet/parsers/VariableParserParser.g4
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunner.java b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunner.java
similarity index 95%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunner.java
rename to jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunner.java
index a948cf1bbe1f4a4845680ada10f2b632c4a2bbe6..2b134328c6d304d31133a49c0ccfdb2f984513dc 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunner.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunner.java
@@ -26,13 +26,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker;
+package ca.mcscert.jtet.smtlibchecker;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.SMTLIBGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerWalkerGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid;
+import ca.mcscert.jtet.expression.SMTLIBGenerator;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerWalkerGenerator;
+import ca.mcscert.jtet.tablularexpression.HierarchicalGrid;
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.misc.NotNull;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerResult.java b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerResult.java
similarity index 97%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerResult.java
rename to jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerResult.java
index e622355d8c231634b0c270b8540564fe1ecd40ea..798039459d3b5abc05e506dac4711a2f003b8f66 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerResult.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerResult.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker;
+package ca.mcscert.jtet.smtlibchecker;
 
 import java.util.Map;
 
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/HierarchicalGridSMTLIBGenerator.java b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGenerator.java
similarity index 90%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/HierarchicalGridSMTLIBGenerator.java
rename to jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGenerator.java
index 724acbc4a1ca5c1ac5d1c848eebd2d3befbad63e..1566bcc5c915f335dfdf796f78b5deae2c1cb01b 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/HierarchicalGridSMTLIBGenerator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGenerator.java
@@ -26,22 +26,20 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.SMTLIBGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.Cell;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerGenerator;
+package ca.mcscert.jtet.smtlibchecker;
+
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.MatlabParser;
+import ca.mcscert.jtet.expression.SMTLIBGenerator;
+import ca.mcscert.jtet.tablularexpression.Cell;
+import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerGenerator;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
-import java.util.Map;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/SMTLibOutParser.g4 b/jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/SMTLibOutParser.g4
similarity index 100%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/SMTLibOutParser.g4
rename to jTET/src/main/java/ca/mcscert/jtet/smtlibchecker/SMTLibOutParser.g4
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/Cell.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/Cell.java
similarity index 87%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/Cell.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/Cell.java
index e029bdc2af990b07c30eac435756b9337d9ccd92..2f51df4cc3a5db75d195164a7caa71e331c3b473 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/Cell.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/Cell.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchcialGridCheckerGenerator.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchcialGridCheckerGenerator.java
similarity index 96%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchcialGridCheckerGenerator.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchcialGridCheckerGenerator.java
index 25e88adab529bc9182d04ee47f51467e81f1617a..7679357206ac374539baee8a915d6c4d7c534fed 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchcialGridCheckerGenerator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchcialGridCheckerGenerator.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 /**
  *
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchcialGridCheckerWalkerGenerator.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchcialGridCheckerWalkerGenerator.java
similarity index 97%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchcialGridCheckerWalkerGenerator.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchcialGridCheckerWalkerGenerator.java
index a3000b7ea0285d7e675a6c83303e78707d102590..d8c39ac570fc8eb1a784ea75f7fa3ff6fe3e8f04 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchcialGridCheckerWalkerGenerator.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchcialGridCheckerWalkerGenerator.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 import java.util.List;
 
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchicalCell.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalCell.java
similarity index 89%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchicalCell.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalCell.java
index 01b55641ce2a2cc2b5a46af93612301c2ad96d44..3e8ba6cb653d3069a62d64e8b92f5474301266a8 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchicalCell.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalCell.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchicalGrid.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalGrid.java
similarity index 87%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchicalGrid.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalGrid.java
index 76dc6cd430f63d0ea0f5e03ba214465cba587456..ea5e9bfd20728351377f8abc683f2f6843699864 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/HierarchicalGrid.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/HierarchicalGrid.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/SubHierarchyFetcher.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/SubHierarchyFetcher.java
similarity index 96%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/SubHierarchyFetcher.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/SubHierarchyFetcher.java
index 33587fd562d68ef8471fe86b5c870783b8777bbd..de0849a5c278bf3723eb93409bacdd5524fd74d1 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/SubHierarchyFetcher.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/SubHierarchyFetcher.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 import java.util.List;
 
diff --git a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/TwoDimensionalGrid.java b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/TwoDimensionalGrid.java
similarity index 98%
rename from Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/TwoDimensionalGrid.java
rename to jTET/src/main/java/ca/mcscert/jtet/tablularexpression/TwoDimensionalGrid.java
index 719a73bd7ed05404589b526d4d32eeeed19d6ddf..db3ca2d1c4835a9827fd3b14662e031bb37e95c6 100644
--- a/Matlab2SMT/src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/TwoDimensionalGrid.java
+++ b/jTET/src/main/java/ca/mcscert/jtet/tablularexpression/TwoDimensionalGrid.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression;
+package ca.mcscert.jtet.tablularexpression;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3GeneratorTest.java b/jTET/src/test/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3GeneratorTest.java
similarity index 90%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3GeneratorTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3GeneratorTest.java
index 8b70a8bf83ce68e564a45318ce685a11c1668317..8ea977774e15f07d6de2a7f523f259d5b1c9e7d8 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3GeneratorTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/cvc3generator/HierarchicalGridCVC3GeneratorTest.java
@@ -26,12 +26,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator;
+package ca.mcscert.jtet.cvc3generator;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalCell;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerWalkerGenerator;
+import ca.mcscert.jtet.parsers.VariableParser;
+import ca.mcscert.jtet.tablularexpression.HierarchicalCell;
+import ca.mcscert.jtet.tablularexpression.HierarchicalGrid;
+import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerWalkerGenerator;
 import java.util.List;
 import static org.junit.Assert.*;
 import org.junit.Test;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3GeneratorTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/CVC3GeneratorTest.java
similarity index 94%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3GeneratorTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/CVC3GeneratorTest.java
index 258be8f67e0be902e067b317458024053e6592ff..0bb77de328c1b5540bee18235956edd351b083bf 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/CVC3GeneratorTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/CVC3GeneratorTest.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/EnumerationVariableTypeGenerationTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/EnumerationVariableTypeGenerationTest.java
similarity index 94%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/EnumerationVariableTypeGenerationTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/EnumerationVariableTypeGenerationTest.java
index e0bc948251f73fdf119eedd323d8d7fb8e5380bf..05f5f5e136b4b1f8e7ed11ff9c29fbc80f145379 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/EnumerationVariableTypeGenerationTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/EnumerationVariableTypeGenerationTest.java
@@ -26,10 +26,10 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
+import ca.mcscert.jtet.parsers.PVSSimpleParser;
+import ca.mcscert.jtet.parsers.VariableParser;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,7 +39,6 @@ import org.junit.runners.Parameterized.Parameters;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map;
 
 import static org.junit.Assert.*;
 
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/FixedPointVariableTypeTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/FixedPointVariableTypeTest.java
similarity index 96%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/FixedPointVariableTypeTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/FixedPointVariableTypeTest.java
index 63eebe8a3c8993811463ff8365c9fb4994f4495d..798099011956ce4af712023601e517fa4cc0fba5 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/FixedPointVariableTypeTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/FixedPointVariableTypeTest.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/GenericOperationGeneratorTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/GenericOperationGeneratorTest.java
similarity index 95%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/GenericOperationGeneratorTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/GenericOperationGeneratorTest.java
index b45a91d836bae6f7d45eb457113f227e9f0d95c8..facd05c04e1deb45de685e7fcaf2100d2e132e5a 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/GenericOperationGeneratorTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/GenericOperationGeneratorTest.java
@@ -26,10 +26,10 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
+import ca.mcscert.jtet.parsers.PVSSimpleParser;
+import ca.mcscert.jtet.parsers.VariableParser;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -38,7 +38,6 @@ import org.junit.runners.Parameterized.Parameters;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map;
 
 import static org.junit.Assert.*;
 
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/GenericVariableDeclarationGeneratorTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/GenericVariableDeclarationGeneratorTest.java
similarity index 96%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/GenericVariableDeclarationGeneratorTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/GenericVariableDeclarationGeneratorTest.java
index b51078402fa05124ab5c62a2d11e5315fdfaee66..b6716e3fcfd80f2ee807633d8cd46a4874858ce2 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/GenericVariableDeclarationGeneratorTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/GenericVariableDeclarationGeneratorTest.java
@@ -26,10 +26,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
+import ca.mcscert.jtet.parsers.VariableParser;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/MatlabExpressionBinaryOperationTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/MatlabExpressionBinaryOperationTest.java
similarity index 98%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/MatlabExpressionBinaryOperationTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/MatlabExpressionBinaryOperationTest.java
index b8b80cd149443562335169ff5bff0738845e8a8f..2cda25edb2402d7f0c1b1958a1a3959704f4f39d 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/MatlabExpressionBinaryOperationTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/MatlabExpressionBinaryOperationTest.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/VariableTest.java
similarity index 97%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/VariableTest.java
index 06f7cda71b0e1d0a21530a925448b9f6833c3c97..a4511d35344557c7a7538a81bf01001d19623d86 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/VariableTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/VariableTest.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression;
+package ca.mcscert.jtet.expression;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/BooleanVariableTypeTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/test/BooleanVariableTypeTest.java
similarity index 85%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/BooleanVariableTypeTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/test/BooleanVariableTypeTest.java
index ee8ed92639f997b674fddfa359db9b9892055e52..500b1482549373f2cabffbe682083a9b454a0091 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/BooleanVariableTypeTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/test/BooleanVariableTypeTest.java
@@ -2,12 +2,12 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression.test;
+package ca.mcscert.jtet.expression.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.SMTLIBGenerator;
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.SMTLIBGenerator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/MatlabLiteralTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/test/MatlabLiteralTest.java
similarity index 79%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/MatlabLiteralTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/test/MatlabLiteralTest.java
index 71cdbc07f60539e4279c88aba1aaaf3cd8e25328..490127ea125dedb7b9d3e92e5d5b1b76b194cf8a 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/MatlabLiteralTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/test/MatlabLiteralTest.java
@@ -2,14 +2,14 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression.test;
+package ca.mcscert.jtet.expression.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CheckerGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.FixedPointVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Literal;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.expression.CheckerGenerator;
+import ca.mcscert.jtet.expression.FixedPointVariableType;
+import ca.mcscert.jtet.expression.Literal;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.VariableType;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/RealVariableTypeTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/test/RealVariableTypeTest.java
similarity index 85%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/RealVariableTypeTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/test/RealVariableTypeTest.java
index 4d34119e3b6621d40f2ca1a3eb6e2171b30e1505..fcaead09e6ae413bb84eadd888372b924ea87958 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/RealVariableTypeTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/test/RealVariableTypeTest.java
@@ -2,12 +2,12 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression.test;
+package ca.mcscert.jtet.expression.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.SMTLIBGenerator;
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.SMTLIBGenerator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/VariableCollectionTest.java b/jTET/src/test/java/ca/mcscert/jtet/expression/test/VariableCollectionTest.java
similarity index 92%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/VariableCollectionTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/expression/test/VariableCollectionTest.java
index 84f433e91ca7575ddb2a817c454647d37734af5e..d3610731bd3bc38a2c67eb32148c244a1be54479 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/expression/test/VariableCollectionTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/expression/test/VariableCollectionTest.java
@@ -26,13 +26,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.expression.test;
+package ca.mcscert.jtet.expression.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.EnumerationVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableType;
+import ca.mcscert.jtet.expression.EnumerationVariableType;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.expression.VariableType;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/MatlabParserTest.java b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/MatlabParserTest.java
similarity index 87%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/MatlabParserTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/parsers/test/MatlabParserTest.java
index 2181d147e02713c9ca18f88c7a4a642a3643a7e1..89409a434c8c22e72c64e170564550012202dc97 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/MatlabParserTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/MatlabParserTest.java
@@ -2,20 +2,20 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers.test;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CheckerGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Expression;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Literal;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.SMTLIBGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableType;
+package ca.mcscert.jtet.parsers.test;
+
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.expression.CheckerGenerator;
+import ca.mcscert.jtet.expression.Expression;
+import ca.mcscert.jtet.expression.Literal;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.MatlabParser;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.SMTLIBGenerator;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.parsers.VariableParser;
+import ca.mcscert.jtet.expression.VariableType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/PVSSimpleParserTest.java b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/PVSSimpleParserTest.java
similarity index 87%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/PVSSimpleParserTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/parsers/test/PVSSimpleParserTest.java
index b9ddd5139d67da8a12e5e8307e4f313fafcbdc5b..d7e7a2cf50c48f46271705f4eeeb0c9ea7d93058 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/PVSSimpleParserTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/PVSSimpleParserTest.java
@@ -2,20 +2,20 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers.test;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CheckerGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Expression;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Literal;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.SMTLIBGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
+package ca.mcscert.jtet.parsers.test;
+
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.expression.CheckerGenerator;
+import ca.mcscert.jtet.expression.Expression;
+import ca.mcscert.jtet.expression.Literal;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.SMTLIBGenerator;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.expression.VariableType;
+import ca.mcscert.jtet.parsers.PVSSimpleParser;
+import ca.mcscert.jtet.parsers.VariableParser;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/ParserOperatorParseTest.java b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/ParserOperatorParseTest.java
similarity index 89%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/ParserOperatorParseTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/parsers/test/ParserOperatorParseTest.java
index a96421c826552dca88ee8d613ac39229fca74fb8..05e26a563588a8262ae6d9cebd8add494da23365 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/ParserOperatorParseTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/ParserOperatorParseTest.java
@@ -26,15 +26,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers.test;
+package ca.mcscert.jtet.parsers.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BinaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionBinaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.ExpressionUnaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.UnaryOperation;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.MatlabParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.PVSSimpleParser;
+import ca.mcscert.jtet.expression.BinaryOperation;
+import ca.mcscert.jtet.expression.ExpressionBinaryOperation;
+import ca.mcscert.jtet.expression.ExpressionUnaryOperation;
+import ca.mcscert.jtet.expression.UnaryOperation;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.parsers.MatlabParser;
+import ca.mcscert.jtet.parsers.PVSSimpleParser;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -45,7 +45,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/VariableParserTest.java b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/VariableParserTest.java
similarity index 90%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/VariableParserTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/parsers/test/VariableParserTest.java
index b60961b4ebfcf9b45de48c375107e58498fd6dc5..adf529bb010a2146e1f35f175dcbc23bc0f3efef 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/parsers/test/VariableParserTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/parsers/test/VariableParserTest.java
@@ -2,18 +2,18 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.parsers.test;
-
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.BooleanVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CVC3Generator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.CheckerGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.EnumerationVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.FixedPointVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.RealVariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.Variable;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableCollection;
-import ca.mcmaster.cas.tabularexpressiontoolbox.expression.VariableType;
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
+package ca.mcscert.jtet.parsers.test;
+
+import ca.mcscert.jtet.expression.BooleanVariableType;
+import ca.mcscert.jtet.expression.CVC3Generator;
+import ca.mcscert.jtet.expression.CheckerGenerator;
+import ca.mcscert.jtet.expression.EnumerationVariableType;
+import ca.mcscert.jtet.expression.FixedPointVariableType;
+import ca.mcscert.jtet.expression.RealVariableType;
+import ca.mcscert.jtet.expression.Variable;
+import ca.mcscert.jtet.expression.VariableCollection;
+import ca.mcscert.jtet.expression.VariableType;
+import ca.mcscert.jtet.parsers.VariableParser;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerResultTest.java b/jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerResultTest.java
similarity index 97%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerResultTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerResultTest.java
index fca2cb991e7accef1e457afbab8fa79495726e37..da2c05be811184163ff67926235085bdc9a44c19 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerResultTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerResultTest.java
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker;
+package ca.mcscert.jtet.smtlibchecker;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerTest.java b/jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerTest.java
similarity index 94%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerTest.java
index 354410eaf5d56a445e6d4f54caee4c5fdbe5312c..f4ca4f00b459b664fdea7c72015fdc33cc907278 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/CheckerRunnerTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/CheckerRunnerTest.java
@@ -26,11 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker;
+package ca.mcscert.jtet.smtlibchecker;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalCell;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid;
+import ca.mcscert.jtet.parsers.VariableParser;
+import ca.mcscert.jtet.tablularexpression.HierarchicalCell;
+import ca.mcscert.jtet.tablularexpression.HierarchicalGrid;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/HierarchicalGridSMTLIBGeneratorTest.java b/jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGeneratorTest.java
similarity index 92%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/HierarchicalGridSMTLIBGeneratorTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGeneratorTest.java
index 20c537931d70ae6a57c985bcddeed4b21ca8ec5d..fccf908089ad25a55d366d8193a71a0a1467ef63 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/smtlibchecker/HierarchicalGridSMTLIBGeneratorTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/smtlibchecker/HierarchicalGridSMTLIBGeneratorTest.java
@@ -26,12 +26,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.smtlibchecker;
+package ca.mcscert.jtet.smtlibchecker;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.parsers.VariableParser;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerWalkerGenerator;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalCell;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchicalGrid;
+import ca.mcscert.jtet.parsers.VariableParser;
+import ca.mcscert.jtet.tablularexpression.HierarchcialGridCheckerWalkerGenerator;
+import ca.mcscert.jtet.tablularexpression.HierarchicalCell;
+import ca.mcscert.jtet.tablularexpression.HierarchicalGrid;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/test/TwoDimensionalGridResizeTest.java b/jTET/src/test/java/ca/mcscert/jtet/tablularexpression/test/TwoDimensionalGridResizeTest.java
similarity index 96%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/test/TwoDimensionalGridResizeTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/tablularexpression/test/TwoDimensionalGridResizeTest.java
index 96b867527b2a3e5bd9ee7f4fa51d31061be17819..db5bc4ba748ecf768208ee4504266a67c22fff9b 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/test/TwoDimensionalGridResizeTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/tablularexpression/test/TwoDimensionalGridResizeTest.java
@@ -26,9 +26,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.test;
+package ca.mcscert.jtet.tablularexpression.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.TwoDimensionalGrid;
+import ca.mcscert.jtet.tablularexpression.TwoDimensionalGrid;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/test/TwoDimensionalGridTest.java b/jTET/src/test/java/ca/mcscert/jtet/tablularexpression/test/TwoDimensionalGridTest.java
similarity index 92%
rename from Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/test/TwoDimensionalGridTest.java
rename to jTET/src/test/java/ca/mcscert/jtet/tablularexpression/test/TwoDimensionalGridTest.java
index 194ca7ead7ae3cb76270a1d4a438958010f6e95a..f8e9f005419480c5b55489b7ee4a85a4e2e5928e 100644
--- a/Matlab2SMT/src/test/java/ca/mcmaster/cas/tabularexpressiontoolbox/tablularexpression/test/TwoDimensionalGridTest.java
+++ b/jTET/src/test/java/ca/mcscert/jtet/tablularexpression/test/TwoDimensionalGridTest.java
@@ -26,11 +26,10 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.test;
+package ca.mcscert.jtet.tablularexpression.test;
 
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.Cell;
-import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.TwoDimensionalGrid;
-import org.junit.Assert;
+import ca.mcscert.jtet.tablularexpression.Cell;
+import ca.mcscert.jtet.tablularexpression.TwoDimensionalGrid;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;