diff --git a/include/components/tilestreamer.hpp b/include/components/tilestream.hpp
similarity index 100%
rename from include/components/tilestreamer.hpp
rename to include/components/tilestream.hpp
diff --git a/include/implem/tilestreamer.inl b/include/implem/tilestream.inl
similarity index 100%
rename from include/implem/tilestreamer.inl
rename to include/implem/tilestream.inl
diff --git a/include/implem/asciimap_parser.hpp b/src/asciimap_parser.hpp
similarity index 100%
rename from include/implem/asciimap_parser.hpp
rename to src/asciimap_parser.hpp
diff --git a/src/doorkeeper.cpp b/test/doorkeeper.cpp
similarity index 100%
rename from src/doorkeeper.cpp
rename to test/doorkeeper.cpp
diff --git a/src/doorkeeperConfig.h.in b/test/doorkeepertestConfig.h.in
similarity index 100%
rename from src/doorkeeperConfig.h.in
rename to test/doorkeepertestConfig.h.in
diff --git a/src/main.cpp b/test/main.cpp
similarity index 100%
rename from src/main.cpp
rename to test/main.cpp
diff --git a/src/platform.h b/test/platform.h
similarity index 100%
rename from src/platform.h
rename to test/platform.h
diff --git a/src/platformstrings.h b/test/platformstrings.h
similarity index 100%
rename from src/platformstrings.h
rename to test/platformstrings.h