Rename project to tunkki

83 files changed, 397 insertions, 309 deletions

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index e83d0f1..09d2a0a 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: com.jantuomi.borker.Main
+Main-Class: com.jantuomi.tunkki.Main
 
diff --git a/pom.xml b/pom.xml
index 600e0e4..ed3d68d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.jantuomi.borker</groupId>
-    <artifactId>borker</artifactId>
+    <groupId>com.jantuomi.tunkki</groupId>
+    <artifactId>tunkki</artifactId>
     <version>0.1</version>
 
     <url>http://maven.apache.org</url>
@@ -48,7 +48,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>com.jantuomi.borker.Main</mainClass>
+                            <mainClass>com.jantuomi.tunkki.Main</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
diff --git a/src/main/com/jantuomi/borker/Main.java b/src/main/com/jantuomi/tunkki/Main.java
index c5cbca7..76f1d40 100644
--- a/src/main/com/jantuomi/borker/Main.java
+++ b/src/main/com/jantuomi/tunkki/Main.java
@@ -1,13 +1,13 @@
-package com.jantuomi.borker;
+package com.jantuomi.tunkki;
 
-import com.jantuomi.borker.core.CommandLineArgumentContainer;
-import com.jantuomi.borker.core.parser.ASTGenerator;
-import com.jantuomi.borker.core.parser.Parser;
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.runtime.Interpreter;
-import com.jantuomi.borker.core.tokenizer.Tokenizer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.CommandLineArgumentContainer;
+import com.jantuomi.tunkki.core.parser.ASTGenerator;
+import com.jantuomi.tunkki.core.parser.Parser;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.runtime.Interpreter;
+import com.jantuomi.tunkki.core.tokenizer.Tokenizer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 
diff --git a/src/main/com/jantuomi/borker/core/CommandLineArgumentContainer.java b/src/main/com/jantuomi/tunkki/core/CommandLineArgumentContainer.java
index b89c88e..5266c6f 100644
--- a/src/main/com/jantuomi/borker/core/CommandLineArgumentContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/CommandLineArgumentContainer.java
@@ -1,4 +1,4 @@
-package com.jantuomi.borker.core;
+package com.jantuomi.tunkki.core;
 
 
 import org.kohsuke.args4j.Option;
@@ -49,10 +49,18 @@ public class CommandLineArgumentContainer {
             return null;
         }
 
+        return readFileContents(srcFile);
+    }
+
+    public String readFileContents(String filename) {
+        return readFileContents(new File(filename));
+    }
+
+    public String readFileContents(File file) {
         BufferedReader br;
         String contents = null;
         try {
-            br = new BufferedReader(new FileReader(srcFile));
+            br = new BufferedReader(new FileReader(file));
             StringBuilder sb = new StringBuilder();
             String line = br.readLine();
 
@@ -63,11 +71,11 @@ public class CommandLineArgumentContainer {
             }
             contents = sb.toString();
         } catch (IOException e) {
-            e.printStackTrace();
+            System.err.println(String.format("Couldn't read file \"%s\".", file.toString()));
             return null;
-        } finally {
-            // Add a newline at the end for comment rows to terminate nicely
-            return contents + "\n";
         }
+
+        // Add a newline at the end for comment rows to terminate nicely
+        return contents + "\n";
     }
 }
