diff --git a/Bench.java b/Bench.java
index 55d9087..02e45df 100644
--- a/Bench.java
+++ b/Bench.java
@@ -1,3 +1,5 @@
+import core.Interpreter;
+
 public class Bench {
 	public static void main(String[] args) throws Exception {
 		Interpreter i = new Interpreter();
diff --git a/Repl.java b/Repl.java
index 86f4aaf..1fd160d 100644
--- a/Repl.java
+++ b/Repl.java
@@ -1,4 +1,7 @@
 import java.util.Scanner;
+
+import core.Interpreter;
+
 import java.util.NoSuchElementException;
 
 /**
diff --git a/Runner.java b/Runner.java
index 99b187e..6fa1ced 100644
--- a/Runner.java
+++ b/Runner.java
@@ -3,6 +3,8 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import core.Interpreter;
+
 /**
  * @author William Rågstad <william.ragstad@gmail.com>
  * @version 0.1.0
diff --git a/Interpreter.java b/core/Interpreter.java
similarity index 99%
rename from Interpreter.java
rename to core/Interpreter.java
index 272c601..f28eead 100644
--- a/Interpreter.java
+++ b/core/Interpreter.java
@@ -1,9 +1,8 @@
+package core;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Scanner;
-import java.util.function.Function;
-
-import core.*;
 
 /**
  * @author Mikail Khan <mikail@mikail-khan.com> & William Rågstad