diff --git a/Makefile b/Makefile
index 86df6a6..5e75d76 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ CXXFLAGS += -std=c++17 -g3 -ggdb -O0 \
             -Wall -Wextra -pedantic -Werror \
             -fno-exceptions -fno-rtti #-fstack-usage
 
-CXXFILES := corewords.cpp dictionary.cpp parser.cpp state.cpp
+CXXFILES := $(wildcard libalee/*.cpp)
 OBJFILES := $(subst .cpp,.o,$(CXXFILES))
-LIBFILE := libalee.a
+LIBFILE := libalee/libalee.a
 
 all: alee
 
diff --git a/alee.hpp b/alee.hpp
index f091cf8..87991bb 100644
--- a/alee.hpp
+++ b/alee.hpp
@@ -1,3 +1,3 @@
-#include "parser.hpp"
-#include "state.hpp"
+#include "libalee/parser.hpp"
+#include "libalee/state.hpp"
 
diff --git a/corewords.cpp b/libalee/corewords.cpp
similarity index 100%
rename from corewords.cpp
rename to libalee/corewords.cpp
diff --git a/corewords.hpp b/libalee/corewords.hpp
similarity index 100%
rename from corewords.hpp
rename to libalee/corewords.hpp
diff --git a/dictionary.cpp b/libalee/dictionary.cpp
similarity index 100%
rename from dictionary.cpp
rename to libalee/dictionary.cpp
diff --git a/dictionary.hpp b/libalee/dictionary.hpp
similarity index 100%
rename from dictionary.hpp
rename to libalee/dictionary.hpp
diff --git a/parser.cpp b/libalee/parser.cpp
similarity index 100%
rename from parser.cpp
rename to libalee/parser.cpp
diff --git a/parser.hpp b/libalee/parser.hpp
similarity index 100%
rename from parser.hpp
rename to libalee/parser.hpp
diff --git a/state.cpp b/libalee/state.cpp
similarity index 100%
rename from state.cpp
rename to libalee/state.cpp
diff --git a/state.hpp b/libalee/state.hpp
similarity index 100%
rename from state.hpp
rename to libalee/state.hpp
diff --git a/types.hpp b/libalee/types.hpp
similarity index 100%
rename from types.hpp
rename to libalee/types.hpp
diff --git a/memdict.hpp b/memdict.hpp
index c8ccce0..398af0f 100644
--- a/memdict.hpp
+++ b/memdict.hpp
@@ -19,7 +19,7 @@
 #ifndef ALEEFORTH_MEMDICT_HPP
 #define ALEEFORTH_MEMDICT_HPP
 
-#include "dictionary.hpp"
+#include "alee.hpp"
 
 #ifndef MEMDICTSIZE
 #define MEMDICTSIZE (65536)
diff --git a/splitmemdict.hpp b/splitmemdict.hpp
index 083ce53..6631947 100644
--- a/splitmemdict.hpp
+++ b/splitmemdict.hpp
@@ -19,7 +19,7 @@
 #ifndef ALEEFORTH_SPLITMEMDICT_HPP
 #define ALEEFORTH_SPLITMEMDICT_HPP
 
-#include "dictionary.hpp"
+#include "alee.hpp"
 
 #include <cstring>