diff --git a/src/main/com/jantuomi/borker/core/parser/ASTGenerator.java b/src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java
index e22b763..e1be9c8 100644
--- a/src/main/com/jantuomi/borker/core/parser/ASTGenerator.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ASTGenerator.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser;
+package com.jantuomi.tunkki.core.parser;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/Parser.java b/src/main/com/jantuomi/tunkki/core/parser/Parser.java
index 2552d30..3eccc1d 100644
--- a/src/main/com/jantuomi/borker/core/parser/Parser.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/Parser.java
@@ -1,10 +1,10 @@
-package com.jantuomi.borker.core.parser;
+package com.jantuomi.tunkki.core.parser;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/ASTNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/ASTNode.java
index 0af95a8..86c7dc4 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/ASTNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/ASTNode.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.List;
 
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/AdditionNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/AdditionNode.java
index 24ecb43..4dfc871 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/AdditionNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/AdditionNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/AssignmentNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/AssignmentNode.java
index 82e31dc..04e41fa 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/AssignmentNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/AssignmentNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.runtime.State;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.runtime.State;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/BinaryOperatorNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/BinaryOperatorNode.java
index a8f473f..437366d 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/BinaryOperatorNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/BinaryOperatorNode.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/BlockBodyNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/BlockBodyNode.java
index 7aaf407..1fea514 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/BlockBodyNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/BlockBodyNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.VoidDataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.VoidDataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 17.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/BooleanLiteralNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/BooleanLiteralNode.java
index b5818a9..aaa1e95 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/BooleanLiteralNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/BooleanLiteralNode.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.BooleanDataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/BranchNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/BranchNode.java
index e92c42e..e67352e 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/BranchNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/BranchNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.BooleanDataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/DivisionNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/DivisionNode.java
index 6eccb48..fe871fb 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/DivisionNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/DivisionNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/DoubleLiteralNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/DoubleLiteralNode.java
index 084218b..361161d 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/DoubleLiteralNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/DoubleLiteralNode.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.DoubleDataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.DoubleDataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/EmptyNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/EmptyNode.java
index cd97f44..943623f 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/EmptyNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/EmptyNode.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.VoidDataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.VoidDataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/FunctionDefineNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/FunctionDefineNode.java
index 2365511..ec2862e 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/FunctionDefineNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/FunctionDefineNode.java
@@ -1,10 +1,10 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.StringDataContainer;
-import com.jantuomi.borker.core.runtime.Function;
-import com.jantuomi.borker.core.runtime.State;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.core.runtime.Function;
+import com.jantuomi.tunkki.core.runtime.State;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/IntegerLiteralNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/IntegerLiteralNode.java
index 573d491..a0e0c13 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/IntegerLiteralNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/IntegerLiteralNode.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.IntegerDataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.IntegerDataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/MultiplicationNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/MultiplicationNode.java
index 24f1730..bf21fcd 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/MultiplicationNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/MultiplicationNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/NegationNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/NegationNode.java
index c37ae1e..17df81d 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/NegationNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/NegationNode.java
@@ -1,11 +1,11 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.IntegerDataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.datatype.BooleanDataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.IntegerDataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 /**
  * Created by jan on 21.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/ParameterListNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/ParameterListNode.java
index 2d76694..42e95ea 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/ParameterListNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/ParameterListNode.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/StringLiteralNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/StringLiteralNode.java
index 214316a..ffa008a 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/StringLiteralNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/StringLiteralNode.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.StringDataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/SubtractionNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/SubtractionNode.java
index 3de887a..543ac04 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/SubtractionNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/SubtractionNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/SymbolNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/SymbolNode.java
index 0a483d1..6754002 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/SymbolNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/SymbolNode.java
@@ -1,10 +1,10 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.runtime.State;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.runtime.State;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/UnaryOperatorNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/UnaryOperatorNode.java
index 2636bfe..c047dd4 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/UnaryOperatorNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/UnaryOperatorNode.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/VarargOperatorNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/VarargOperatorNode.java
index 007bdf6..e935f72 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/VarargOperatorNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/VarargOperatorNode.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.List;
 
diff --git a/src/main/com/jantuomi/borker/core/parser/ast/VariableDeclareNode.java b/src/main/com/jantuomi/tunkki/core/parser/ast/VariableDeclareNode.java
index e37b17f..9e2677f 100644
--- a/src/main/com/jantuomi/borker/core/parser/ast/VariableDeclareNode.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/ast/VariableDeclareNode.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.parser.ast;
+package com.jantuomi.tunkki.core.parser.ast;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.StringDataContainer;
-import com.jantuomi.borker.core.runtime.State;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.core.runtime.State;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/parser/datatype/BooleanDataContainer.java b/src/main/com/jantuomi/tunkki/core/parser/datatype/BooleanDataContainer.java
index 855f464..818bf5b 100644
--- a/src/main/com/jantuomi/borker/core/parser/datatype/BooleanDataContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/datatype/BooleanDataContainer.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.datatype;
+package com.jantuomi.tunkki.core.parser.datatype;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/datatype/DataContainer.java b/src/main/com/jantuomi/tunkki/core/parser/datatype/DataContainer.java
index 6db9748..2717816 100644
--- a/src/main/com/jantuomi/borker/core/parser/datatype/DataContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/datatype/DataContainer.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.datatype;
+package com.jantuomi.tunkki.core.parser.datatype;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 11.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/datatype/DoubleDataContainer.java b/src/main/com/jantuomi/tunkki/core/parser/datatype/DoubleDataContainer.java
index 5c86d12..994acf1 100644
--- a/src/main/com/jantuomi/borker/core/parser/datatype/DoubleDataContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/datatype/DoubleDataContainer.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.datatype;
+package com.jantuomi.tunkki.core.parser.datatype;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 22.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/datatype/IntegerDataContainer.java b/src/main/com/jantuomi/tunkki/core/parser/datatype/IntegerDataContainer.java
index ce95830..5bbf1af 100644
--- a/src/main/com/jantuomi/borker/core/parser/datatype/IntegerDataContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/datatype/IntegerDataContainer.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.datatype;
+package com.jantuomi.tunkki.core.parser.datatype;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/datatype/StringDataContainer.java b/src/main/com/jantuomi/tunkki/core/parser/datatype/StringDataContainer.java
index 407e954..6d2d2ee 100644
--- a/src/main/com/jantuomi/borker/core/parser/datatype/StringDataContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/datatype/StringDataContainer.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.datatype;
+package com.jantuomi.tunkki.core.parser.datatype;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/parser/datatype/VoidDataContainer.java b/src/main/com/jantuomi/tunkki/core/parser/datatype/VoidDataContainer.java
index b25b0d9..abd2a00 100644
--- a/src/main/com/jantuomi/borker/core/parser/datatype/VoidDataContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/parser/datatype/VoidDataContainer.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.parser.datatype;
+package com.jantuomi.tunkki.core.parser.datatype;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 17.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/runtime/Function.java b/src/main/com/jantuomi/tunkki/core/runtime/Function.java
index a2b4ce3..2c8eb54 100644
--- a/src/main/com/jantuomi/borker/core/runtime/Function.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/Function.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.runtime;
+package com.jantuomi.tunkki.core.runtime;
 
-import com.jantuomi.borker.core.parser.ast.BlockBodyNode;
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.BlockBodyNode;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.List;
 
diff --git a/src/main/com/jantuomi/borker/core/runtime/Interpreter.java b/src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java
index ea6e0a1..64fc7f5 100644
--- a/src/main/com/jantuomi/borker/core/runtime/Interpreter.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/Interpreter.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.runtime;
+package com.jantuomi.tunkki.core.runtime;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.List;
 
diff --git a/src/main/com/jantuomi/borker/core/runtime/Scope.java b/src/main/com/jantuomi/tunkki/core/runtime/Scope.java
index ae57788..422a52e 100644
--- a/src/main/com/jantuomi/borker/core/runtime/Scope.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/Scope.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.runtime;
+package com.jantuomi.tunkki.core.runtime;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/runtime/State.java b/src/main/com/jantuomi/tunkki/core/runtime/State.java
index b60796c..2b33914 100644
--- a/src/main/com/jantuomi/borker/core/runtime/State.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/State.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.runtime;
+package com.jantuomi.tunkki.core.runtime;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.runtime.builtins.BuiltinManager;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.runtime.builtins.BuiltinManager;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/runtime/builtins/AsIntBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/AsIntBuiltinFunction.java
index 10dc93f..37e2081 100644
--- a/src/main/com/jantuomi/borker/core/runtime/builtins/AsIntBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/AsIntBuiltinFunction.java
@@ -1,11 +1,10 @@
-package com.jantuomi.borker.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins;
 
-import com.jantuomi.borker.core.parser.datatype.BooleanDataContainer;
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.IntegerDataContainer;
-import com.jantuomi.borker.core.parser.datatype.StringDataContainer;
-import com.jantuomi.borker.core.runtime.Function;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.BooleanDataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.IntegerDataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,11 +12,10 @@ import java.util.List;
 /**
  * Created by jan on 21.6.2016.
  */
