diff --git a/makefile b/makefile
index ff3d3fd..1550e90 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,7 @@ ifeq ($(OS),Windows_NT)
 	WINDOWS::=1
 endif
 
-SOURCE_DIRS::=rexy
+SOURCE_DIRS::=rexy/src
 SOURCES::=
 OBJDIR::=obj
 DEPDIR::=$(OBJDIR)/dep
diff --git a/rexy/binary.hpp b/rexy/include/binary.hpp
similarity index 100%
rename from rexy/binary.hpp
rename to rexy/include/binary.hpp
diff --git a/rexy/detail/binary_string_conv.hpp b/rexy/include/detail/binary_string_conv.hpp
similarity index 100%
rename from rexy/detail/binary_string_conv.hpp
rename to rexy/include/detail/binary_string_conv.hpp
diff --git a/rexy/detail/default_allocator.hpp b/rexy/include/detail/default_allocator.hpp
similarity index 100%
rename from rexy/detail/default_allocator.hpp
rename to rexy/include/detail/default_allocator.hpp
diff --git a/rexy/detail/util.hpp b/rexy/include/detail/util.hpp
similarity index 100%
rename from rexy/detail/util.hpp
rename to rexy/include/detail/util.hpp
diff --git a/rexy/filerd.hpp b/rexy/include/filerd.hpp
similarity index 100%
rename from rexy/filerd.hpp
rename to rexy/include/filerd.hpp
diff --git a/rexy/string.hpp b/rexy/include/string.hpp
similarity index 100%
rename from rexy/string.hpp
rename to rexy/include/string.hpp
diff --git a/rexy/string_base.hpp b/rexy/include/string_base.hpp
similarity index 100%
rename from rexy/string_base.hpp
rename to rexy/include/string_base.hpp
diff --git a/rexy/string_base.tpp b/rexy/include/string_base.tpp
similarity index 100%
rename from rexy/string_base.tpp
rename to rexy/include/string_base.tpp
diff --git a/rexy/binary.cpp b/rexy/src/binary.cpp
similarity index 96%
rename from rexy/binary.cpp
rename to rexy/src/binary.cpp
index 4cb340f..c55b0e0 100644
--- a/rexy/binary.cpp
+++ b/rexy/src/binary.cpp
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "binary.hpp"
+#include "rexy/include/binary.hpp"
 
 namespace rexy{
 
diff --git a/rexy/filerd.cpp b/rexy/src/filerd.cpp
similarity index 98%
rename from rexy/filerd.cpp
rename to rexy/src/filerd.cpp
index bd5ed0b..6f1e56e 100644
--- a/rexy/filerd.cpp
+++ b/rexy/src/filerd.cpp
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "filerd.hpp"
+#include "rexy/include/filerd.hpp"
 
 #include <cstdio> //fopen, fclose
 #include <utility> //exchange, swap
diff --git a/rexy/string_base.cpp b/rexy/src/string_base.cpp
similarity index 97%
rename from rexy/string_base.cpp
rename to rexy/src/string_base.cpp
index d03b04c..5d0375d 100644
--- a/rexy/string_base.cpp
+++ b/rexy/src/string_base.cpp
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "string_base.hpp"
+#include "rexy/include/string_base.hpp"
 
 #include <utility> //exchange, swap
 #include <cstdlib> //memcpy