diff --git a/include/opendrive_arc.h b/include/opendrive/opendrive_arc.h similarity index 100% rename from include/opendrive_arc.h rename to include/opendrive/opendrive_arc.h diff --git a/include/opendrive_common.h b/include/opendrive/opendrive_common.h similarity index 100% rename from include/opendrive_common.h rename to include/opendrive/opendrive_common.h diff --git a/include/opendrive_geometry.h b/include/opendrive/opendrive_geometry.h similarity index 100% rename from include/opendrive_geometry.h rename to include/opendrive/opendrive_geometry.h diff --git a/include/opendrive_junction.h b/include/opendrive/opendrive_junction.h similarity index 100% rename from include/opendrive_junction.h rename to include/opendrive/opendrive_junction.h diff --git a/include/opendrive_lane.h b/include/opendrive/opendrive_lane.h similarity index 100% rename from include/opendrive_lane.h rename to include/opendrive/opendrive_lane.h diff --git a/include/opendrive_line.h b/include/opendrive/opendrive_line.h similarity index 100% rename from include/opendrive_line.h rename to include/opendrive/opendrive_line.h diff --git a/include/opendrive_link.h b/include/opendrive/opendrive_link.h similarity index 100% rename from include/opendrive_link.h rename to include/opendrive/opendrive_link.h diff --git a/include/opendrive_object.h b/include/opendrive/opendrive_object.h similarity index 100% rename from include/opendrive_object.h rename to include/opendrive/opendrive_object.h diff --git a/include/opendrive_param_poly3.h b/include/opendrive/opendrive_param_poly3.h similarity index 100% rename from include/opendrive_param_poly3.h rename to include/opendrive/opendrive_param_poly3.h diff --git a/include/opendrive_road.h b/include/opendrive/opendrive_road.h similarity index 100% rename from include/opendrive_road.h rename to include/opendrive/opendrive_road.h diff --git a/include/opendrive_road_node.h b/include/opendrive/opendrive_road_node.h similarity index 100% rename from include/opendrive_road_node.h rename to include/opendrive/opendrive_road_node.h diff --git a/include/opendrive_road_segment.h b/include/opendrive/opendrive_road_segment.h similarity index 100% rename from include/opendrive_road_segment.h rename to include/opendrive/opendrive_road_segment.h diff --git a/include/opendrive_signal.h b/include/opendrive/opendrive_signal.h similarity index 100% rename from include/opendrive_signal.h rename to include/opendrive/opendrive_signal.h diff --git a/include/opendrive_spiral.h b/include/opendrive/opendrive_spiral.h similarity index 100% rename from include/opendrive_spiral.h rename to include/opendrive/opendrive_spiral.h diff --git a/src/opendrive_arc.cpp b/src/opendrive/opendrive_arc.cpp similarity index 100% rename from src/opendrive_arc.cpp rename to src/opendrive/opendrive_arc.cpp diff --git a/src/opendrive_common.cpp b/src/opendrive/opendrive_common.cpp similarity index 100% rename from src/opendrive_common.cpp rename to src/opendrive/opendrive_common.cpp diff --git a/src/opendrive_geometry.cpp b/src/opendrive/opendrive_geometry.cpp similarity index 100% rename from src/opendrive_geometry.cpp rename to src/opendrive/opendrive_geometry.cpp diff --git a/src/opendrive_junction.cpp b/src/opendrive/opendrive_junction.cpp similarity index 100% rename from src/opendrive_junction.cpp rename to src/opendrive/opendrive_junction.cpp diff --git a/src/opendrive_lane.cpp b/src/opendrive/opendrive_lane.cpp similarity index 100% rename from src/opendrive_lane.cpp rename to src/opendrive/opendrive_lane.cpp diff --git a/src/opendrive_line.cpp b/src/opendrive/opendrive_line.cpp similarity index 100% rename from src/opendrive_line.cpp rename to src/opendrive/opendrive_line.cpp diff --git a/src/opendrive_link.cpp b/src/opendrive/opendrive_link.cpp similarity index 100% rename from src/opendrive_link.cpp rename to src/opendrive/opendrive_link.cpp diff --git a/src/opendrive_object.cpp b/src/opendrive/opendrive_object.cpp similarity index 100% rename from src/opendrive_object.cpp rename to src/opendrive/opendrive_object.cpp diff --git a/src/opendrive_param_poly3.cpp b/src/opendrive/opendrive_param_poly3.cpp similarity index 100% rename from src/opendrive_param_poly3.cpp rename to src/opendrive/opendrive_param_poly3.cpp diff --git a/src/opendrive_road.cpp b/src/opendrive/opendrive_road.cpp similarity index 100% rename from src/opendrive_road.cpp rename to src/opendrive/opendrive_road.cpp diff --git a/src/opendrive_road_node.cpp b/src/opendrive/opendrive_road_node.cpp similarity index 100% rename from src/opendrive_road_node.cpp rename to src/opendrive/opendrive_road_node.cpp diff --git a/src/opendrive_road_segment.cpp b/src/opendrive/opendrive_road_segment.cpp similarity index 100% rename from src/opendrive_road_segment.cpp rename to src/opendrive/opendrive_road_segment.cpp diff --git a/src/opendrive_signal.cpp b/src/opendrive/opendrive_signal.cpp similarity index 100% rename from src/opendrive_signal.cpp rename to src/opendrive/opendrive_signal.cpp diff --git a/src/opendrive_spiral.cpp b/src/opendrive/opendrive_spiral.cpp similarity index 100% rename from src/opendrive_spiral.cpp rename to src/opendrive/opendrive_spiral.cpp