diff --git a/Makefile b/interpreter/Makefile
similarity index 100%
rename from Makefile
rename to interpreter/Makefile
diff --git a/base.h b/interpreter/base.h
similarity index 100%
rename from base.h
rename to interpreter/base.h
diff --git a/interpreter/core_methods.c b/interpreter/interpreter/core_methods.c
similarity index 100%
rename from interpreter/core_methods.c
rename to interpreter/interpreter/core_methods.c
diff --git a/interpreter/core_methods.h b/interpreter/interpreter/core_methods.h
similarity index 100%
rename from interpreter/core_methods.h
rename to interpreter/interpreter/core_methods.h
diff --git a/interpreter/interpreter.c b/interpreter/interpreter/interpreter.c
similarity index 100%
rename from interpreter/interpreter.c
rename to interpreter/interpreter/interpreter.c
diff --git a/interpreter/interpreter.h b/interpreter/interpreter/interpreter.h
similarity index 100%
rename from interpreter/interpreter.h
rename to interpreter/interpreter/interpreter.h
diff --git a/interpreter/interpreter/test/Makefile b/interpreter/interpreter/test/Makefile
new file mode 100644
index 0000000..6703b38
--- /dev/null
+++ b/interpreter/interpreter/test/Makefile
@@ -0,0 +1,14 @@
+CC=gcc
+
+all: test_interpreter
+
+interpreter: clean
+	$(CC) -g ../../stack.c ../interpreter.c ../core_methods.c ../../method_dispatcher/method_dispatcher.c test_interpreter.c -o interpreter
+
+test_interpreter: interpreter
+	valgrind ./interpreter
+
+
+
+clean:
+
diff --git a/interpreter/test/test_interpreter.c b/interpreter/interpreter/test/test_interpreter.c
similarity index 100%
rename from interpreter/test/test_interpreter.c
rename to interpreter/interpreter/test/test_interpreter.c
diff --git a/method_dispatcher/method_dispatcher.c b/interpreter/method_dispatcher/method_dispatcher.c
similarity index 100%
rename from method_dispatcher/method_dispatcher.c
rename to interpreter/method_dispatcher/method_dispatcher.c
diff --git a/method_dispatcher/method_dispatcher.h b/interpreter/method_dispatcher/method_dispatcher.h
similarity index 100%
rename from method_dispatcher/method_dispatcher.h
rename to interpreter/method_dispatcher/method_dispatcher.h
diff --git a/method_dispatcher/test/Makefile b/interpreter/method_dispatcher/test/Makefile
similarity index 100%
rename from method_dispatcher/test/Makefile
rename to interpreter/method_dispatcher/test/Makefile
diff --git a/method_dispatcher/test/test_method_dispatcher.c b/interpreter/method_dispatcher/test/test_method_dispatcher.c
similarity index 100%
rename from method_dispatcher/test/test_method_dispatcher.c
rename to interpreter/method_dispatcher/test/test_method_dispatcher.c
diff --git a/stack.c b/interpreter/stack.c
similarity index 100%
rename from stack.c
rename to interpreter/stack.c
diff --git a/stack.h b/interpreter/stack.h
similarity index 100%
rename from stack.h
rename to interpreter/stack.h
diff --git a/interpreter/test/Makefile b/interpreter/test/Makefile
index 6703b38..a90518d 100644
--- a/interpreter/test/Makefile
+++ b/interpreter/test/Makefile
@@ -1,14 +1,12 @@
 CC=gcc
 
-all: test_interpreter
-
-interpreter: clean
-	$(CC) -g ../../stack.c ../interpreter.c ../core_methods.c ../../method_dispatcher/method_dispatcher.c test_interpreter.c -o interpreter
-
-test_interpreter: interpreter
-	valgrind ./interpreter
+all: test_stack
 
+stack: clean
+	$(CC) -g ../stack.c test_stack.c -o stack
 
+test_stack: stack
+	valgrind ./stack
 
 clean:
-
+	-rm stack
diff --git a/test/test_stack.c b/interpreter/test/test_stack.c
similarity index 100%
rename from test/test_stack.c
rename to interpreter/test/test_stack.c
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index a90518d..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-CC=gcc
-
-all: test_stack
-
-stack: clean
-	$(CC) -g ../stack.c test_stack.c -o stack
-
-test_stack: stack
-	valgrind ./stack
-
-clean:
-	-rm stack