-public class AsIntBuiltinFunction extends Function {
+public class AsIntBuiltinFunction extends BuiltinFunction {
     public AsIntBuiltinFunction() {
         super(
-                Arrays.asList("expression"),
-                null
+                Arrays.asList("expression")
         );
     }
 
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinFunction.java
new file mode 100644
index 0000000..8843f64
--- /dev/null
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinFunction.java
@@ -0,0 +1,22 @@
+package com.jantuomi.tunkki.core.runtime.builtins;
+
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.runtime.Function;
+import com.jantuomi.tunkki.exception.BorkError;
+
+import java.util.List;
+
+/**
+ * Created by jan on 28.6.2016.
+ */
+abstract public class BuiltinFunction extends Function{
+    public BuiltinFunction(List<String> argumentNames) {
+        super(argumentNames, null);
+    }
+
+    @Override
+    abstract public DataContainer evaluate(List<DataContainer> params) throws BorkError;
+
+    @Override
+    abstract public String getName();
+}
diff --git a/src/main/com/jantuomi/borker/core/runtime/builtins/BuiltinManager.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java
index 18f49a9..02d65c3 100644
--- a/src/main/com/jantuomi/borker/core/runtime/builtins/BuiltinManager.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins;
 
-import com.jantuomi.borker.core.runtime.Function;
+import com.jantuomi.tunkki.core.runtime.Function;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +22,7 @@ public class BuiltinManager {
         builtins.add(new InBuiltinFunction());
         builtins.add(new ConcatBuiltinFunction());
         builtins.add(new AsIntBuiltinFunction());
+        builtins.add(new IncludeBuiltinFunction());
     }
 
     public List<Function> getBuiltins() {
diff --git a/src/main/com/jantuomi/borker/core/runtime/builtins/ConcatBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/ConcatBuiltinFunction.java
index ab89871..2720dd1 100644
--- a/src/main/com/jantuomi/borker/core/runtime/builtins/ConcatBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/ConcatBuiltinFunction.java
@@ -1,9 +1,8 @@
-package com.jantuomi.borker.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.StringDataContainer;
-import com.jantuomi.borker.core.runtime.Function;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
@@ -11,11 +10,10 @@ import java.util.List;
 /**
  * Created by jan on 21.6.2016.
  */
-public class ConcatBuiltinFunction extends Function {
+public class ConcatBuiltinFunction extends BuiltinFunction {
     public ConcatBuiltinFunction() {
         super(
-                Arrays.asList("strings"),
-                null
+                Arrays.asList("strings")
         );
     }
 
diff --git a/src/main/com/jantuomi/borker/core/runtime/builtins/InBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/InBuiltinFunction.java
index f88bf9f..478633e 100644
--- a/src/main/com/jantuomi/borker/core/runtime/builtins/InBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/InBuiltinFunction.java
@@ -1,9 +1,8 @@
-package com.jantuomi.borker.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.StringDataContainer;
-import com.jantuomi.borker.core.runtime.Function;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,11 +11,10 @@ import java.util.Scanner;
 /**
  * Created by jan on 21.6.2016.
  */
-public class InBuiltinFunction extends Function {
+public class InBuiltinFunction extends BuiltinFunction {
     public InBuiltinFunction() {
         super(
-                Arrays.asList("expression"),
-                null
+                Arrays.asList("expression")
         );
     }
 
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java
new file mode 100644
index 0000000..4ed42ea
--- /dev/null
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java
@@ -0,0 +1,57 @@
+package com.jantuomi.tunkki.core.runtime.builtins;
+
+
+import com.jantuomi.tunkki.Main;
+import com.jantuomi.tunkki.core.CommandLineArgumentContainer;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.StringDataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.VoidDataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by jan on 28.6.2016.
+ */
+public class IncludeBuiltinFunction extends BuiltinFunction {
+
+    public IncludeBuiltinFunction() {
+        super(Arrays.asList("filename"));
+    }
+
+    @Override
+    public DataContainer evaluate(List<DataContainer> params) throws BorkError {
+        String filename;
+        if (params.size() == 1 && params.get(0).getType() == DataContainer.Type.String) {
+            filename = ((StringDataContainer) params.get(0)).getData();
+        } else {
+            ExceptionManager.raise(BorkError.ExceptionType.GeneralError, -1, "Include argument must be a valid file name string.");
+            return null;
+        }
+
+        String contents = CommandLineArgumentContainer.getInstance().readFileContents(filename);
+
+        if (contents == null) {
+            return null;
+        }
+
+        Pattern pattern = Pattern.compile("include\\s*\\(\\s*\\\"moikka\\\"\\s*\\)", Pattern.DOTALL);
+        Matcher matcher = pattern.matcher(contents);
+        if (matcher.matches()) {
+            ExceptionManager.raise(BorkError.ExceptionType.GeneralError, -1, "Recursive include detected, aborting.");
+            return null;
+        }
+
+        Main.run(contents);
+        return new VoidDataContainer();
+    }
+
+    @Override
+    public String getName() {
+        return "include";
+    }
+}
diff --git a/src/main/com/jantuomi/borker/core/runtime/builtins/OutBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutBuiltinFunction.java
index c76f9c4..e85752b 100644
--- a/src/main/com/jantuomi/borker/core/runtime/builtins/OutBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/OutBuiltinFunction.java
@@ -1,9 +1,8 @@
-package com.jantuomi.borker.core.runtime.builtins;
+package com.jantuomi.tunkki.core.runtime.builtins;
 
-import com.jantuomi.borker.core.parser.datatype.DataContainer;
-import com.jantuomi.borker.core.parser.datatype.VoidDataContainer;
-import com.jantuomi.borker.core.runtime.Function;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.datatype.DataContainer;
+import com.jantuomi.tunkki.core.parser.datatype.VoidDataContainer;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
@@ -11,11 +10,10 @@ import java.util.List;
 /**
  * Created by jan on 21.6.2016.
  */
-public class OutBuiltinFunction extends Function {
+public class OutBuiltinFunction extends BuiltinFunction {
     public OutBuiltinFunction() {
         super(
-                Arrays.asList("expression"),
-                null
+                Arrays.asList("expression")
         );
     }
 
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/Tokenizer.java b/src/main/com/jantuomi/tunkki/core/tokenizer/Tokenizer.java
index a9e46df..12aa270 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/Tokenizer.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/Tokenizer.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.tokenizer;
+package com.jantuomi.tunkki.core.tokenizer;
 
 
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/ArgumentInfo.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/ArgumentInfo.java
index 967b341..5fcec7d 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/ArgumentInfo.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/ArgumentInfo.java
@@ -1,4 +1,4 @@
-package com.jantuomi.borker.core.tokenizer.token;
+package com.jantuomi.tunkki.core.tokenizer.token;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/Token.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/Token.java
index 3b05960..64010cd 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/Token.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/Token.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token;
+package com.jantuomi.tunkki.core.tokenizer.token;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/TokenFactory.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/TokenFactory.java
index 5fa9473..28c6bd2 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/TokenFactory.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/TokenFactory.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.tokenizer.token;
+package com.jantuomi.tunkki.core.tokenizer.token;
 
-import com.jantuomi.borker.core.tokenizer.token.types.*;
+import com.jantuomi.tunkki.core.tokenizer.token.types.*;
 
 /**
  * Created by jan on 28.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/AdditionToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/AdditionToken.java
index 0e98f13..3daa29a 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/AdditionToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/AdditionToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.AdditionNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.AdditionNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/AssignmentToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/AssignmentToken.java
index 42ec2f0..2c9d8ae 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/AssignmentToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/AssignmentToken.java
@@ -1,10 +1,10 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.AssignmentNode;
-import com.jantuomi.borker.core.parser.ast.SymbolNode;
-import com.jantuomi.borker.exception.BorkError;
-import com.jantuomi.borker.exception.ExceptionManager;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.AssignmentNode;
+import com.jantuomi.tunkki.core.parser.ast.SymbolNode;
+import com.jantuomi.tunkki.exception.BorkError;
+import com.jantuomi.tunkki.exception.ExceptionManager;
 
 /**
  * Created by jan on 20.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BinaryOperatorToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BinaryOperatorToken.java
index 207820a..b00ec8b 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BinaryOperatorToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BinaryOperatorToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BlockBodyToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BlockBodyToken.java
index 80a3f9e..9f96d82 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BlockBodyToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BlockBodyToken.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.BlockBodyNode;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.BlockBodyNode;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BooleanLiteralToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BooleanLiteralToken.java
index 4e8510c..371f51b 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BooleanLiteralToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BooleanLiteralToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.BooleanLiteralNode;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.BooleanLiteralNode;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BranchToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BranchToken.java
index 209c1ab..32848f7 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/BranchToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/BranchToken.java
@@ -1,10 +1,10 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.BlockBodyNode;
-import com.jantuomi.borker.core.parser.ast.BranchNode;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.BlockBodyNode;
+import com.jantuomi.tunkki.core.parser.ast.BranchNode;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/ClosedParenToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/ClosedParenToken.java
index 3071aaf..4450818 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/ClosedParenToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/ClosedParenToken.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
 
 /**
  * Created by jan on 19.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/CommentToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/CommentToken.java
index 4908116..f07adae 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/CommentToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/CommentToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.EmptyNode;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.EmptyNode;
 
 /**
  * Created by jan on 19.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/DivisionToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/DivisionToken.java
index 3d52579..3f546ec 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/DivisionToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/DivisionToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.DivisionNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.DivisionNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/DoubleLiteralToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/DoubleLiteralToken.java
index 71da848..4929753 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/DoubleLiteralToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/DoubleLiteralToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.DoubleLiteralNode;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.DoubleLiteralNode;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/EndBlockToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/EndBlockToken.java
index 3a07432..e950dcb 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/EndBlockToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/EndBlockToken.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/FunctionDefineToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/FunctionDefineToken.java
index dae7c67..8fe6e4a 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/FunctionDefineToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/FunctionDefineToken.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.BlockBodyNode;
-import com.jantuomi.borker.core.parser.ast.FunctionDefineNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.BlockBodyNode;
+import com.jantuomi.tunkki.core.parser.ast.FunctionDefineNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/IntegerLiteralToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/IntegerLiteralToken.java
index 1b18373..f8d6dda 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/IntegerLiteralToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/IntegerLiteralToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.IntegerLiteralNode;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.IntegerLiteralNode;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/MultiplicationToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/MultiplicationToken.java
index 8d9d429..8ab3609 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/MultiplicationToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/MultiplicationToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.MultiplicationNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.MultiplicationNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 15.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/NegationToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/NegationToken.java
index 1252e38..7c3d272 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/NegationToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/NegationToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.NegationNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.NegationNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 21.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/OpenParenToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/OpenParenToken.java
index 07469e1..f311f2c 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/OpenParenToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/OpenParenToken.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.ParameterListNode;
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.ParameterListNode;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 19.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/OptionalArgumentToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/OptionalArgumentToken.java
index 8cf41af..42ac3f3 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/OptionalArgumentToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/OptionalArgumentToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/StringLiteralToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/StringLiteralToken.java
index 13135fa..1a38ddd 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/StringLiteralToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/StringLiteralToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.StringLiteralNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.StringLiteralNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 21.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/SubtractionToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/SubtractionToken.java
index 06effcd..aaec39e 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/SubtractionToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/SubtractionToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.SubtractionNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.SubtractionNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/SymbolToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/SymbolToken.java
index 60dd133..978ce1b 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/SymbolToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/SymbolToken.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.ParameterListNode;
-import com.jantuomi.borker.core.parser.ast.SymbolNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.ParameterListNode;
+import com.jantuomi.tunkki.core.parser.ast.SymbolNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 16.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/TerminalToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/TerminalToken.java
index fb943fe..41195e1 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/TerminalToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/TerminalToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/UnaryOperatorToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/UnaryOperatorToken.java
index 7c13ad0..301f8f2 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/UnaryOperatorToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/UnaryOperatorToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/VarargOperatorToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/VarargOperatorToken.java
index fe82a43..9344928 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/VarargOperatorToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/VarargOperatorToken.java
@@ -1,7 +1,7 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.List;
 
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/VariableDeclareToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/VariableDeclareToken.java
index 2d0ff88..d4136d6 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/VariableDeclareToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/VariableDeclareToken.java
@@ -1,9 +1,9 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.parser.ast.SymbolNode;
-import com.jantuomi.borker.core.parser.ast.VariableDeclareNode;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.parser.ast.SymbolNode;
+import com.jantuomi.tunkki.core.parser.ast.VariableDeclareNode;
+import com.jantuomi.tunkki.exception.BorkError;
 
 /**
  * Created by jan on 20.6.2016.
diff --git a/src/main/com/jantuomi/borker/core/tokenizer/token/types/WhitespaceToken.java b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/WhitespaceToken.java
index 7b15e01..2938b45 100644
--- a/src/main/com/jantuomi/borker/core/tokenizer/token/types/WhitespaceToken.java
+++ b/src/main/com/jantuomi/tunkki/core/tokenizer/token/types/WhitespaceToken.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer.token.types;
+package com.jantuomi.tunkki.core.tokenizer.token.types;
 
-import com.jantuomi.borker.core.parser.ast.ASTNode;
-import com.jantuomi.borker.core.tokenizer.token.ArgumentInfo;
-import com.jantuomi.borker.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.parser.ast.ASTNode;
+import com.jantuomi.tunkki.core.tokenizer.token.ArgumentInfo;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/com/jantuomi/borker/exception/BorkError.java b/src/main/com/jantuomi/tunkki/exception/BorkError.java
index a9edb20..6c7c2a1 100644
--- a/src/main/com/jantuomi/borker/exception/BorkError.java
+++ b/src/main/com/jantuomi/tunkki/exception/BorkError.java
@@ -1,4 +1,4 @@
-package com.jantuomi.borker.exception;
+package com.jantuomi.tunkki.exception;
 
 
 import java.util.HashMap;
@@ -14,7 +14,9 @@ public class BorkError extends Exception {
         SyntaxError,
         TypeError,
         ArgumentError,
-        UndeclaredSymbolError
+        UndeclaredSymbolError,
+        IncludeError,
+        GeneralError
     }
 
     public static Map<ExceptionType, String> errorTexts = new HashMap<>();
@@ -25,6 +27,8 @@ public class BorkError extends Exception {
         errorTexts.put(ExceptionType.TypeError, "Incompatible types %s and %s.");
         errorTexts.put(ExceptionType.ArgumentError, "The parameter list given to function %s is either of wrong length or the parameters are of wrong type. Actual: %s");
         errorTexts.put(ExceptionType.UndeclaredSymbolError, "No symbol %s defined, parameters: [%s].");
+        errorTexts.put(ExceptionType.IncludeError, "File %s could not be included.");
+        errorTexts.put(ExceptionType.GeneralError, "%s");
     }
 
     private ExceptionType exceptionType;
@@ -39,7 +43,11 @@ public class BorkError extends Exception {
     private static String formatMessage(String message, int line, String... args) {
 
         message = String.format(message, args);
-        return String.format("\nline %d: ", line) + message;
+        if (line == -1) {
+            return "\n" + message;
+        } else {
+            return String.format("\nline %d: ", line) + message;
+        }
     }
 
     public static String what(ExceptionType type) {
diff --git a/src/main/com/jantuomi/borker/exception/ExceptionManager.java b/src/main/com/jantuomi/tunkki/exception/ExceptionManager.java
index 238c341..7c7a6b5 100644
--- a/src/main/com/jantuomi/borker/exception/ExceptionManager.java
+++ b/src/main/com/jantuomi/tunkki/exception/ExceptionManager.java
@@ -1,4 +1,4 @@
-package com.jantuomi.borker.exception;
+package com.jantuomi.tunkki.exception;
 
 /**
  * Created by jan on 10.6.2016.
diff --git a/src/main/com/jantuomi/borker/utils/Utilities.java b/src/main/com/jantuomi/tunkki/utils/Utilities.java
index 60e221d..f49965f 100644
--- a/src/main/com/jantuomi/borker/utils/Utilities.java
+++ b/src/main/com/jantuomi/tunkki/utils/Utilities.java
@@ -1,4 +1,4 @@
-package com.jantuomi.borker.utils;
+package com.jantuomi.tunkki.utils;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/src/test/com/jantuomi/borker/MainTest.java b/src/test/com/jantuomi/tunkki/MainTest.java
index 6e45892..d76bac1 100644
--- a/src/test/com/jantuomi/borker/MainTest.java
+++ b/src/test/com/jantuomi/tunkki/MainTest.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker;
+package com.jantuomi.tunkki;
 
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.exception.BorkError;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/com/jantuomi/borker/core/CommandLineArgumentContainerTest.java b/src/test/com/jantuomi/tunkki/core/CommandLineArgumentContainerTest.java
index 0bc4c04..437c602 100644
--- a/src/test/com/jantuomi/borker/core/CommandLineArgumentContainerTest.java
+++ b/src/test/com/jantuomi/tunkki/core/CommandLineArgumentContainerTest.java
@@ -1,6 +1,6 @@
-package com.jantuomi.borker.core;
+package com.jantuomi.tunkki.core;
 
-import com.jantuomi.borker.utils.Utilities;
+import com.jantuomi.tunkki.utils.Utilities;
 import org.junit.Test;
 
 import java.io.File;
@@ -15,7 +15,7 @@ public class CommandLineArgumentContainerTest {
     public void getSourceFileContents() throws Exception {
         CommandLineArgumentContainer c = CommandLineArgumentContainer.getInstance();
         File basePath = new File(Utilities.getBasePath());
-        c.setFile(new File(basePath, "src/test/com/jantuomi/borker/resources/test.file"));
+        c.setFile(new File(basePath, "src/test/com/jantuomi/tunkki/resources/test.file"));
         String contents = c.getSourceFileContents();
         System.out.println(contents);
         assertTrue(contents.contains("###"));
diff --git a/src/test/com/jantuomi/borker/core/parser/ParserTest.java b/src/test/com/jantuomi/tunkki/core/parser/ParserTest.java
index 964be76..2e8421d 100644
--- a/src/test/com/jantuomi/borker/core/parser/ParserTest.java
+++ b/src/test/com/jantuomi/tunkki/core/parser/ParserTest.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.parser;
+package com.jantuomi.tunkki.core.parser;
 
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.core.tokenizer.token.types.AdditionToken;
-import com.jantuomi.borker.core.tokenizer.token.types.IntegerLiteralToken;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.types.AdditionToken;
+import com.jantuomi.tunkki.core.tokenizer.token.types.IntegerLiteralToken;
 import org.junit.Test;
 
 import java.util.Arrays;
diff --git a/src/test/com/jantuomi/borker/core/tokenizer/TokenizerTest.java b/src/test/com/jantuomi/tunkki/core/tokenizer/TokenizerTest.java
index 7f07e67..dff1e96 100644
--- a/src/test/com/jantuomi/borker/core/tokenizer/TokenizerTest.java
+++ b/src/test/com/jantuomi/tunkki/core/tokenizer/TokenizerTest.java
@@ -1,8 +1,8 @@
-package com.jantuomi.borker.core.tokenizer;
+package com.jantuomi.tunkki.core.tokenizer;
 
-import com.jantuomi.borker.core.tokenizer.token.Token;
-import com.jantuomi.borker.core.tokenizer.token.types.IntegerLiteralToken;
-import com.jantuomi.borker.exception.BorkError;
+import com.jantuomi.tunkki.core.tokenizer.token.Token;
+import com.jantuomi.tunkki.core.tokenizer.token.types.IntegerLiteralToken;
+import com.jantuomi.tunkki.exception.BorkError;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/src/test/com/jantuomi/borker/resources/funcdef.bork b/src/test/com/jantuomi/tunkki/resources/funcdef.bork
index 8412129..8412129 100644
--- a/src/test/com/jantuomi/borker/resources/funcdef.bork
+++ b/src/test/com/jantuomi/tunkki/resources/funcdef.bork
diff --git a/src/test/com/jantuomi/borker/resources/program.bork b/src/test/com/jantuomi/tunkki/resources/program.bork
index 7034625..7034625 100644
--- a/src/test/com/jantuomi/borker/resources/program.bork
+++ b/src/test/com/jantuomi/tunkki/resources/program.bork
diff --git a/src/test/com/jantuomi/borker/resources/test.file b/src/test/com/jantuomi/tunkki/resources/test.file
index 3b723c0..3b723c0 100644
--- a/src/test/com/jantuomi/borker/resources/test.file
+++ b/src/test/com/jantuomi/tunkki/resources/test.file