diff --git a/include/components/layer.hpp b/include/doorkeeper/components/layer.hpp
similarity index 87%
rename from include/components/layer.hpp
rename to include/doorkeeper/components/layer.hpp
index caf4c87..2994754 100644
--- a/include/components/layer.hpp
+++ b/include/doorkeeper/components/layer.hpp
@@ -1,10 +1,10 @@
 #ifndef idD3EDC396AA314474B3D909559FFC0247
 #define idD3EDC396AA314474B3D909559FFC0247
 
-#include "primitivetypes.hpp"
-#include "components/tileiterator.hpp"
-#include "components/tilemapdata.hpp"
-#include "implem/helpers.hpp"
+#include "doorkeeper/primitivetypes.hpp"
+#include "doorkeeper/components/tileiterator.hpp"
+#include "doorkeeper/components/tilemapdata.hpp"
+#include "doorkeeper/implem/helpers.hpp"
 #include <algorithm>
 #include <vector>
 #include <memory>
@@ -64,6 +64,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/layer.inl"
+#include "doorkeeper/implem/layer.inl"
 
 #endif
diff --git a/include/components/tileiterator.hpp b/include/doorkeeper/components/tileiterator.hpp
similarity index 95%
rename from include/components/tileiterator.hpp
rename to include/doorkeeper/components/tileiterator.hpp
index 12e2df8..a190fed 100644
--- a/include/components/tileiterator.hpp
+++ b/include/doorkeeper/components/tileiterator.hpp
@@ -1,8 +1,8 @@
 #ifndef id873715F57B504CCF8227CE03EA28CAFA
 #define id873715F57B504CCF8227CE03EA28CAFA
 
-#include "primitivetypes.hpp"
-#include "implem/helpers.hpp"
+#include "doorkeeper/primitivetypes.hpp"
+#include "doorkeeper/implem/helpers.hpp"
 #include <boost/iterator/iterator_facade.hpp>
 #include <iterator>
 #include <vector>
@@ -73,6 +73,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/tileiterator.inl"
+#include "doorkeeper/implem/tileiterator.inl"
 
 #endif
diff --git a/include/components/tilemapdata.hpp b/include/doorkeeper/components/tilemapdata.hpp
similarity index 71%
rename from include/components/tilemapdata.hpp
rename to include/doorkeeper/components/tilemapdata.hpp
index 376f5e0..ef5fd6d 100644
--- a/include/components/tilemapdata.hpp
+++ b/include/doorkeeper/components/tilemapdata.hpp
@@ -1,11 +1,11 @@
 #ifndef id8F5106DFABC14263ADF235C56E434207
 #define id8F5106DFABC14263ADF235C56E434207
 
-#include "primitivetypes.hpp"
-#include "implem/compatibility.h"
-#include "implem/vector.hpp"
-#include "implem/helpers.hpp"
-#include "mapreaders/mapstreambase.hpp"
+#include "doorkeeper/primitivetypes.hpp"
+#include "doorkeeper/implem/compatibility.h"
+#include "doorkeeper/implem/vector.hpp"
+#include "doorkeeper/implem/helpers.hpp"
+#include "doorkeeper/mapreaders/mapstreambase.hpp"
 #include <cstddef>
 #include <iterator>
 #include <memory>
@@ -29,6 +29,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/tilemapdata.inl"
+#include "doorkeeper/implem/tilemapdata.inl"
 
 #endif
diff --git a/include/components/tyler.hpp b/include/doorkeeper/components/tyler.hpp
similarity index 92%
rename from include/components/tyler.hpp
rename to include/doorkeeper/components/tyler.hpp
index bd4b319..1d1b427 100644
--- a/include/components/tyler.hpp
+++ b/include/doorkeeper/components/tyler.hpp
@@ -1,7 +1,7 @@
 #ifndef id6FB3FC97331449038D42AAAB4C01ABA1
 #define id6FB3FC97331449038D42AAAB4C01ABA1
 
-#include "components/layer.hpp"
+#include "doorkeeper/components/layer.hpp"
 #include <vector>
 #include <cassert>
 #include <ciso646>
@@ -39,6 +39,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/tyler.inl"
+#include "doorkeeper/implem/tyler.inl"
 
 #endif
diff --git a/include/components/viewport.hpp b/include/doorkeeper/components/viewport.hpp
similarity index 89%
rename from include/components/viewport.hpp
rename to include/doorkeeper/components/viewport.hpp
index c0fc65b..2a91c7b 100644
--- a/include/components/viewport.hpp
+++ b/include/doorkeeper/components/viewport.hpp
@@ -1,9 +1,9 @@
 #ifndef id0ADBCC15BA574485BF3267254090D99B
 #define id0ADBCC15BA574485BF3267254090D99B
 
