diff --git a/Makefile b/Makefile
index ff48a726..2df942a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 OSTD_PATH = ../octastd
 
 LIBCS_CXXFLAGS = \
-	-std=c++14 -Wall -Wextra -Wshadow -Wold-style-cast -I. -g \
+	-std=c++14 -Wall -Wextra -Wshadow -Wold-style-cast -Iinclude -Isrc -g \
 	-fvisibility=hidden -I$(OSTD_PATH)
 
 LIBCS_LDFLAGS = -shared
 
 LIBCS_OBJ = \
-	cubescript.o \
-	cs_gen.o \
-	cs_vm.o \
-	cs_val.o \
-	cs_util.o \
-	lib_str.o \
-	lib_math.o \
-	lib_list.o
+	src/cubescript.o \
+	src/cs_gen.o \
+	src/cs_vm.o \
+	src/cs_val.o \
+	src/cs_util.o \
+	src/lib_str.o \
+	src/lib_math.o \
+	src/lib_list.o
 
 LIBCS_LIB = libcubescript.a
 
@@ -34,7 +34,7 @@ repl: $(LIBCS_LIB) tools/repl.cc tools/linenoise.cc tools/linenoise.hh
 	tools/linenoise.cc tools/repl.cc -o repl $(LIBCS_LIB)
 
 clean:
-	rm -f $(LIBCS_LIB) $(LIBCS_OBJ)
+	rm -f $(LIBCS_LIB) $(LIBCS_OBJ) repl
 
 cubescript.o: cubescript.hh cubescript_conf.hh cs_vm.hh
 cs_gen.o: cubescript.hh cubescript_conf.hh cs_vm.hh cs_util.hh
diff --git a/cubescript.hh b/include/cubescript/cubescript.hh
similarity index 100%
rename from cubescript.hh
rename to include/cubescript/cubescript.hh
diff --git a/cubescript_conf.hh b/include/cubescript/cubescript_conf.hh
similarity index 100%
rename from cubescript_conf.hh
rename to include/cubescript/cubescript_conf.hh
diff --git a/cs_gen.cc b/src/cs_gen.cc
similarity index 99%
rename from cs_gen.cc
rename to src/cs_gen.cc
index 2b3f9d33..f436a24c 100644
--- a/cs_gen.cc
+++ b/src/cs_gen.cc
@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 #include "cs_util.hh"
 
diff --git a/cs_util.cc b/src/cs_util.cc
similarity index 99%
rename from cs_util.cc
rename to src/cs_util.cc
index dc4dff18..62d7f552 100644
--- a/cs_util.cc
+++ b/src/cs_util.cc
@@ -1,4 +1,4 @@
-#include "cubescript_conf.hh"
+#include "cubescript/cubescript_conf.hh"
 #include "cs_util.hh"
 
 #include <ctype.h>
diff --git a/cs_util.hh b/src/cs_util.hh
similarity index 100%
rename from cs_util.hh
rename to src/cs_util.hh
diff --git a/cs_val.cc b/src/cs_val.cc
similarity index 99%
rename from cs_val.cc
rename to src/cs_val.cc
index f6018154..aa538864 100644
--- a/cs_val.cc
+++ b/src/cs_val.cc
@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 #include "cs_util.hh"
 
diff --git a/cs_vm.cc b/src/cs_vm.cc
similarity index 99%
rename from cs_vm.cc
rename to src/cs_vm.cc
index 879a027e..e7ff0e3d 100644
--- a/cs_vm.cc
+++ b/src/cs_vm.cc
@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 #include "cs_util.hh"
 
diff --git a/cs_vm.hh b/src/cs_vm.hh
similarity index 99%
rename from cs_vm.hh
rename to src/cs_vm.hh
index f57ceda9..fcb6ba4f 100644
--- a/cs_vm.hh
+++ b/src/cs_vm.hh
@@ -1,7 +1,7 @@
 #ifndef LIBCUBESCRIPT_CS_VM_HH
 #define LIBCUBESCRIPT_CS_VM_HH
 
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 
 #include <stdlib.h>
 
diff --git a/cubescript.cc b/src/cubescript.cc
similarity index 99%
rename from cubescript.cc
rename to src/cubescript.cc
index bb5eb6ea..5b340afc 100644
--- a/cubescript.cc
+++ b/src/cubescript.cc
@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_vm.hh"
 
 namespace cscript {
diff --git a/lib_list.cc b/src/lib_list.cc
similarity index 99%
rename from lib_list.cc
rename to src/lib_list.cc
index ae77fa64..8856de2c 100644
--- a/lib_list.cc
+++ b/src/lib_list.cc
@@ -1,4 +1,4 @@
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 #include "cs_util.hh"
 
 namespace cscript {
diff --git a/lib_math.cc b/src/lib_math.cc
similarity index 99%
rename from lib_math.cc
rename to src/lib_math.cc
index 0a79a02a..d5be1877 100644
--- a/lib_math.cc
+++ b/src/lib_math.cc
@@ -3,7 +3,7 @@
 
 #include <ostd/functional.hh>
 
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 
 namespace cscript {
 
diff --git a/lib_str.cc b/src/lib_str.cc
similarity index 99%
rename from lib_str.cc
rename to src/lib_str.cc
index 89bad7b4..2d94f313 100644
--- a/lib_str.cc
+++ b/src/lib_str.cc
@@ -1,6 +1,6 @@
 #include <ostd/functional.hh>
 
-#include "cubescript.hh"
+#include "cubescript/cubescript.hh"
 
 namespace cscript {
 
diff --git a/tools/repl.cc b/tools/repl.cc
index 565bac9b..175958ec 100644
--- a/tools/repl.cc
+++ b/tools/repl.cc
@@ -5,7 +5,7 @@
 #include <ostd/string.hh>
 #include <ostd/maybe.hh>
 
-#include <cubescript.hh>
+#include <cubescript/cubescript.hh>
 
 using namespace cscript;
 
@@ -157,9 +157,9 @@ static CsCommand *get_hint_cmd(ostd::ConstCharRange buf) {
 }
 #endif /* CS_REPL_HAS_HINTS */
 
-#include "tools/edit_linenoise.hh"
-#include "tools/edit_readline.hh"
-#include "tools/edit_fallback.hh"
+#include "edit_linenoise.hh"
+#include "edit_readline.hh"
+#include "edit_fallback.hh"
 
 /* usage */