diff --git a/data_structures/Coordinate.cpp b/DataStructures/coordinate.cpp
similarity index 100%
rename from data_structures/Coordinate.cpp
rename to DataStructures/coordinate.cpp
diff --git a/Include/osrm/Coordinate.h b/Include/osrm/coordinate.hpp
similarity index 100%
rename from Include/osrm/Coordinate.h
rename to Include/osrm/coordinate.hpp
diff --git a/data_structures/json_container.hpp b/Include/osrm/json_container.hpp
similarity index 100%
rename from data_structures/json_container.hpp
rename to Include/osrm/json_container.hpp
diff --git a/Include/osrm/RouteParameters.h b/Include/osrm/route_parameters.hpp
similarity index 100%
rename from Include/osrm/RouteParameters.h
rename to Include/osrm/route_parameters.hpp
diff --git a/Include/osrm/ServerPaths.h b/Include/osrm/server_paths.hpp
similarity index 100%
rename from Include/osrm/ServerPaths.h
rename to Include/osrm/server_paths.hpp
diff --git a/third_party/variant/optional.hpp b/Include/variant/optional.hpp
similarity index 100%
rename from third_party/variant/optional.hpp
rename to Include/variant/optional.hpp
diff --git a/third_party/variant/recursive_wrapper.hpp b/Include/variant/recursive_wrapper.hpp
similarity index 100%
rename from third_party/variant/recursive_wrapper.hpp
rename to Include/variant/recursive_wrapper.hpp
diff --git a/third_party/variant/variant.hpp b/Include/variant/variant.hpp
similarity index 100%
rename from third_party/variant/variant.hpp
rename to Include/variant/variant.hpp
diff --git a/Include/osrm/Header.h b/Server/Http/Header.h
similarity index 100%
rename from Include/osrm/Header.h
rename to Server/Http/Header.h
diff --git a/Include/osrm/Reply.h b/Server/Http/Reply.h
similarity index 100%
rename from Include/osrm/Reply.h
rename to Server/Http/Reply.h