Restructure project for use with maven

64 files changed, 0 insertions, 2927 deletions

diff --git a/main/core/CommandLineArgumentContainer.java b/main/core/CommandLineArgumentContainer.java
deleted file mode 100644
index 2bcb160..0000000
--- a/main/core/CommandLineArgumentContainer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.jantuomi.interpreter.main.core;
-
-import org.kohsuke.args4j.Option;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-/**
- * Created by jan on 10.6.2016.
- */
-
-public class CommandLineArgumentContainer {
-
-    private CommandLineArgumentContainer() {}
-
-    private static final CommandLineArgumentContainer instance = new CommandLineArgumentContainer();
-    private File srcFile;
-
-
-    @Option(name="-f", usage="Execute script in file FILE.")
-    public void setFile(File file) {
-        this.srcFile = file;
-    }
-
-    @Option(name="-i", usage="Run in interactive mode.")
-    public boolean interactiveModeActive = false;
-
-
-    @Option(name="-d", usage="Display verbose debug output.")
-    public boolean debugModeActive = false;
-
-    public static CommandLineArgumentContainer getInstance() {
-        return instance;
-    }
-
-    public boolean isInteractive() {
-        return interactiveModeActive;
-    }
-
-    public boolean isDebugModeActive() {
-        return debugModeActive;
-    }
-
-    public String getSourceFileContents() {
-        if (srcFile == null) {
-            return null;
-        }
-
-        BufferedReader br;
-        String contents = null;
-        try {
-            br = new BufferedReader(new FileReader(srcFile));
-            StringBuilder sb = new StringBuilder();
-            String line = br.readLine();
-
-            while (line != null) {
-                sb.append(line);
-                sb.append(System.lineSeparator());
-                line = br.readLine();
-            }
-            contents = sb.toString();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        } finally {
-            // Add a newline at the end for comment rows to terminate nicely
-            return contents + "\n";
-        }
-    }
-}
diff --git a/main/core/parser/ASTGenerator.java b/main/core/parser/ASTGenerator.java
deleted file mode 100644
index 3d19a8c..0000000
--- a/main/core/parser/ASTGenerator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class ASTGenerator {
-    private static final ASTGenerator instance = new ASTGenerator();
-
-    private ASTGenerator() {}
-
-    public static ASTGenerator getInstance() {
-        return instance;
-    }
-
-    public List<ASTNode> generate(List<Token> trees) throws InterpreterException {
-        List<ASTNode> list = new ArrayList<>();
-
-        for (Token root : trees) {
-            list.add(root.generateNode());
-        }
-
-        return list;
-    }
-
-    public void printTree(ASTNode root) {
-        System.out.println("### AST Tree begin ###");
-        root.print(0);
-        System.out.println("### AST Tree end ###");
-    }
-
-    public void printAllTrees(List<ASTNode> trees) {
-        for (ASTNode tree : trees) {
-            printTree(tree);
-        }
-    }
-}
diff --git a/main/core/parser/Parser.java b/main/core/parser/Parser.java
deleted file mode 100644
index f6e1208..0000000
--- a/main/core/parser/Parser.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-/**
- * Created by jan on 11.6.2016.
- */
-public class Parser {
-    private static final Parser instance = new Parser();
-
-    private List<Token> tokens;
-    private List<ASTNode> statementSequence;
-
-    public static Parser getInstance() {
-        return instance;
-    }
-
-    private Parser() {
-
-    }
-
-    private Stack<Token> stack;
-
-    public List<Token> parse(List<Token> tokens) throws InterpreterException {
-        this.tokens = tokens;
-        this.stack = new Stack<>();
-
-        List<Token> args;
-        List<Token> output = new ArrayList<>();
-        for (Token t : tokens) {
-            if (t.getTokenType() == Token.Type.NewlineToken) {
-//                if (stack.size() > 0) {
-//                    output.add(stack.pop());
-//                }
-                continue;
-            }
-
-            args = new ArrayList<>();
-            ArgumentInfo argumentInfo = t.getArgumentInfo();
-
-            /*
-            This branch is executed if the token has a variable list of arguments
-             */
-            if (argumentInfo.getVarargs()) {
-                while (true) {
-                    if (stack.size() > 0) {
-                        Token arg = stack.pop();
-                        if (arg.getTokenType() != argumentInfo.getTerminator()) {
-                            args.add(arg);
-                        }
-                        else {
-                            args.add(arg);
-                            break;
-                        }
-                    }
-                }
-            }
-            /*
-            If the token has an optional argument type (it is only an argument if
-            it is of certain type)
-             */
-            else if (argumentInfo.getOptionalArgument() != null) {
-                if (stack.size() > 0 && stack.peek().getTokenType() == argumentInfo.getOptionalArgument()) {
-                    args.add(stack.pop());
-                }
-            }
-            /* Normal cases with a fixed list of arguments */
-            else {
-                for (int i = 0; i < argumentInfo.getCount(); i++) {
-                    if (stack.size() > 0) {
-                        args.add(stack.pop());
-                    } else {
-                        ExceptionManager.raise(InterpreterException.ExceptionType.ArgumentError, t.getLine(),
-                                t.toString(), Integer.toString(argumentInfo.getCount()));
-                        return null;
-                    }
-                }
-            }
-
-            Token result = t.setArguments(args);
-            stack.push(result);
-        }
-        while (stack.size() > 0) {
-            output.add(stack.pop());
-        }
-        return output;
-    }
-
-    public void printTree(Token e) {
-        System.out.println("### Token Tree begin ###");
-        e.print(0);
-        System.out.println("### Token Tree end ###");
-    }
-
-    public void printAllTrees(List<Token> trees) {
-        for (Token tree : trees) {
-            printTree(tree);
-        }
-    }
-}
diff --git a/main/core/parser/ast/ASTNode.java b/main/core/parser/ast/ASTNode.java
deleted file mode 100644
index 311314f..0000000
--- a/main/core/parser/ast/ASTNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.List;
-
-/**
- * Created by jan on 11.6.2016.
- */
-abstract public class ASTNode {
-
-    public abstract DataContainer evaluate() throws InterpreterException;
-
-    protected Token source;
-
-    public ASTNode(Token token) {
-        this.source = token;
-    }
-
-    public Token.Type tokenType() {
-        return source.getTokenType();
-    }
-
-    abstract List<ASTNode> getChildren();
-
-    public void print(int indent) {
-        for (int i = 0; i < indent; i++) {
-            System.out.print("\t");
-        }
-
-        System.out.println(source.toString());
-        for (ASTNode node : getChildren()) {
-            if (node != null) {
-                node.print(indent + 1);
-            }
-        }
-    }
-}
diff --git a/main/core/parser/ast/AdditionNode.java b/main/core/parser/ast/AdditionNode.java
deleted file mode 100644
index 00db230..0000000
--- a/main/core/parser/ast/AdditionNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class AdditionNode extends BinaryOperatorNode {
-
-    public AdditionNode(Token token, ASTNode lhs, ASTNode rhs) {
-        super(token, lhs, rhs);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer operand1 = lhs.evaluate();
-        DataContainer operand2 = rhs.evaluate();
-
-        DataContainer result = operand1.add(operand2);
-        if (result != null) {
-            return result;
-        } else {
-            ExceptionManager.raise(InterpreterException.ExceptionType.TypeError, source.getLine(),
-                    operand1.getType().toString(), operand2.getType().toString());
-            return null;
-        }
-
-    }
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(lhs, rhs);
-    }
-}
diff --git a/main/core/parser/ast/AssignmentNode.java b/main/core/parser/ast/AssignmentNode.java
deleted file mode 100644
index f2e7b8d..0000000
--- a/main/core/parser/ast/AssignmentNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.runtime.State;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class AssignmentNode extends BinaryOperatorNode {
-    public AssignmentNode(Token token, SymbolNode lhs, ASTNode rhs) {
-        super(token, lhs, rhs);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        SymbolNode symbol = (SymbolNode) lhs;
-        DataContainer rValue = rhs.evaluate();
-        State.getInstance().setSymbolValueToScope(
-                symbol.getName(),
-                rValue
-        );
-        return rValue;
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(lhs, rhs);
-    }
-}
diff --git a/main/core/parser/ast/BinaryOperatorNode.java b/main/core/parser/ast/BinaryOperatorNode.java
deleted file mode 100644
index 9ec21a4..0000000
--- a/main/core/parser/ast/BinaryOperatorNode.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-/**
- * Created by jan on 16.6.2016.
- */
-abstract public class BinaryOperatorNode extends ASTNode {
-    protected ASTNode lhs;
-    protected ASTNode rhs;
-
-    public BinaryOperatorNode(Token token, ASTNode lhs, ASTNode rhs) {
-        super(token);
-        this.lhs = lhs;
-        this.rhs = rhs;
-    }
-}
diff --git a/main/core/parser/ast/BlockBodyNode.java b/main/core/parser/ast/BlockBodyNode.java
deleted file mode 100644
index 671f847..0000000
--- a/main/core/parser/ast/BlockBodyNode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.VoidDataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public class BlockBodyNode extends VarargOperatorNode {
-    public BlockBodyNode(Token token) {
-        super(token);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer returnValue = new VoidDataContainer();
-
-        for (ASTNode node : args) {
-            returnValue = node.evaluate();
-        }
-
-        return returnValue;
-    }
-}
diff --git a/main/core/parser/ast/BooleanLiteralNode.java b/main/core/parser/ast/BooleanLiteralNode.java
deleted file mode 100644
index 0d9c505..0000000
--- a/main/core/parser/ast/BooleanLiteralNode.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class BooleanLiteralNode extends ASTNode {
-    private BooleanDataContainer value;
-
-    public BooleanLiteralNode(Token token) {
-        super(token);
-        value = new BooleanDataContainer(Boolean.parseBoolean(token.getText()));
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        return value;
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/parser/ast/BranchNode.java b/main/core/parser/ast/BranchNode.java
deleted file mode 100644
index d6fb4cf..0000000
--- a/main/core/parser/ast/BranchNode.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public class BranchNode extends ASTNode {
-
-    private ASTNode expression;
-    private BlockBodyNode branch;
-
-    public BranchNode(Token token, ASTNode expression, BlockBodyNode branch) {
-        super(token);
-        this.expression = expression;
-        this.branch = branch;
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer ev = expression.evaluate();
-        boolean returnValue = false;
-        if (ev instanceof BooleanDataContainer) {
-            returnValue = ((BooleanDataContainer) ev).getData();
-            if (returnValue) {
-                branch.evaluate();
-            }
-        }
-        return new BooleanDataContainer(returnValue);
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(expression, branch);
-    }
-}
diff --git a/main/core/parser/ast/DivisionNode.java b/main/core/parser/ast/DivisionNode.java
deleted file mode 100644
index 5bebf7b..0000000
--- a/main/core/parser/ast/DivisionNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class DivisionNode extends BinaryOperatorNode {
-
-    public DivisionNode(Token token, ASTNode lhs, ASTNode rhs) {
-        super(token, lhs, rhs);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer operand1 = lhs.evaluate();
-        DataContainer operand2 = rhs.evaluate();
-
-        DataContainer result = operand1.divide(operand2);
-        if (result != null) {
-            return result;
-        } else {
-            ExceptionManager.raise(InterpreterException.ExceptionType.TypeError, source.getLine(),
-                    operand1.getType().toString(), operand2.getType().toString());
-            return null;
-        }
-
-    }
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(lhs, rhs);
-    }
-}
diff --git a/main/core/parser/ast/DoubleLiteralNode.java b/main/core/parser/ast/DoubleLiteralNode.java
deleted file mode 100644
index a90c4af..0000000
--- a/main/core/parser/ast/DoubleLiteralNode.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.DoubleDataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class DoubleLiteralNode extends ASTNode {
-    private DoubleDataContainer value;
-
-    public DoubleLiteralNode(Token token) {
-        super(token);
-        value = new DoubleDataContainer(Double.parseDouble(token.getText()));
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        return value;
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/parser/ast/EmptyNode.java b/main/core/parser/ast/EmptyNode.java
deleted file mode 100644
index 44bfcc9..0000000
--- a/main/core/parser/ast/EmptyNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.VoidDataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public class EmptyNode extends ASTNode {
-    public EmptyNode(Token source) {
-        super(source);
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        return new VoidDataContainer();
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/parser/ast/FunctionDefineNode.java b/main/core/parser/ast/FunctionDefineNode.java
deleted file mode 100644
index 39a775a..0000000
--- a/main/core/parser/ast/FunctionDefineNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
-import com.jantuomi.interpreter.main.core.runtime.Function;
-import com.jantuomi.interpreter.main.core.runtime.State;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public class FunctionDefineNode extends VarargOperatorNode {
-
-    private String name;
-
-    public void setBody(ASTNode body) {
-        this.body = body;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    private ASTNode body;
-
-    public FunctionDefineNode(Token token) {
-        super(token);
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        List<String> argumentNames = new ArrayList<>();
-        for (ASTNode arg : args) {
-            SymbolNode argSym = (SymbolNode) arg;
-            argumentNames.add(argSym.getName());
-        }
-        Function function = new Function(argumentNames, (BlockBodyNode) body);
-        function.setName(name);
-        State.getInstance().addFunctionToScope(name, function);
-
-        return new StringDataContainer("function " + name);
-    }
-
-    @Override
-    public void print(int indent) {
-
-        for (int i = 0; i < indent; i++) {
-            System.out.print("\t");
-        }
-
-        System.out.println(String.format("Function %s", name));
-
-        for (int i = 0; i < indent + 1; i++) {
-            System.out.print("\t");
-        }
-
-        System.out.println(String.format("Arguments: "));
-
-        for (ASTNode node : args) {
-            node.print(indent + 2);
-        }
-
-        for (int i = 0; i < indent + 1; i++) {
-            System.out.print("\t");
-        }
-
-        System.out.println(String.format("Body statements: "));
-        body.print(indent + 2);
-    }
-}
diff --git a/main/core/parser/ast/IntegerLiteralNode.java b/main/core/parser/ast/IntegerLiteralNode.java
deleted file mode 100644
index 68b57d7..0000000
--- a/main/core/parser/ast/IntegerLiteralNode.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.IntegerDataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class IntegerLiteralNode extends ASTNode {
-    private IntegerDataContainer value;
-
-    public IntegerLiteralNode(Token token) {
-        super(token);
-        value = new IntegerDataContainer(Integer.parseInt(token.getText()));
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        return value;
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/parser/ast/MultiplicationNode.java b/main/core/parser/ast/MultiplicationNode.java
deleted file mode 100644
index 5d86cf3..0000000
--- a/main/core/parser/ast/MultiplicationNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class MultiplicationNode extends BinaryOperatorNode {
-
-    public MultiplicationNode(Token token, ASTNode lhs, ASTNode rhs) {
-        super(token, lhs, rhs);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer operand1 = lhs.evaluate();
-        DataContainer operand2 = rhs.evaluate();
-
-        DataContainer result = operand1.multiply(operand2);
-        if (result != null) {
-            return result;
-        } else {
-            ExceptionManager.raise(InterpreterException.ExceptionType.TypeError, source.getLine(),
-                    operand1.getType().toString(), operand2.getType().toString());
-            return null;
-        }
-
-    }
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(lhs, rhs);
-    }
-}
diff --git a/main/core/parser/ast/NegationNode.java b/main/core/parser/ast/NegationNode.java
deleted file mode 100644
index 1d381cb..0000000
--- a/main/core/parser/ast/NegationNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.IntegerDataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class NegationNode extends UnaryOperatorNode {
-    public NegationNode(Token token, ASTNode operand) {
-        super(token, operand);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer d = getOperand().evaluate();
-
-        if (d instanceof BooleanDataContainer) {
-            return new BooleanDataContainer(!((BooleanDataContainer) d).getData());
-        }
-        else if (d instanceof IntegerDataContainer) {
-            return new BooleanDataContainer(
-                    ((IntegerDataContainer) d).getData() != 0
-            );
-        }
-        ExceptionManager.raise(InterpreterException.ExceptionType.TypeError, source.getLine(), "not", d.toString());
-        return null;
-
-    }
-}
diff --git a/main/core/parser/ast/ParameterListNode.java b/main/core/parser/ast/ParameterListNode.java
deleted file mode 100644
index 50f919a..0000000
--- a/main/core/parser/ast/ParameterListNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by jan on 19.6.2016.
- */
-public class ParameterListNode extends ASTNode {
-
-    private List<ASTNode> parameters = new ArrayList<>();
-
-    public void addParameter(ASTNode param) {
-        parameters.add(param);
-    }
-
-    public List<ASTNode> getParameters() {
-        return parameters;
-    }
-
-    public ParameterListNode(Token token) {
-        super(token);
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        // TODO use State to evaluate function
-        return null;
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return parameters;
-    }
-}
diff --git a/main/core/parser/ast/StringLiteralNode.java b/main/core/parser/ast/StringLiteralNode.java
deleted file mode 100644
index 1ad5e2b..0000000
--- a/main/core/parser/ast/StringLiteralNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class StringLiteralNode extends ASTNode {
-    @Override
-    public DataContainer evaluate() {
-        return new StringDataContainer(source.getText());
-    }
-
-    public StringLiteralNode(Token source) {
-        super(source);
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/parser/ast/SubtractionNode.java b/main/core/parser/ast/SubtractionNode.java
deleted file mode 100644
index 6b05073..0000000
--- a/main/core/parser/ast/SubtractionNode.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class SubtractionNode extends BinaryOperatorNode {
-    public SubtractionNode(Token token, ASTNode lhs, ASTNode rhs) {
-        super(token, lhs, rhs);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        DataContainer operand1 = lhs.evaluate();
-        DataContainer operand2 = rhs.evaluate();
-
-        DataContainer result = operand1.subtract(operand2);
-        if (result != null) {
-            return result;
-        } else {
-            ExceptionManager.raise(InterpreterException.ExceptionType.TypeError, source.getLine(),
-                    operand1.getType().toString(), operand2.getType().toString());
-            return null;
-        }
-
-    }
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(lhs, rhs);
-    }
-}
diff --git a/main/core/parser/ast/SymbolNode.java b/main/core/parser/ast/SymbolNode.java
deleted file mode 100644
index 5a4346a..0000000
--- a/main/core/parser/ast/SymbolNode.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.runtime.State;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-import com.sun.deploy.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public class SymbolNode extends ASTNode {
-
-    public ParameterListNode getParameterListNode() {
-        return parameterListNode;
-    }
-
-    public void setParameterListNode(ParameterListNode parameterListNode) {
-        this.parameterListNode = parameterListNode;
-    }
-
-    private ParameterListNode parameterListNode;
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    private String name;
-
-    public SymbolNode(Token token) {
-        super(token);
-    }
-
-    @Override
-    public DataContainer evaluate() throws InterpreterException {
-        List<DataContainer> paramValues = new ArrayList<>();
-        if (parameterListNode != null) {
-            for (ASTNode param : parameterListNode.getChildren()) {
-                paramValues.add(param.evaluate());
-            }
-        }
-        DataContainer returnValue = State.getInstance().getSymbolValue(name, paramValues);
-        if (returnValue != null) {
-            return returnValue;
-        } else {
-            ExceptionManager.raise(InterpreterException.ExceptionType.UndeclaredSymbolError, source.getLine(), name,
-                    StringUtils.join(paramValues.stream().map(dataContainer -> dataContainer.toString()).collect(Collectors.toList()), ","));
-            return null;
-        }
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        if (parameterListNode == null) {
-            return Arrays.asList();
-        } else {
-            return Arrays.asList(parameterListNode);
-        }
-    }
-}
diff --git a/main/core/parser/ast/UnaryOperatorNode.java b/main/core/parser/ast/UnaryOperatorNode.java
deleted file mode 100644
index 283f07d..0000000
--- a/main/core/parser/ast/UnaryOperatorNode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-abstract public class UnaryOperatorNode extends ASTNode {
-    public UnaryOperatorNode(Token token, ASTNode operand) {
-        super(token);
-        this.operand = operand;
-    }
-
-    public ASTNode getOperand() {
-        return operand;
-    }
-
-    public void setOperand(ASTNode operand) {
-        this.operand = operand;
-    }
-
-    private ASTNode operand;
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList(operand);
-    }
-}
diff --git a/main/core/parser/ast/VarargOperatorNode.java b/main/core/parser/ast/VarargOperatorNode.java
deleted file mode 100644
index 96a7320..0000000
--- a/main/core/parser/ast/VarargOperatorNode.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.List;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public abstract class VarargOperatorNode extends ASTNode {
-
-    protected List<ASTNode> args;
-
-    public VarargOperatorNode(Token token) {
-        super(token);
-    }
-
-    @Override
-    public List<ASTNode> getChildren() {
-        return args;
-    }
-
-    public void setArgs(List<ASTNode> args) {
-        this.args = args;
-    }
-}
diff --git a/main/core/parser/ast/VariableDeclareNode.java b/main/core/parser/ast/VariableDeclareNode.java
deleted file mode 100644
index 185edda..0000000
--- a/main/core/parser/ast/VariableDeclareNode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.ast;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
-import com.jantuomi.interpreter.main.core.runtime.State;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 20.6.2016.
- */
-public class VariableDeclareNode extends ASTNode {
-    private SymbolNode variable;
-
-    public VariableDeclareNode(Token source, SymbolNode variable) {
-        super(source);
-        this.variable = variable;
-    }
-
-    @Override
-    public DataContainer evaluate() {
-        State.getInstance().addSymbolToScope(variable.getName());
-        return new StringDataContainer(variable.getName());
-    }
-
-    @Override
-    List<ASTNode> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/parser/datatype/BooleanDataContainer.java b/main/core/parser/datatype/BooleanDataContainer.java
deleted file mode 100644
index e21ed96..0000000
--- a/main/core/parser/datatype/BooleanDataContainer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.datatype;
-
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class BooleanDataContainer extends DataContainer<Boolean> {
-
-
-    public BooleanDataContainer(boolean value) {
-        setData(value);
-    }
-
-    @Override
-    public Type getType() {
-        return Type.Boolean;
-    }
-
-    @Override
-    public String toString() {
-        return Boolean.toString(getData());
-    }
-
-    @Override
-    public DataContainer<Boolean> add(DataContainer<Boolean> other) throws InterpreterException {
-        return null;
-    }
-
-    @Override
-    public DataContainer<Boolean> subtract(DataContainer<Boolean> other) throws InterpreterException {
-        return null;
-    }
-
-    @Override
-    public DataContainer<Boolean> multiply(DataContainer<Boolean> other) throws InterpreterException {
-        return null;
-    }
-
-    @Override
-    public DataContainer<Boolean> divide(DataContainer<Boolean> other) throws InterpreterException {
-        return null;
-    }
-}
diff --git a/main/core/parser/datatype/DataContainer.java b/main/core/parser/datatype/DataContainer.java
deleted file mode 100644
index 5f46640..0000000
--- a/main/core/parser/datatype/DataContainer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.datatype;
-
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 11.6.2016.
- */
-abstract public class DataContainer<T> {
-
-    public enum Type {
-        Integer,
-        Double,
-        String,
-        Boolean,
-        Void
-    }
-
-    abstract public Type getType();
-
-    private T data;
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    @Override
-    abstract public String toString();
-
-    abstract public DataContainer<T> add(DataContainer<T> other) throws InterpreterException;
-    public abstract DataContainer<T> subtract(DataContainer<T> other) throws InterpreterException;
-    public abstract DataContainer<T> multiply(DataContainer<T> other) throws InterpreterException;
-    public abstract DataContainer<T> divide(DataContainer<T> other) throws InterpreterException;
-}
diff --git a/main/core/parser/datatype/DoubleDataContainer.java b/main/core/parser/datatype/DoubleDataContainer.java
deleted file mode 100644
index 9564ff9..0000000
--- a/main/core/parser/datatype/DoubleDataContainer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.datatype;
-
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 22.6.2016.
- */
-public class DoubleDataContainer extends DataContainer<Double> {
-    public DoubleDataContainer(double value) {
-        setData(value);
-    }
-
-    @Override
-    public Type getType() {
-        return Type.Double;
-    }
-
-    @Override
-    public String toString() {
-        return getData().toString();
-    }
-
-    @Override
-    public DataContainer add(DataContainer other) throws InterpreterException {
-        switch (other.getType()) {
-            case Double:
-                return new DoubleDataContainer(
-                        getData() + ((DoubleDataContainer) other).getData()
-                );
-            case Integer:
-                return new DoubleDataContainer(
-                        getData() + ((IntegerDataContainer) other).getData()
-                );
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public DataContainer subtract(DataContainer other) throws InterpreterException {
-        switch (other.getType()) {
-            case Double:
-                return new DoubleDataContainer(
-                        getData() - ((DoubleDataContainer) other).getData()
-                );
-            case Integer:
-                return new DoubleDataContainer(
-                        getData() - ((IntegerDataContainer) other).getData()
-                );
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public DataContainer multiply(DataContainer other) throws InterpreterException {
-        switch (other.getType()) {
-            case Double:
-                return new DoubleDataContainer(
-                        getData() * ((DoubleDataContainer) other).getData()
-                );
-            case Integer:
-                return new DoubleDataContainer(
-                        getData() * ((IntegerDataContainer) other).getData()
-                );
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public DataContainer divide(DataContainer other) throws InterpreterException {
-        switch (other.getType()) {
-            case Double:
-                return new DoubleDataContainer(
-                        getData() / ((DoubleDataContainer) other).getData()
-                );
-            case Integer:
-                return new DoubleDataContainer(
-                        getData() / ((IntegerDataContainer) other).getData()
-                );
-            default:
-                return null;
-        }
-    }
-}
diff --git a/main/core/parser/datatype/IntegerDataContainer.java b/main/core/parser/datatype/IntegerDataContainer.java
deleted file mode 100644
index 4f71e2b..0000000
--- a/main/core/parser/datatype/IntegerDataContainer.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.datatype;
-
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class IntegerDataContainer extends DataContainer<Integer> {
-
-    public IntegerDataContainer(int value) {
-        setData(value);
-    }
-
-    @Override
-    public Type getType() {
-        return Type.Integer;
-    }
-
-    @Override
-    public String toString() {
-        return Integer.toString(getData());
-    }
-
-    @Override
-    public DataContainer add(DataContainer other) {
-        switch (other.getType()) {
-            case Integer:
-                return new IntegerDataContainer(
-                        this.getData() + ((IntegerDataContainer) other).getData()
-                );
-            case Double:
-                return new DoubleDataContainer(
-                        (double) getData() + ((DoubleDataContainer) other).getData()
-                );
-            default:
-                return null;
-
-        }
-    }
-
-    @Override
-    public DataContainer subtract(DataContainer other) {
-        switch (other.getType()) {
-            case Integer:
-                return new IntegerDataContainer(
-                        this.getData() - ((IntegerDataContainer) other).getData()
-                );
-            case Double:
-                return new DoubleDataContainer(
-                        (double) getData() - ((DoubleDataContainer) other).getData()
-                );
-            default:
-                return null;
-
-        }
-    }
-
-    @Override
-    public DataContainer multiply(DataContainer other) throws InterpreterException {
-        switch (other.getType()) {
-            case Integer:
-                return new IntegerDataContainer(
-                        this.getData() * ((IntegerDataContainer) other).getData()
-                );
-            case Double:
-                return new DoubleDataContainer(
-                        (double) getData() * ((DoubleDataContainer) other).getData()
-                );
-            default:
-                return null;
-
-        }
-    }
-
-    @Override
-    public DataContainer divide(DataContainer other) throws InterpreterException {
-        switch (other.getType()) {
-            case Integer:
-                return new IntegerDataContainer(
-                        this.getData() / ((IntegerDataContainer) other).getData()
-                );
-            case Double:
-                return new DoubleDataContainer(
-                        (double) getData() / ((DoubleDataContainer) other).getData()
-                );
-            default:
-                return null;
-
-        }
-    }
-}
diff --git a/main/core/parser/datatype/StringDataContainer.java b/main/core/parser/datatype/StringDataContainer.java
deleted file mode 100644
index 68f41d9..0000000
--- a/main/core/parser/datatype/StringDataContainer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.datatype;
-
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class StringDataContainer extends DataContainer<String> {
-
-
-    public StringDataContainer(String text) {
-        setData(text);
-    }
-
-    @Override
-    public Type getType() {
-        return Type.String;
-    }
-
-    @Override
-    public String toString() {
-        return getData();
-    }
-
-    @Override
-    public DataContainer<String> add(DataContainer<String> other) {
-        return new StringDataContainer(
-                getData() + other.getData()
-        );
-    }
-
-    @Override
-    public DataContainer<String> subtract(DataContainer<String> other) throws InterpreterException {
-        return null;
-    }
-
-    @Override
-    public DataContainer<String> multiply(DataContainer<String> other) throws InterpreterException {
-        return null;
-    }
-
-    @Override
-    public DataContainer<String> divide(DataContainer<String> other) throws InterpreterException {
-        return null;
-    }
-}
diff --git a/main/core/parser/datatype/VoidDataContainer.java b/main/core/parser/datatype/VoidDataContainer.java
deleted file mode 100644
index 098de8d..0000000
--- a/main/core/parser/datatype/VoidDataContainer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.jantuomi.interpreter.main.core.parser.datatype;
-
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 17.6.2016.
- */
-public class VoidDataContainer extends DataContainer<Integer> {
-
-    @Override
-    public Type getType() {
-        return Type.Void;
-    }
-
-    @Override
-    public String toString() {
-        return "";
-    }
-
-    @Override
-    public DataContainer<Integer> add(DataContainer<Integer> other) {
-        return null;
-    }
-
-    @Override
-    public DataContainer<Integer> subtract(DataContainer<Integer> other) {
-        return null;
-    }
-
-    @Override
-    public DataContainer<Integer> multiply(DataContainer<Integer> other) throws InterpreterException {
-        return null;
-    }
-
-    @Override
-    public DataContainer<Integer> divide(DataContainer<Integer> other) throws InterpreterException {
-        return null;
-    }
-}
diff --git a/main/core/runtime/Function.java b/main/core/runtime/Function.java
deleted file mode 100644
index 6989a68..0000000
--- a/main/core/runtime/Function.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime;
-
-import com.jantuomi.interpreter.main.core.parser.ast.BlockBodyNode;
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.List;
-
-/**
- * Created by jan on 20.6.2016.
- */
-public class Function {
-
-    private List<String> argumentNames;
-
-    private BlockBodyNode body;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    private String name;
-
-    public Function(List<String> argumentNames, BlockBodyNode body) {
-        this.argumentNames = argumentNames;
-        this.body = body;
-    }
-
-    public DataContainer evaluate(List<DataContainer> params) throws InterpreterException {
-        State.getInstance().createScope();
-
-        if (params.size() != argumentNames.size()) {
-            return null;
-        }
-
-        for (int i = 0; i < argumentNames.size(); i++) {
-            State.getInstance().addSymbolToScope(argumentNames.get(i));
-            State.getInstance().setSymbolValueToScope(argumentNames.get(i), params.get(i));
-        }
-
-        DataContainer returnValue = body.evaluate();
-
-        State.getInstance().popScope();
-
-        return returnValue;
-    }
-
-}
diff --git a/main/core/runtime/Interpreter.java b/main/core/runtime/Interpreter.java
deleted file mode 100644
index 6877ac3..0000000
--- a/main/core/runtime/Interpreter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.List;
-
-/**
- * Created by jan on 14.6.2016.
- */
-public class Interpreter {
-    private static final Interpreter instance = new Interpreter();
-
-    public static Interpreter getInstance() {
-        return instance;
-    }
-
-    private Interpreter() {
-
-    }
-    public static String execute(List<ASTNode> sequence) throws InterpreterException {
-        String output = "";
-        for (ASTNode node : sequence) {
-            DataContainer data = node.evaluate();
-
-            if (data != null) {
-                output = data.toString();
-            } else {
-                break;
-            }
-        }
-        return output;
-    }
-}
diff --git a/main/core/runtime/Scope.java b/main/core/runtime/Scope.java
deleted file mode 100644
index 0bf8907..0000000
--- a/main/core/runtime/Scope.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by jan on 20.6.2016.
- */
-public class Scope {
-    private Scope parent = null;
-
-    private Map<String, DataContainer> variables = new HashMap<>();
-    private Map<String, Function> functions = new HashMap<>();
-
-    public void addVariable(String symbol) {
-        variables.put(symbol, null);
-    }
-
-    public void setVariableValue(String symbol, DataContainer value) {
-        variables.replace(symbol, value);
-    }
-
-    public DataContainer resolveSymbol(String symbol, List<DataContainer> params) throws InterpreterException {
-        if (functions.containsKey(symbol)) {
-            DataContainer r = functions.get(symbol).evaluate(params);
-            return r;
-        }
-        if (variables.containsKey(symbol)) {
-            return variables.get(symbol);
-        }
-        else if (parent != null) {
-            return parent.resolveSymbol(symbol, params);
-        }
-        else {
-            return null;
-        }
-    }
-
-    public void setParent(Scope parent) {
-        this.parent = parent;
-    }
-
-    public void addFunction(String symbol, Function func) {
-        functions.put(symbol, func);
-    }
-}
diff --git a/main/core/runtime/State.java b/main/core/runtime/State.java
deleted file mode 100644
index 8563a77..0000000
--- a/main/core/runtime/State.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.runtime.builtins.BuiltinManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Stack;
-
-/**
- * Created by jan on 11.6.2016.
- */
-public class State {
-    private static final State instance = new State();
-
-    public static State getInstance() {
-        return instance;
-    }
-
-    private Stack<Scope> scopes = new Stack<>();
-
-    private State() {
-        /* Push global scope onto the stack */
-        Scope globalScope = new Scope();
-
-        for (Function builtin : BuiltinManager.getInstance().getBuiltins()) {
-            globalScope.addFunction(builtin.getName(), builtin);
-        }
-
-        scopes.push(globalScope);
-
-    }
-
-    private DataContainer resolveSymbol(String symbol) throws InterpreterException {
-        return scopes.peek().resolveSymbol(symbol, Arrays.asList());
-    }
-
-    public DataContainer getSymbolValue(String symbol) throws InterpreterException {
-        DataContainer d = resolveSymbol(symbol);
-        return d;
-    }
-
-    public DataContainer getSymbolValue(String symbol, List<DataContainer> parameters) throws InterpreterException {
-        return scopes.peek().resolveSymbol(symbol, parameters);
-    }
-
-    public Scope createScope() {
-        Scope scope = new Scope();
-        if (scopes.size() > 0) {
-            scope.setParent(scopes.peek());
-        } else {
-            scope.setParent(null);
-        }
-        scopes.push(scope);
-        return scope;
-    }
-
-    public void addSymbolToScope(String symbol) {
-        scopes.peek().addVariable(symbol);
-    }
-
-    public void addFunctionToScope(String symbol, Function func) {
-        scopes.peek().addFunction(symbol, func);
-    }
-
-    public void setSymbolValueToScope(String symbol, DataContainer value) {
-        scopes.peek().setVariableValue(symbol, value);
-    }
-
-    public Scope popScope() {
-        return scopes.pop();
-    }
-}
diff --git a/main/core/runtime/builtins/AsIntBuiltinFunction.java b/main/core/runtime/builtins/AsIntBuiltinFunction.java
deleted file mode 100644
index 210e1e4..0000000
--- a/main/core/runtime/builtins/AsIntBuiltinFunction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime.builtins;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.IntegerDataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
-import com.jantuomi.interpreter.main.core.runtime.Function;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class AsIntBuiltinFunction extends Function {
-    public AsIntBuiltinFunction() {
-        super(
-                Arrays.asList("expression"),
-                null
-        );
-    }
-
-    @Override
-    public String getName() {
-        return "as_int";
-    }
-
-    @Override
-    public DataContainer evaluate(List<DataContainer> params) throws InterpreterException {
-        if (params.size() != 1) {
-            return null;
-        }
-        DataContainer param = params.get(0);
-        int i = 0;
-        if (param instanceof StringDataContainer) {
-            try {
-                i = Integer.parseInt(((StringDataContainer) param).getData());
-            }
-            catch (NumberFormatException ex) {
-                return null;
-            }
-        }
-        else if (param instanceof IntegerDataContainer) {
-            i = ((IntegerDataContainer) param).getData();
-        }
-        else if (param instanceof BooleanDataContainer) {
-            i = ((BooleanDataContainer) param).getData() ? 1 : 0;
-        }
-        return new IntegerDataContainer(i);
-    }
-}
diff --git a/main/core/runtime/builtins/BuiltinManager.java b/main/core/runtime/builtins/BuiltinManager.java
deleted file mode 100644
index c6c9e26..0000000
--- a/main/core/runtime/builtins/BuiltinManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime.builtins;
-
-import com.jantuomi.interpreter.main.core.runtime.Function;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class BuiltinManager {
-    private static BuiltinManager instance = new BuiltinManager();
-
-    public static BuiltinManager getInstance() {
-        return instance;
-    }
-
-    private List<Function> builtins = new ArrayList<>();
-
-    private BuiltinManager() {
-        builtins.add(new OutBuiltinFunction());
-        builtins.add(new InBuiltinFunction());
-        builtins.add(new ConcatBuiltinFunction());
-        builtins.add(new AsIntBuiltinFunction());
-    }
-
-    public List<Function> getBuiltins() {
-        return builtins;
-    }
-}
diff --git a/main/core/runtime/builtins/ConcatBuiltinFunction.java b/main/core/runtime/builtins/ConcatBuiltinFunction.java
deleted file mode 100644
index 5f87a38..0000000
--- a/main/core/runtime/builtins/ConcatBuiltinFunction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime.builtins;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
-import com.jantuomi.interpreter.main.core.runtime.Function;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class ConcatBuiltinFunction extends Function {
-    public ConcatBuiltinFunction() {
-        super(
-                Arrays.asList("strings"),
-                null
-        );
-    }
-
-    @Override
-    public String getName() {
-        return "concat";
-    }
-
-    @Override
-    public DataContainer evaluate(List<DataContainer> params) throws InterpreterException {
-        StringBuilder sb = new StringBuilder();
-        for (DataContainer d : params) {
-            sb.append(d.getData());
-        }
-
-        return new StringDataContainer(
-                sb.toString()
-        );
-    }
-}
diff --git a/main/core/runtime/builtins/InBuiltinFunction.java b/main/core/runtime/builtins/InBuiltinFunction.java
deleted file mode 100644
index 32d6b72..0000000
--- a/main/core/runtime/builtins/InBuiltinFunction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime.builtins;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.parser.datatype.StringDataContainer;
-import com.jantuomi.interpreter.main.core.runtime.Function;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Scanner;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class InBuiltinFunction extends Function {
-    public InBuiltinFunction() {
-        super(
-                Arrays.asList("expression"),
-                null
-        );
-    }
-
-    @Override
-    public String getName() {
-        return "in";
-    }
-
-    @Override
-    public DataContainer evaluate(List<DataContainer> params) throws InterpreterException {
-        if (params.size() > 0) {
-            DataContainer param = params.get(0);
-            System.out.print(param.getData().toString());
-        }
-        Scanner in = new Scanner(System.in);
-        String userInput = in.nextLine();
-        return new StringDataContainer(userInput);
-    }
-}
diff --git a/main/core/runtime/builtins/OutBuiltinFunction.java b/main/core/runtime/builtins/OutBuiltinFunction.java
deleted file mode 100644
index 0611a83..0000000
--- a/main/core/runtime/builtins/OutBuiltinFunction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jantuomi.interpreter.main.core.runtime.builtins;
-
-import com.jantuomi.interpreter.main.core.parser.datatype.DataContainer;
-import com.jantuomi.interpreter.main.core.runtime.Function;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class OutBuiltinFunction extends Function {
-    public OutBuiltinFunction() {
-        super(
-                Arrays.asList("expression"),
-                null
-        );
-    }
-
-    @Override
-    public String getName() {
-        return "out";
-    }
-
-    @Override
-    public DataContainer evaluate(List<DataContainer> params) throws InterpreterException {
-        DataContainer param = params.get(0);
-        System.out.println(param.getData().toString());
-        return param;
-    }
-}
diff --git a/main/core/tokenizer/Tokenizer.java b/main/core/tokenizer/Tokenizer.java
deleted file mode 100644
index 9ff1e4c..0000000
--- a/main/core/tokenizer/Tokenizer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer;
-
-
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by jan on 10.6.2016.
- */
-public class Tokenizer {
-    private String sourceString;
-
-    public List<Token> getTokens() {
-        return tokens;
-    }
-
-    private List<Token> tokens = new ArrayList<>();
-
-    private static Map<Token.Type, String> tokenRegexes = new LinkedHashMap<>();
-    private static final List<Token.Type> discardedTokenTypes = new ArrayList<>();
-    private static final List<Token.Type> erroneousTokenTypes = new ArrayList<>();
-
-    private static final Tokenizer instance = new Tokenizer();
-
-    public static final Tokenizer getInstance() {
-        return instance;
-    }
-
-    private Tokenizer() {
-        tokenRegexes.put(Token.Type.CommentToken, "^\\/\\*(.*?)\\*\\/");
-
-        tokenRegexes.put(Token.Type.DoubleLiteralToken, "^([-+]?[0-9]*\\.?[0-9]+)f\\b");
-        tokenRegexes.put(Token.Type.IntegerLiteralToken, "^([-+]?\\d+)\\b");
-        tokenRegexes.put(Token.Type.BooleanLiteralToken, "^(true|false)\\b");
-        tokenRegexes.put(Token.Type.StringLiteralToken, "^\"(.*?)\"");
-
-        tokenRegexes.put(Token.Type.WhitespaceToken, "^( |\t)");
-        tokenRegexes.put(Token.Type.NewlineToken, "^(\n|\r\n)");
-        tokenRegexes.put(Token.Type.AdditionToken, "^(\\+)");
-        tokenRegexes.put(Token.Type.SubtractionToken, "^(\\-)");
-        tokenRegexes.put(Token.Type.DivisionToken, "^(\\/)");
-        tokenRegexes.put(Token.Type.MultiplicationToken, "^(\\*)");
-        tokenRegexes.put(Token.Type.AssignmentToken, "^(set)\\b");
-        tokenRegexes.put(Token.Type.LessThanToken, "^(\\<)");
-        tokenRegexes.put(Token.Type.GreaterThanToken, "^(\\>)");
-        tokenRegexes.put(Token.Type.LessOrEqualThanToken, "^(\\<\\=)");
-        tokenRegexes.put(Token.Type.GreaterOrEqualThanToken, "^(\\>\\=)");
-        tokenRegexes.put(Token.Type.EqualsToken, "^(\\=\\=)");
-        tokenRegexes.put(Token.Type.NotEqualsToken, "^(\\!\\=)");
-        tokenRegexes.put(Token.Type.OpenParenToken, "^(\\()");
-        tokenRegexes.put(Token.Type.ClosedParenToken, "^(\\))");
-        tokenRegexes.put(Token.Type.FunctionDefineToken, "^(func)\\b");
-        tokenRegexes.put(Token.Type.FunctionBodyToken, "^(as)\\b");
-        tokenRegexes.put(Token.Type.BranchBodyToken, "^(then)\\b");
-        tokenRegexes.put(Token.Type.EndBlockToken, "^(end)\\b");
-        tokenRegexes.put(Token.Type.NegationToken, "^(not)\\b");
-        tokenRegexes.put(Token.Type.DeclarationToken, "^(decl)\\b");
-        tokenRegexes.put(Token.Type.BranchToken, "^(if)\\b");
-
-        tokenRegexes.put(Token.Type.SymbolToken, "^([a-zA-Z]+\\w*)");
-
-        discardedTokenTypes.add(Token.Type.WhitespaceToken);
-        discardedTokenTypes.add(Token.Type.CommentToken);
-
-        erroneousTokenTypes.add(Token.Type.NotAToken);
-    }
-
-    public List<Token> tokenize(String string) throws InterpreterException {
-        sourceString = string;
-        tokens.clear();
-        int line = 1;
-        for (int i = 0; i < string.length();) {
-
-            Token token = Token.makeToken(string.substring(i), tokenRegexes, line);
-
-            if (token == null) {
-                i++;
-                continue;
-            }
-
-            if (token.getTokenType() == Token.Type.NewlineToken) {
-                line++;
-            }
-
-            if (!discardedTokenTypes.contains(token.getTokenType())) {
-                tokens.add(token);
-            }
-
-            if (erroneousTokenTypes.contains(token.getTokenType())) {
-                ExceptionManager.raise(InterpreterException.ExceptionType.IllegalTokenError, line, token.getText());
-            }
-
-            String tokenRawText = token.getRawText();
-            if (tokenRawText == null) {
-                tokenRawText = token.getText();
-            }
-            if (tokenRawText != null) {
-                i += tokenRawText.length();
-            } else {
-                i++;
-            }
-        }
-        return tokens;
-    }
-
-    public static void printTokens(List<Token> tokens) {
-        System.out.println("### Tokens: ###");
-        for (Token token : tokens) {
-            System.out.println(String.format("%-40s %s", token.getTokenType(), token.getText()));
-        }
-        System.out.println("### End ###");
-    }
-}
diff --git a/main/core/tokenizer/token/ArgumentInfo.java b/main/core/tokenizer/token/ArgumentInfo.java
deleted file mode 100644
index b062a04..0000000
--- a/main/core/tokenizer/token/ArgumentInfo.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class ArgumentInfo {
-    private int count = 0;
-    private boolean isVarargs = false;
-
-    public Token.Type getOptionalArgument() {
-        return optionalArgument;
-    }
-
-    public void setOptionalArgument(Token.Type optionalArgument) {
-        this.optionalArgument = optionalArgument;
-    }
-
-    private Token.Type optionalArgument = null;
-
-    public Token.Type getTerminator() {
-        return terminator;
-    }
-
-    public void setTerminator(Token.Type terminator) {
-        this.terminator = terminator;
-    }
-
-    private Token.Type terminator;
-
-    public ArgumentInfo(int count) {
-        this.count = count;
-    }
-
-    public ArgumentInfo() {
-
-    }
-
-    public void setVariable(boolean value) {
-        this.isVarargs = value;
-    }
-
-    public boolean getVarargs() {
-        return isVarargs;
-    }
-
-    public int getCount() {
-        return count;
-    }
-}
diff --git a/main/core/tokenizer/token/Token.java b/main/core/tokenizer/token/Token.java
deleted file mode 100644
index d4058cb..0000000
--- a/main/core/tokenizer/token/Token.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.types.*;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-/**
- * Created by jan on 10.6.2016.
- */
-abstract public class Token {
-
-    public void print(int indent) {
-        for (int i = 0; i < indent; i++) {
-            System.out.print("\t");
-        }
-        System.out.println(toString());
-        for (Token child : getChildren()) {
-            child.print(indent + 1);
-        }
-    }
-
-    abstract public ASTNode generateNode() throws InterpreterException;
-
-    /* Token types, ordered by precedence */
-    public enum Type {
-        CommentToken,
-
-        AdditionToken,
-        SubtractionToken,
-        DivisionToken,
-        MultiplicationToken,
-
-        AssignmentToken,
-
-        LessThanToken,
-        GreaterThanToken,
-        LessOrEqualThanToken,
-        GreaterOrEqualThanToken,
-        EqualsToken,
-        NotEqualsToken,
-
-        OpenParenToken,
-        ClosedParenToken,
-
-        FunctionDefineToken,
-        DeclarationToken,
-
-        StringLiteralToken,
-        IntegerLiteralToken,
-        BooleanLiteralToken,
-        DoubleLiteralToken,
-
-        WhitespaceToken,
-        NewlineToken,
-
-        BranchToken,
-        SymbolToken,
-        EndBlockToken,
-        FunctionBodyToken,
-        BranchBodyToken,
-        NegationToken,
-
-        NotAToken
-    }
-
-    abstract public Token setArguments(List<Token> args);
-
-    abstract public List<Token> getChildren();
-
-    public boolean is(Type type) {
-        return getTokenType() == type;
-    }
-
-    public int getLine() {
-        return line;
-    }
-
-    public void setLine(int line) {
-        this.line = line;
-    }
-
-    private int line;
-    private String rawText;
-    private String text;
-    private Type type;
-
-    public String getText() {
-        return text;
-    }
-
-    public Type getTokenType() {
-        return this.type;
-    }
-
-    public String getRawText() {
-        return rawText;
-    }
-
-    public boolean isHigherPrecedenceThan(Token other) {
-        return getTokenType().ordinal() <= other.getTokenType().ordinal();
-    }
-
-    public Token(Type type, String text, String rawText) {
-        initialize(type, text, rawText);
-    }
-
-    public Token(Type type, String text) {
-        initialize(type, text);
-    }
-
-    public Token(Type type) {
-        initialize(type, null);
-    }
-
-    private void initialize(Type type, String text, String rawText) {
-        this.type = type;
-        this.text = text;
-        this.rawText = rawText;
-    }
-
-    private void initialize(Type type, String text) {
-        initialize(type, text, text);
-    }
-
-    public static Token makeToken(String string, Map<Type, String> regexes, int line) throws InterpreterException {
-        Type type = Type.NotAToken;
-        String text = Character.toString(string.charAt(0));
-
-        for (Type t : regexes.keySet()) {
-            String regex = regexes.get(t);
-            Token found = matchToken(string, t, regex, line);
-            if (found != null) {
-                found.setLine(line);
-                return found;
-            }
-        }
-
-        // TODO raise error
-        return null;
-    }
-
-    public static Token matchToken(String string, Type type, String regex, int line) throws InterpreterException {
-        Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
-        Matcher matcher = pattern.matcher(string);
-
-        if (matcher.find()) {
-            String text = matcher.group(1);
-            String rawText = matcher.group(0);
-
-            switch (type) {
-                case WhitespaceToken:
-                    return new WhitespaceToken();
-                case CommentToken:
-                    return new CommentToken(text, rawText);
-
-                // TODO placeholder whitespace instead of newline
-                case NewlineToken:
-                    return new WhitespaceToken();
-
-                case IntegerLiteralToken:
-                    return new IntegerLiteralToken(text);
-                case StringLiteralToken:
-                    return new StringLiteralToken(text, rawText);
-                case BooleanLiteralToken:
-                    return new BooleanLiteralToken(text);
-                case DoubleLiteralToken:
-                    return new DoubleLiteralToken(text, rawText);
-                case AdditionToken:
-                    return new AdditionToken();
-                case SubtractionToken:
-                    return new SubtractionToken();
-                case MultiplicationToken:
-                    return new MultiplicationToken();
-                case DivisionToken:
-                    return new DivisionToken();
-                case FunctionDefineToken:
-                    return new FunctionDefineToken();
-                case EndBlockToken:
-                    return new EndFunctionDefineToken();
-                case FunctionBodyToken:
-                    return new BlockBodyToken("as");
-                case BranchBodyToken:
-                    return new BlockBodyToken("then");
-                case DeclarationToken:
-                    return new VariableDeclareToken();
-                case AssignmentToken:
-                    return new AssignmentToken();
-                case SymbolToken:
-                    return new SymbolToken(text);
-                case OpenParenToken:
-                    return new OpenParenToken();
-                case ClosedParenToken:
-                    return new ClosedParenToken();
-                case BranchToken:
-                    return new BranchToken();
-                case NegationToken:
-                    return new NegationToken();
-                default:
-                    ExceptionManager.raise(InterpreterException.ExceptionType.IllegalTokenError, line,
-                            type.toString()
-                    );
-            }
-        }
-
-        return null;
-    }
-
-    public ArgumentInfo getArgumentInfo() {
-        switch (getTokenType()) {
-
-            case FunctionDefineToken:
-                ArgumentInfo fdai = new ArgumentInfo();
-                fdai.setVariable(true);
-                fdai.setTerminator(Type.FunctionBodyToken);
-                return fdai;
-            case BranchBodyToken:
-            case FunctionBodyToken:
-                ArgumentInfo fbai = new ArgumentInfo();
-                fbai.setVariable(true);
-                fbai.setTerminator(Type.EndBlockToken);
-                return fbai;
-            case OpenParenToken:
-                ArgumentInfo opai = new ArgumentInfo();
-                opai.setVariable(true);
-                opai.setTerminator(Type.ClosedParenToken);
-                return opai;
-            case SymbolToken:
-                ArgumentInfo sai = new ArgumentInfo();
-                sai.setOptionalArgument(Type.OpenParenToken);
-                return sai;
-            case AdditionToken:
-            case SubtractionToken:
-            case DivisionToken:
-            case MultiplicationToken:
-            case AssignmentToken:
-            case LessThanToken:
-            case GreaterThanToken:
-            case LessOrEqualThanToken:
-            case GreaterOrEqualThanToken:
-            case EqualsToken:
-            case NotEqualsToken:
-            case BranchToken:
-                return new ArgumentInfo(2);
-            case DeclarationToken:
-            case NegationToken:
-                return new ArgumentInfo(1);
-            default:
-                return new ArgumentInfo(0);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder(17, 37)
-                .append(text)
-                .append(getTokenType())
-                .toHashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof Token)) return false;
-        if (o == this) return true;
-
-        Token rhs = (Token) o;
-        return new EqualsBuilder()
-                .append(getTokenType(), rhs.getTokenType())
-                .append(text, rhs.text)
-                .isEquals();
-    }
-
-    @Override
-    public String toString() {
-        return String.format(String.format(
-                "%s%s",
-                getTokenType().toString().replace("Token", ""),
-                getText() == null ? "" : " " + getText()
-        ));
-    }
-
-    public String toFormattedString() {
-        String textRepr = text;
-        return String.format("%-40s %s", getTokenType(), textRepr);
-    }
-
-    public boolean isSameType(Token other) {
-        return type == other.type;
-    }
-}
diff --git a/main/core/tokenizer/token/types/AdditionToken.java b/main/core/tokenizer/token/types/AdditionToken.java
deleted file mode 100644
index 4623d73..0000000
--- a/main/core/tokenizer/token/types/AdditionToken.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.AdditionNode;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class AdditionToken extends BinaryOperatorToken {
-    public AdditionToken() {
-        super(Type.AdditionToken);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new AdditionNode(this,
-                lhs.generateNode(),
-                rhs.generateNode()
-        );
-
-    }
-}
diff --git a/main/core/tokenizer/token/types/AssignmentToken.java b/main/core/tokenizer/token/types/AssignmentToken.java
deleted file mode 100644
index 57f404c..0000000
--- a/main/core/tokenizer/token/types/AssignmentToken.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.AssignmentNode;
-import com.jantuomi.interpreter.main.core.parser.ast.SymbolNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.ExceptionManager;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 20.6.2016.
- */
-public class AssignmentToken extends Token {
-
-    private Token lhs;
-    private Token rhs;
-
-    public AssignmentToken() {
-        super(Type.AssignmentToken, "set");
-    }
-
-    // TODO this and the node
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        ASTNode lhsNode = lhs.generateNode();
-
-        if (!(lhsNode instanceof SymbolNode)) {
-            ExceptionManager.raise(InterpreterException.ExceptionType.SyntaxError, getLine(), "non-symbol " + toString());
-            return null;
-        }
-
-        AssignmentNode node = new AssignmentNode(this,
-                (SymbolNode) lhsNode,
-                rhs.generateNode()
-        );
-
-        return node;
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        this.lhs = args.get(0);
-        this.rhs = args.get(1);
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList(lhs, rhs);
-    }
-}
diff --git a/main/core/tokenizer/token/types/BinaryOperatorToken.java b/main/core/tokenizer/token/types/BinaryOperatorToken.java
deleted file mode 100644
index 3998bb9..0000000
--- a/main/core/tokenizer/token/types/BinaryOperatorToken.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 15.6.2016.
- */
-abstract public class BinaryOperatorToken extends Token {
-    protected Token lhs;
-    protected Token rhs;
-
-    public BinaryOperatorToken(Type type) {
-        super(type);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        lhs = args.get(0);
-        rhs = args.get(1);
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList(lhs, rhs);
-
-    }
-}
diff --git a/main/core/tokenizer/token/types/BlockBodyToken.java b/main/core/tokenizer/token/types/BlockBodyToken.java
deleted file mode 100644
index 444ea1f..0000000
--- a/main/core/tokenizer/token/types/BlockBodyToken.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.BlockBodyNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class BlockBodyToken extends VarargOperatorToken {
-    public BlockBodyToken(String keyword) {
-        super(Type.FunctionBodyToken, keyword);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        BlockBodyNode node = new BlockBodyNode(this);
-        List<ASTNode> statements = new ArrayList<>();
-        for (int i = 0; i < args.size() - 1; i++) {
-            Token arg = args.get(i);
-            statements.add(arg.generateNode());
-        }
-        node.setArgs(statements);
-        return node;
-    }
-}
diff --git a/main/core/tokenizer/token/types/BooleanLiteralToken.java b/main/core/tokenizer/token/types/BooleanLiteralToken.java
deleted file mode 100644
index 6e28b82..0000000
--- a/main/core/tokenizer/token/types/BooleanLiteralToken.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.BooleanLiteralNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class BooleanLiteralToken extends Token{
-    public BooleanLiteralToken(String text) {
-        super(Type.BooleanLiteralToken, text);
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return new BooleanLiteralNode(this);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/BranchToken.java b/main/core/tokenizer/token/types/BranchToken.java
deleted file mode 100644
index 84aeabb..0000000
--- a/main/core/tokenizer/token/types/BranchToken.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.BlockBodyNode;
-import com.jantuomi.interpreter.main.core.parser.ast.BranchNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class BranchToken extends Token {
-
-    private Token expression;
-    private BlockBodyToken branch;
-
-    public BranchToken() {
-        super(Type.BranchToken, "if");
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new BranchNode(this,
-                expression.generateNode(),
-                (BlockBodyNode) branch.generateNode()
-        );
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        expression = args.get(0);
-        branch = (BlockBodyToken) args.get(1);
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList(expression, branch);
-    }
-}
diff --git a/main/core/tokenizer/token/types/ClosedParenToken.java b/main/core/tokenizer/token/types/ClosedParenToken.java
deleted file mode 100644
index 17e5c67..0000000
--- a/main/core/tokenizer/token/types/ClosedParenToken.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 19.6.2016.
- */
-public class ClosedParenToken extends Token {
-    public ClosedParenToken() {
-        super(Type.ClosedParenToken);
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return null;
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/CommentToken.java b/main/core/tokenizer/token/types/CommentToken.java
deleted file mode 100644
index 45ca995..0000000
--- a/main/core/tokenizer/token/types/CommentToken.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.EmptyNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 19.6.2016.
- */
-public class CommentToken extends Token {
-    public CommentToken(String text, String rawText) {
-        super(Type.CommentToken, text, rawText);
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return new EmptyNode(this);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/DivisionToken.java b/main/core/tokenizer/token/types/DivisionToken.java
deleted file mode 100644
index 14f4d13..0000000
--- a/main/core/tokenizer/token/types/DivisionToken.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.DivisionNode;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class DivisionToken extends BinaryOperatorToken {
-    public DivisionToken() {
-        super(Type.DivisionToken);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new DivisionNode(this,
-                lhs.generateNode(),
-                rhs.generateNode()
-        );
-
-    }
-}
diff --git a/main/core/tokenizer/token/types/DoubleLiteralToken.java b/main/core/tokenizer/token/types/DoubleLiteralToken.java
deleted file mode 100644
index 1a379eb..0000000
--- a/main/core/tokenizer/token/types/DoubleLiteralToken.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.DoubleLiteralNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class DoubleLiteralToken extends Token{
-    public DoubleLiteralToken(String text, String rawText) {
-        super(Type.DoubleLiteralToken, text, rawText);
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return new DoubleLiteralNode(this);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/EndFunctionDefineToken.java b/main/core/tokenizer/token/types/EndFunctionDefineToken.java
deleted file mode 100644
index 14b21f8..0000000
--- a/main/core/tokenizer/token/types/EndFunctionDefineToken.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class EndFunctionDefineToken extends Token {
-    public EndFunctionDefineToken() {
-        super(Type.EndBlockToken, "end");
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return null;
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/FunctionDefineToken.java b/main/core/tokenizer/token/types/FunctionDefineToken.java
deleted file mode 100644
index 7d715a9..0000000
--- a/main/core/tokenizer/token/types/FunctionDefineToken.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.BlockBodyNode;
-import com.jantuomi.interpreter.main.core.parser.ast.FunctionDefineNode;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class FunctionDefineToken extends VarargOperatorToken {
-    public FunctionDefineToken() {
-        super(Type.FunctionDefineToken, "func");
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        FunctionDefineNode node = new FunctionDefineNode(this);
-        node.setName(args.get(0).getText());
-
-        List<ASTNode> funcArgs = new ArrayList<>();
-        for (int i = 1; i < args.size() - 1; i++) {
-            funcArgs.add(args.get(i).generateNode());
-        }
-        node.setArgs(funcArgs);
-
-        BlockBodyNode bodyNode = (BlockBodyNode) args.get(args.size() - 1).generateNode();
-        node.setBody(bodyNode);
-        return node;
-    }
-}
diff --git a/main/core/tokenizer/token/types/IntegerLiteralToken.java b/main/core/tokenizer/token/types/IntegerLiteralToken.java
deleted file mode 100644
index cdb4fde..0000000
--- a/main/core/tokenizer/token/types/IntegerLiteralToken.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.IntegerLiteralNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class IntegerLiteralToken extends Token{
-    public IntegerLiteralToken(String text) {
-        super(Type.IntegerLiteralToken, text);
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return new IntegerLiteralNode(this);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/MultiplicationToken.java b/main/core/tokenizer/token/types/MultiplicationToken.java
deleted file mode 100644
index 521f01a..0000000
--- a/main/core/tokenizer/token/types/MultiplicationToken.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.MultiplicationNode;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 15.6.2016.
- */
-public class MultiplicationToken extends BinaryOperatorToken {
-    public MultiplicationToken() {
-        super(Type.MultiplicationToken);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new MultiplicationNode(this,
-                lhs.generateNode(),
-                rhs.generateNode()
-        );
-
-    }
-}
diff --git a/main/core/tokenizer/token/types/NegationToken.java b/main/core/tokenizer/token/types/NegationToken.java
deleted file mode 100644
index 5658f10..0000000
--- a/main/core/tokenizer/token/types/NegationToken.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.NegationNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class NegationToken extends Token {
-
-    private Token operand;
-
-    public NegationToken() {
-        super(Type.NegationToken, "not");
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new NegationNode(this, operand.generateNode());
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        operand = args.get(0);
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList(operand);
-    }
-}
diff --git a/main/core/tokenizer/token/types/OpenParenToken.java b/main/core/tokenizer/token/types/OpenParenToken.java
deleted file mode 100644
index 80b507c..0000000
--- a/main/core/tokenizer/token/types/OpenParenToken.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.ParameterListNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 19.6.2016.
- */
-public class OpenParenToken extends VarargOperatorToken {
-    public OpenParenToken() {
-        super(Type.OpenParenToken);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        ParameterListNode node = new ParameterListNode(this);
-
-        for (Token token : args) {
-            if (token.getTokenType() == Type.ClosedParenToken) {
-                continue;
-            }
-
-            node.addParameter(token.generateNode());
-        }
-        return node;
-    }
-}
diff --git a/main/core/tokenizer/token/types/StringLiteralToken.java b/main/core/tokenizer/token/types/StringLiteralToken.java
deleted file mode 100644
index 8d6cb8a..0000000
--- a/main/core/tokenizer/token/types/StringLiteralToken.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.StringLiteralNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 21.6.2016.
- */
-public class StringLiteralToken extends Token {
-    public StringLiteralToken(String text, String rawText) {
-        super(Type.StringLiteralToken, text, rawText);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new StringLiteralNode(this);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}
diff --git a/main/core/tokenizer/token/types/SubtractionToken.java b/main/core/tokenizer/token/types/SubtractionToken.java
deleted file mode 100644
index 9f7ff10..0000000
--- a/main/core/tokenizer/token/types/SubtractionToken.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.SubtractionNode;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class SubtractionToken extends BinaryOperatorToken {
-    public SubtractionToken() {
-        super(Type.SubtractionToken);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        return new SubtractionNode(this,
-                lhs.generateNode(),
-                rhs.generateNode()
-        );
-    }
-}
diff --git a/main/core/tokenizer/token/types/SymbolToken.java b/main/core/tokenizer/token/types/SymbolToken.java
deleted file mode 100644
index d750921..0000000
--- a/main/core/tokenizer/token/types/SymbolToken.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.ParameterListNode;
-import com.jantuomi.interpreter.main.core.parser.ast.SymbolNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class SymbolToken extends Token {
-
-    public void setCallArgumentList(OpenParenToken callArgumentList) {
-        this.callArgumentList = callArgumentList;
-    }
-
-    private OpenParenToken callArgumentList = null;
-
-    public SymbolToken(String name) {
-        super(Type.SymbolToken, name);
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        SymbolNode node = new SymbolNode(this);
-        node.setName(this.getText());
-        if (callArgumentList != null) {
-            node.setParameterListNode((ParameterListNode) callArgumentList.generateNode());
-        }
-        return node;
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        if (args.size() > 0) {
-            setCallArgumentList((OpenParenToken) args.get(0));
-        }
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        if (callArgumentList == null) {
-            return Arrays.asList();
-        } else {
-            return Arrays.asList(callArgumentList);
-        }
-    }
-}
diff --git a/main/core/tokenizer/token/types/VarargOperatorToken.java b/main/core/tokenizer/token/types/VarargOperatorToken.java
deleted file mode 100644
index f8901ee..0000000
--- a/main/core/tokenizer/token/types/VarargOperatorToken.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-abstract public class VarargOperatorToken extends Token {
-
-    protected List<Token> args;
-
-    public VarargOperatorToken(Type type, String text) {
-        super(type, text);
-    }
-
-    public VarargOperatorToken(Type type) {
-        super(type);
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        this.args = args;
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return args;
-    }
-
-}
diff --git a/main/core/tokenizer/token/types/VariableDeclareToken.java b/main/core/tokenizer/token/types/VariableDeclareToken.java
deleted file mode 100644
index 1ec0826..0000000
--- a/main/core/tokenizer/token/types/VariableDeclareToken.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.parser.ast.SymbolNode;
-import com.jantuomi.interpreter.main.core.parser.ast.VariableDeclareNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-import com.jantuomi.interpreter.main.exception.InterpreterException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 20.6.2016.
- */
-public class VariableDeclareToken extends Token {
-
-    private SymbolToken variable;
-
-    public VariableDeclareToken() {
-        super(Type.DeclarationToken, "decl");
-    }
-
-    @Override
-    public ASTNode generateNode() throws InterpreterException {
-        VariableDeclareNode node =  new VariableDeclareNode(this,
-                (SymbolNode) variable.generateNode());
-        return node;
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        if (args.size() > 0) {
-            this.variable = (SymbolToken) args.get(0);
-        }
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList(variable);
-    }
-}
diff --git a/main/core/tokenizer/token/types/WhitespaceToken.java b/main/core/tokenizer/token/types/WhitespaceToken.java
deleted file mode 100644
index fb4949c..0000000
--- a/main/core/tokenizer/token/types/WhitespaceToken.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.jantuomi.interpreter.main.core.tokenizer.token.types;
-
-import com.jantuomi.interpreter.main.core.parser.ast.ASTNode;
-import com.jantuomi.interpreter.main.core.tokenizer.token.Token;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by jan on 16.6.2016.
- */
-public class WhitespaceToken extends Token {
-    public WhitespaceToken() {
-        super(Type.WhitespaceToken);
-    }
-
-    @Override
-    public ASTNode generateNode() {
-        return null;
-    }
-
-    @Override
-    public Token setArguments(List<Token> args) {
-        return this;
-    }
-
-    @Override
-    public List<Token> getChildren() {
-        return Arrays.asList();
-    }
-}