-#include "primitivetypes.hpp"
-#include "components/tileiterator.hpp"
-#include "components/layer.hpp"
+#include "doorkeeper/primitivetypes.hpp"
+#include "doorkeeper/components/tileiterator.hpp"
+#include "doorkeeper/components/layer.hpp"
 
 namespace dk {
 	template <size_t D>
@@ -49,6 +49,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/viewport.inl"
+#include "doorkeeper/implem/viewport.inl"
 
 #endif
diff --git a/include/doorkeeper.hpp b/include/doorkeeper/doorkeeper.hpp
similarity index 100%
rename from include/doorkeeper.hpp
rename to include/doorkeeper/doorkeeper.hpp
diff --git a/include/helpers/asciimapsource.hpp b/include/doorkeeper/helpers/asciimapsource.hpp
similarity index 94%
rename from include/helpers/asciimapsource.hpp
rename to include/doorkeeper/helpers/asciimapsource.hpp
index 7e85d08..88904b5 100644
--- a/include/helpers/asciimapsource.hpp
+++ b/include/doorkeeper/helpers/asciimapsource.hpp
@@ -1,8 +1,8 @@
 #ifndef id263B7DAF9A1C40BB8517D5D328DF8A1B
 #define id263B7DAF9A1C40BB8517D5D328DF8A1B
 
-#include "primitivetypes.hpp"
-#include "implem/vector.hpp"
+#include "doorkeeper/primitivetypes.hpp"
+#include "doorkeeper/implem/vector.hpp"
 #include <streambuf>
 #include <vector>
 #include <boost/iostreams/categories.hpp>  // source_tag
diff --git a/include/implem/compatibility.h b/include/doorkeeper/implem/compatibility.h
similarity index 100%
rename from include/implem/compatibility.h
rename to include/doorkeeper/implem/compatibility.h
diff --git a/include/implem/configuration.h b/include/doorkeeper/implem/configuration.h
similarity index 100%
rename from include/implem/configuration.h
rename to include/doorkeeper/implem/configuration.h
diff --git a/include/implem/helpers.hpp b/include/doorkeeper/implem/helpers.hpp
similarity index 87%
rename from include/implem/helpers.hpp
rename to include/doorkeeper/implem/helpers.hpp
index e1d3eba..9c9cf13 100644
--- a/include/implem/helpers.hpp
+++ b/include/doorkeeper/implem/helpers.hpp
@@ -8,6 +8,6 @@ namespace dk {
 	} //namespace implem
 } //namespace dk
 
-#include "implem/helpers.inl"
+#include "doorkeeper/implem/helpers.inl"
 
 #endif
diff --git a/include/implem/helpers.inl b/include/doorkeeper/implem/helpers.inl
similarity index 100%
rename from include/implem/helpers.inl
rename to include/doorkeeper/implem/helpers.inl
diff --git a/include/implem/layer.inl b/include/doorkeeper/implem/layer.inl
similarity index 100%
rename from include/implem/layer.inl
rename to include/doorkeeper/implem/layer.inl
diff --git a/include/implem/mapstreambase.inl b/include/doorkeeper/implem/mapstreambase.inl
similarity index 100%
rename from include/implem/mapstreambase.inl
rename to include/doorkeeper/implem/mapstreambase.inl
diff --git a/include/implem/mapstreamraw.inl b/include/doorkeeper/implem/mapstreamraw.inl
similarity index 100%
rename from include/implem/mapstreamraw.inl
rename to include/doorkeeper/implem/mapstreamraw.inl
diff --git a/include/implem/tileiterator.inl b/include/doorkeeper/implem/tileiterator.inl
similarity index 100%
rename from include/implem/tileiterator.inl
rename to include/doorkeeper/implem/tileiterator.inl
diff --git a/include/implem/tilemapdata.inl b/include/doorkeeper/implem/tilemapdata.inl
similarity index 100%
rename from include/implem/tilemapdata.inl
rename to include/doorkeeper/implem/tilemapdata.inl
diff --git a/include/implem/tyler.inl b/include/doorkeeper/implem/tyler.inl
similarity index 100%
rename from include/implem/tyler.inl
rename to include/doorkeeper/implem/tyler.inl
diff --git a/include/implem/vector.hpp b/include/doorkeeper/implem/vector.hpp
similarity index 100%
rename from include/implem/vector.hpp
rename to include/doorkeeper/implem/vector.hpp
diff --git a/include/implem/vector.inl b/include/doorkeeper/implem/vector.inl
similarity index 100%
rename from include/implem/vector.inl
rename to include/doorkeeper/implem/vector.inl
diff --git a/include/implem/viewport.inl b/include/doorkeeper/implem/viewport.inl
similarity index 100%
rename from include/implem/viewport.inl
rename to include/doorkeeper/implem/viewport.inl
diff --git a/include/mapreaders/mapstreambase.hpp b/include/doorkeeper/mapreaders/mapstreambase.hpp
similarity index 86%
rename from include/mapreaders/mapstreambase.hpp
rename to include/doorkeeper/mapreaders/mapstreambase.hpp
index 1aae5bb..c9c7ba5 100644
--- a/include/mapreaders/mapstreambase.hpp
+++ b/include/doorkeeper/mapreaders/mapstreambase.hpp
@@ -1,8 +1,8 @@
 #ifndef id3CAE7A32F0C3428EA125F91D261C0029
 #define id3CAE7A32F0C3428EA125F91D261C0029
 
-#include "primitivetypes.hpp"
-#include "implem/vector.hpp"
+#include "doorkeeper/primitivetypes.hpp"
+#include "doorkeeper/implem/vector.hpp"
 #include <cstddef>
 
 namespace dk {
@@ -27,6 +27,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/mapstreambase.inl"
+#include "doorkeeper/implem/mapstreambase.inl"
 
 #endif
diff --git a/include/mapreaders/mapstreamraw.hpp b/include/doorkeeper/mapreaders/mapstreamraw.hpp
similarity index 93%
rename from include/mapreaders/mapstreamraw.hpp
rename to include/doorkeeper/mapreaders/mapstreamraw.hpp
index 542ca1f..5399f94 100644
--- a/include/mapreaders/mapstreamraw.hpp
+++ b/include/doorkeeper/mapreaders/mapstreamraw.hpp
@@ -1,8 +1,8 @@
 #ifndef id56E2396E102B4E10B20466D6B57A4C66
 #define id56E2396E102B4E10B20466D6B57A4C66
 
-#include "mapreaders/mapstreambase.hpp"
-#include "implem/helpers.hpp"
+#include "doorkeeper/mapreaders/mapstreambase.hpp"
+#include "doorkeeper/implem/helpers.hpp"
 #include <cstddef>
 #include <algorithm>
 #include <type_traits>
@@ -60,6 +60,6 @@ namespace dk {
 	};
 } //namespace dk
 
-#include "implem/mapstreamraw.inl"
+#include "doorkeeper/implem/mapstreamraw.inl"
 
 #endif
diff --git a/include/primitivetypes.hpp b/include/doorkeeper/primitivetypes.hpp
similarity index 100%
rename from include/primitivetypes.hpp
rename to include/doorkeeper/primitivetypes.hpp
diff --git a/src/asciimapsource.cpp b/src/asciimapsource.cpp
index 1c0ad2c..ce009b0 100644
--- a/src/asciimapsource.cpp
+++ b/src/asciimapsource.cpp
@@ -1,5 +1,5 @@
-#include "helpers/asciimapsource.hpp"
-#include "implem/compatibility.h"
+#include "doorkeeper/helpers/asciimapsource.hpp"
+#include "doorkeeper/implem/compatibility.h"
 #include "asciimap_parser.hpp"
 #include <fstream>
 #include <iomanip>
diff --git a/test/doorkeeper.cpp b/test/doorkeeper.cpp
index 2be279d..7d65ce9 100644
--- a/test/doorkeeper.cpp
+++ b/test/doorkeeper.cpp
@@ -1 +1 @@
-#include "doorkeeper.hpp"
+#include "doorkeeper/doorkeeper.hpp"
diff --git a/test/main.cpp b/test/main.cpp
index dc5dd19..c5988ab 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,9 +1,9 @@
-#include "doorkeeper.hpp"
+#include "doorkeeper/doorkeeper.hpp"
 #include "doorkeepertestConfig.h"
 #include "platform.h"
 #include "platformstrings.h"
-#include "helpers/asciimapsource.hpp"
-#include "mapreaders/mapstreamraw.hpp"
+#include "doorkeeper/helpers/asciimapsource.hpp"
+#include "doorkeeper/mapreaders/mapstreamraw.hpp"
 #include <iostream>
 #include <fstream>
 #include <string>