Moved header files, updated cpp files

diff --git a/include/animation/animation.hpp b/include/rive/animation/animation.hpp
similarity index 100%
rename from include/animation/animation.hpp
rename to include/rive/animation/animation.hpp


diff --git a/include/animation/animation_state.hpp b/include/rive/animation/animation_state.hpp
similarity index 100%
rename from include/animation/animation_state.hpp
rename to include/rive/animation/animation_state.hpp


diff --git a/include/animation/animation_state_instance.hpp b/include/rive/animation/animation_state_instance.hpp
similarity index 100%
rename from include/animation/animation_state_instance.hpp
rename to include/rive/animation/animation_state_instance.hpp


diff --git a/include/animation/any_state.hpp b/include/rive/animation/any_state.hpp
similarity index 100%
rename from include/animation/any_state.hpp
rename to include/rive/animation/any_state.hpp


diff --git a/include/animation/blend_animation.hpp b/include/rive/animation/blend_animation.hpp
similarity index 100%
rename from include/animation/blend_animation.hpp
rename to include/rive/animation/blend_animation.hpp


diff --git a/include/animation/blend_animation_1d.hpp b/include/rive/animation/blend_animation_1d.hpp
similarity index 100%
rename from include/animation/blend_animation_1d.hpp
rename to include/rive/animation/blend_animation_1d.hpp


diff --git a/include/animation/blend_animation_direct.hpp b/include/rive/animation/blend_animation_direct.hpp
similarity index 100%
rename from include/animation/blend_animation_direct.hpp
rename to include/rive/animation/blend_animation_direct.hpp


diff --git a/include/animation/blend_state.hpp b/include/rive/animation/blend_state.hpp
similarity index 100%
rename from include/animation/blend_state.hpp
rename to include/rive/animation/blend_state.hpp


diff --git a/include/animation/blend_state_1d.hpp b/include/rive/animation/blend_state_1d.hpp
similarity index 100%
rename from include/animation/blend_state_1d.hpp
rename to include/rive/animation/blend_state_1d.hpp


diff --git a/include/animation/blend_state_1d_instance.hpp b/include/rive/animation/blend_state_1d_instance.hpp
similarity index 100%
rename from include/animation/blend_state_1d_instance.hpp
rename to include/rive/animation/blend_state_1d_instance.hpp


diff --git a/include/animation/blend_state_direct.hpp b/include/rive/animation/blend_state_direct.hpp
similarity index 100%
rename from include/animation/blend_state_direct.hpp
rename to include/rive/animation/blend_state_direct.hpp


diff --git a/include/animation/blend_state_direct_instance.hpp b/include/rive/animation/blend_state_direct_instance.hpp
similarity index 100%
rename from include/animation/blend_state_direct_instance.hpp
rename to include/rive/animation/blend_state_direct_instance.hpp


diff --git a/include/animation/blend_state_instance.hpp b/include/rive/animation/blend_state_instance.hpp
similarity index 100%
rename from include/animation/blend_state_instance.hpp
rename to include/rive/animation/blend_state_instance.hpp


diff --git a/include/animation/blend_state_transition.hpp b/include/rive/animation/blend_state_transition.hpp
similarity index 100%
rename from include/animation/blend_state_transition.hpp
rename to include/rive/animation/blend_state_transition.hpp


diff --git a/include/animation/cubic_interpolator.hpp b/include/rive/animation/cubic_interpolator.hpp
similarity index 100%
rename from include/animation/cubic_interpolator.hpp
rename to include/rive/animation/cubic_interpolator.hpp


diff --git a/include/animation/entry_state.hpp b/include/rive/animation/entry_state.hpp
similarity index 100%
rename from include/animation/entry_state.hpp
rename to include/rive/animation/entry_state.hpp


diff --git a/include/animation/exit_state.hpp b/include/rive/animation/exit_state.hpp
similarity index 100%
rename from include/animation/exit_state.hpp
rename to include/rive/animation/exit_state.hpp


diff --git a/include/animation/keyed_object.hpp b/include/rive/animation/keyed_object.hpp
similarity index 100%
rename from include/animation/keyed_object.hpp
rename to include/rive/animation/keyed_object.hpp


diff --git a/include/animation/keyed_property.hpp b/include/rive/animation/keyed_property.hpp
similarity index 100%
rename from include/animation/keyed_property.hpp
rename to include/rive/animation/keyed_property.hpp


diff --git a/include/animation/keyframe.hpp b/include/rive/animation/keyframe.hpp
similarity index 100%
rename from include/animation/keyframe.hpp
rename to include/rive/animation/keyframe.hpp


diff --git a/include/animation/keyframe_color.hpp b/include/rive/animation/keyframe_color.hpp
similarity index 100%
rename from include/animation/keyframe_color.hpp
rename to include/rive/animation/keyframe_color.hpp


diff --git a/include/animation/keyframe_double.hpp b/include/rive/animation/keyframe_double.hpp
similarity index 100%
rename from include/animation/keyframe_double.hpp
rename to include/rive/animation/keyframe_double.hpp


diff --git a/include/animation/keyframe_id.hpp b/include/rive/animation/keyframe_id.hpp
similarity index 100%
rename from include/animation/keyframe_id.hpp
rename to include/rive/animation/keyframe_id.hpp


diff --git a/include/animation/layer_state.hpp b/include/rive/animation/layer_state.hpp
similarity index 100%
rename from include/animation/layer_state.hpp
rename to include/rive/animation/layer_state.hpp


diff --git a/include/animation/linear_animation.hpp b/include/rive/animation/linear_animation.hpp
similarity index 100%
rename from include/animation/linear_animation.hpp
rename to include/rive/animation/linear_animation.hpp


diff --git a/include/animation/linear_animation_instance.hpp b/include/rive/animation/linear_animation_instance.hpp
similarity index 100%
rename from include/animation/linear_animation_instance.hpp
rename to include/rive/animation/linear_animation_instance.hpp


diff --git a/include/animation/loop.hpp b/include/rive/animation/loop.hpp
similarity index 100%
rename from include/animation/loop.hpp
rename to include/rive/animation/loop.hpp


diff --git a/include/animation/state_instance.hpp b/include/rive/animation/state_instance.hpp
similarity index 100%
rename from include/animation/state_instance.hpp
rename to include/rive/animation/state_instance.hpp


diff --git a/include/animation/state_machine.hpp b/include/rive/animation/state_machine.hpp
similarity index 100%
rename from include/animation/state_machine.hpp
rename to include/rive/animation/state_machine.hpp


diff --git a/include/animation/state_machine_bool.hpp b/include/rive/animation/state_machine_bool.hpp
similarity index 100%
rename from include/animation/state_machine_bool.hpp
rename to include/rive/animation/state_machine_bool.hpp


diff --git a/include/animation/state_machine_component.hpp b/include/rive/animation/state_machine_component.hpp
similarity index 100%
rename from include/animation/state_machine_component.hpp
rename to include/rive/animation/state_machine_component.hpp


diff --git a/include/animation/state_machine_input.hpp b/include/rive/animation/state_machine_input.hpp
similarity index 100%
rename from include/animation/state_machine_input.hpp
rename to include/rive/animation/state_machine_input.hpp


diff --git a/include/animation/state_machine_input_instance.hpp b/include/rive/animation/state_machine_input_instance.hpp
similarity index 100%
rename from include/animation/state_machine_input_instance.hpp
rename to include/rive/animation/state_machine_input_instance.hpp


diff --git a/include/animation/state_machine_instance.hpp b/include/rive/animation/state_machine_instance.hpp
similarity index 100%
rename from include/animation/state_machine_instance.hpp
rename to include/rive/animation/state_machine_instance.hpp


diff --git a/include/animation/state_machine_layer.hpp b/include/rive/animation/state_machine_layer.hpp
similarity index 100%
rename from include/animation/state_machine_layer.hpp
rename to include/rive/animation/state_machine_layer.hpp


diff --git a/include/animation/state_machine_layer_component.hpp b/include/rive/animation/state_machine_layer_component.hpp
similarity index 100%
rename from include/animation/state_machine_layer_component.hpp
rename to include/rive/animation/state_machine_layer_component.hpp


diff --git a/include/animation/state_machine_number.hpp b/include/rive/animation/state_machine_number.hpp
similarity index 100%
rename from include/animation/state_machine_number.hpp
rename to include/rive/animation/state_machine_number.hpp


diff --git a/include/animation/state_machine_trigger.hpp b/include/rive/animation/state_machine_trigger.hpp
similarity index 100%
rename from include/animation/state_machine_trigger.hpp
rename to include/rive/animation/state_machine_trigger.hpp


diff --git a/include/animation/state_transition.hpp b/include/rive/animation/state_transition.hpp
similarity index 100%
rename from include/animation/state_transition.hpp
rename to include/rive/animation/state_transition.hpp


diff --git a/include/animation/state_transition_flags.hpp b/include/rive/animation/state_transition_flags.hpp
similarity index 100%
rename from include/animation/state_transition_flags.hpp
rename to include/rive/animation/state_transition_flags.hpp


diff --git a/include/animation/system_state_instance.hpp b/include/rive/animation/system_state_instance.hpp
similarity index 100%
rename from include/animation/system_state_instance.hpp
rename to include/rive/animation/system_state_instance.hpp


diff --git a/include/animation/transition_bool_condition.hpp b/include/rive/animation/transition_bool_condition.hpp
similarity index 100%
rename from include/animation/transition_bool_condition.hpp
rename to include/rive/animation/transition_bool_condition.hpp


diff --git a/include/animation/transition_condition.hpp b/include/rive/animation/transition_condition.hpp
similarity index 100%
rename from include/animation/transition_condition.hpp
rename to include/rive/animation/transition_condition.hpp


diff --git a/include/animation/transition_condition_op.hpp b/include/rive/animation/transition_condition_op.hpp
similarity index 100%
rename from include/animation/transition_condition_op.hpp
rename to include/rive/animation/transition_condition_op.hpp


diff --git a/include/animation/transition_number_condition.hpp b/include/rive/animation/transition_number_condition.hpp
similarity index 100%
rename from include/animation/transition_number_condition.hpp
rename to include/rive/animation/transition_number_condition.hpp


diff --git a/include/animation/transition_trigger_condition.hpp b/include/rive/animation/transition_trigger_condition.hpp
similarity index 100%
rename from include/animation/transition_trigger_condition.hpp
rename to include/rive/animation/transition_trigger_condition.hpp


diff --git a/include/animation/transition_value_condition.hpp b/include/rive/animation/transition_value_condition.hpp
similarity index 100%
rename from include/animation/transition_value_condition.hpp
rename to include/rive/animation/transition_value_condition.hpp


diff --git a/include/artboard.hpp b/include/rive/artboard.hpp
similarity index 100%
rename from include/artboard.hpp
rename to include/rive/artboard.hpp


diff --git a/include/backboard.hpp b/include/rive/backboard.hpp
similarity index 100%
rename from include/backboard.hpp
rename to include/rive/backboard.hpp


diff --git a/include/bones/bone.hpp b/include/rive/bones/bone.hpp
similarity index 100%
rename from include/bones/bone.hpp
rename to include/rive/bones/bone.hpp


diff --git a/include/bones/cubic_weight.hpp b/include/rive/bones/cubic_weight.hpp
similarity index 100%
rename from include/bones/cubic_weight.hpp
rename to include/rive/bones/cubic_weight.hpp


diff --git a/include/bones/root_bone.hpp b/include/rive/bones/root_bone.hpp
similarity index 100%
rename from include/bones/root_bone.hpp
rename to include/rive/bones/root_bone.hpp


diff --git a/include/bones/skeletal_component.hpp b/include/rive/bones/skeletal_component.hpp
similarity index 100%
rename from include/bones/skeletal_component.hpp
rename to include/rive/bones/skeletal_component.hpp


diff --git a/include/bones/skin.hpp b/include/rive/bones/skin.hpp
similarity index 100%
rename from include/bones/skin.hpp
rename to include/rive/bones/skin.hpp


diff --git a/include/bones/skinnable.hpp b/include/rive/bones/skinnable.hpp
similarity index 100%
rename from include/bones/skinnable.hpp
rename to include/rive/bones/skinnable.hpp


diff --git a/include/bones/tendon.hpp b/include/rive/bones/tendon.hpp
similarity index 100%
rename from include/bones/tendon.hpp
rename to include/rive/bones/tendon.hpp


diff --git a/include/bones/weight.hpp b/include/rive/bones/weight.hpp
similarity index 100%
rename from include/bones/weight.hpp
rename to include/rive/bones/weight.hpp


diff --git a/include/command_path.hpp b/include/rive/command_path.hpp
similarity index 100%
rename from include/command_path.hpp
rename to include/rive/command_path.hpp


diff --git a/include/component.hpp b/include/rive/component.hpp
similarity index 100%
rename from include/component.hpp
rename to include/rive/component.hpp


diff --git a/include/component_dirt.hpp b/include/rive/component_dirt.hpp
similarity index 100%
rename from include/component_dirt.hpp
rename to include/rive/component_dirt.hpp


diff --git a/include/constraints/constraint.hpp b/include/rive/constraints/constraint.hpp
similarity index 100%
rename from include/constraints/constraint.hpp
rename to include/rive/constraints/constraint.hpp


diff --git a/include/constraints/distance_constraint.hpp b/include/rive/constraints/distance_constraint.hpp
similarity index 100%
rename from include/constraints/distance_constraint.hpp
rename to include/rive/constraints/distance_constraint.hpp


diff --git a/include/constraints/ik_constraint.hpp b/include/rive/constraints/ik_constraint.hpp
similarity index 100%
rename from include/constraints/ik_constraint.hpp
rename to include/rive/constraints/ik_constraint.hpp


diff --git a/include/constraints/targeted_constraint.hpp b/include/rive/constraints/targeted_constraint.hpp
similarity index 100%
rename from include/constraints/targeted_constraint.hpp
rename to include/rive/constraints/targeted_constraint.hpp


diff --git a/include/constraints/transform_constraint.hpp b/include/rive/constraints/transform_constraint.hpp
similarity index 100%
rename from include/constraints/transform_constraint.hpp
rename to include/rive/constraints/transform_constraint.hpp


diff --git a/include/container_component.hpp b/include/rive/container_component.hpp
similarity index 100%
rename from include/container_component.hpp
rename to include/rive/container_component.hpp


diff --git a/include/core.hpp b/include/rive/core.hpp
similarity index 100%
rename from include/core.hpp
rename to include/rive/core.hpp


diff --git a/include/core/binary_reader.hpp b/include/rive/core/binary_reader.hpp
similarity index 100%
rename from include/core/binary_reader.hpp
rename to include/rive/core/binary_reader.hpp


diff --git a/include/core/field_types/core_bool_type.hpp b/include/rive/core/field_types/core_bool_type.hpp
similarity index 100%
rename from include/core/field_types/core_bool_type.hpp
rename to include/rive/core/field_types/core_bool_type.hpp


diff --git a/include/core/field_types/core_color_type.hpp b/include/rive/core/field_types/core_color_type.hpp
similarity index 100%
rename from include/core/field_types/core_color_type.hpp
rename to include/rive/core/field_types/core_color_type.hpp


diff --git a/include/core/field_types/core_double_type.hpp b/include/rive/core/field_types/core_double_type.hpp
similarity index 100%
rename from include/core/field_types/core_double_type.hpp
rename to include/rive/core/field_types/core_double_type.hpp


diff --git a/include/core/field_types/core_string_type.hpp b/include/rive/core/field_types/core_string_type.hpp
similarity index 100%
rename from include/core/field_types/core_string_type.hpp
rename to include/rive/core/field_types/core_string_type.hpp


diff --git a/include/core/field_types/core_uint_type.hpp b/include/rive/core/field_types/core_uint_type.hpp
similarity index 100%
rename from include/core/field_types/core_uint_type.hpp
rename to include/rive/core/field_types/core_uint_type.hpp


diff --git a/include/core/reader.h b/include/rive/core/reader.h
similarity index 100%
rename from include/core/reader.h
rename to include/rive/core/reader.h


diff --git a/include/core_context.hpp b/include/rive/core_context.hpp
similarity index 100%
rename from include/core_context.hpp
rename to include/rive/core_context.hpp


diff --git a/include/dependency_sorter.hpp b/include/rive/dependency_sorter.hpp
similarity index 100%
rename from include/dependency_sorter.hpp
rename to include/rive/dependency_sorter.hpp


diff --git a/include/draw_rules.hpp b/include/rive/draw_rules.hpp
similarity index 100%
rename from include/draw_rules.hpp
rename to include/rive/draw_rules.hpp


diff --git a/include/draw_target.hpp b/include/rive/draw_target.hpp
similarity index 100%
rename from include/draw_target.hpp
rename to include/rive/draw_target.hpp


diff --git a/include/draw_target_placement.hpp b/include/rive/draw_target_placement.hpp
similarity index 100%
rename from include/draw_target_placement.hpp
rename to include/rive/draw_target_placement.hpp


diff --git a/include/drawable.hpp b/include/rive/drawable.hpp
similarity index 100%
rename from include/drawable.hpp
rename to include/rive/drawable.hpp


diff --git a/include/file.hpp b/include/rive/file.hpp
similarity index 100%
rename from include/file.hpp
rename to include/rive/file.hpp


diff --git a/include/generated/animation/animation_base.hpp b/include/rive/generated/animation/animation_base.hpp
similarity index 100%
rename from include/generated/animation/animation_base.hpp
rename to include/rive/generated/animation/animation_base.hpp


diff --git a/include/generated/animation/animation_state_base.hpp b/include/rive/generated/animation/animation_state_base.hpp
similarity index 100%
rename from include/generated/animation/animation_state_base.hpp
rename to include/rive/generated/animation/animation_state_base.hpp


diff --git a/include/generated/animation/any_state_base.hpp b/include/rive/generated/animation/any_state_base.hpp
similarity index 100%
rename from include/generated/animation/any_state_base.hpp
rename to include/rive/generated/animation/any_state_base.hpp


diff --git a/include/generated/animation/blend_animation_1d_base.hpp b/include/rive/generated/animation/blend_animation_1d_base.hpp
similarity index 100%
rename from include/generated/animation/blend_animation_1d_base.hpp
rename to include/rive/generated/animation/blend_animation_1d_base.hpp


diff --git a/include/generated/animation/blend_animation_base.hpp b/include/rive/generated/animation/blend_animation_base.hpp
similarity index 100%
rename from include/generated/animation/blend_animation_base.hpp
rename to include/rive/generated/animation/blend_animation_base.hpp


diff --git a/include/generated/animation/blend_animation_direct_base.hpp b/include/rive/generated/animation/blend_animation_direct_base.hpp
similarity index 100%
rename from include/generated/animation/blend_animation_direct_base.hpp
rename to include/rive/generated/animation/blend_animation_direct_base.hpp


diff --git a/include/generated/animation/blend_state_1d_base.hpp b/include/rive/generated/animation/blend_state_1d_base.hpp
similarity index 100%
rename from include/generated/animation/blend_state_1d_base.hpp
rename to include/rive/generated/animation/blend_state_1d_base.hpp


diff --git a/include/generated/animation/blend_state_base.hpp b/include/rive/generated/animation/blend_state_base.hpp
similarity index 100%
rename from include/generated/animation/blend_state_base.hpp
rename to include/rive/generated/animation/blend_state_base.hpp


diff --git a/include/generated/animation/blend_state_direct_base.hpp b/include/rive/generated/animation/blend_state_direct_base.hpp
similarity index 100%
rename from include/generated/animation/blend_state_direct_base.hpp
rename to include/rive/generated/animation/blend_state_direct_base.hpp


diff --git a/include/generated/animation/blend_state_transition_base.hpp b/include/rive/generated/animation/blend_state_transition_base.hpp
similarity index 100%
rename from include/generated/animation/blend_state_transition_base.hpp
rename to include/rive/generated/animation/blend_state_transition_base.hpp


diff --git a/include/generated/animation/cubic_interpolator_base.hpp b/include/rive/generated/animation/cubic_interpolator_base.hpp
similarity index 100%
rename from include/generated/animation/cubic_interpolator_base.hpp
rename to include/rive/generated/animation/cubic_interpolator_base.hpp


diff --git a/include/generated/animation/entry_state_base.hpp b/include/rive/generated/animation/entry_state_base.hpp
similarity index 100%
rename from include/generated/animation/entry_state_base.hpp
rename to include/rive/generated/animation/entry_state_base.hpp


diff --git a/include/generated/animation/exit_state_base.hpp b/include/rive/generated/animation/exit_state_base.hpp
similarity index 100%
rename from include/generated/animation/exit_state_base.hpp
rename to include/rive/generated/animation/exit_state_base.hpp


diff --git a/include/generated/animation/keyed_object_base.hpp b/include/rive/generated/animation/keyed_object_base.hpp
similarity index 100%
rename from include/generated/animation/keyed_object_base.hpp
rename to include/rive/generated/animation/keyed_object_base.hpp


diff --git a/include/generated/animation/keyed_property_base.hpp b/include/rive/generated/animation/keyed_property_base.hpp
similarity index 100%
rename from include/generated/animation/keyed_property_base.hpp
rename to include/rive/generated/animation/keyed_property_base.hpp


diff --git a/include/generated/animation/keyframe_base.hpp b/include/rive/generated/animation/keyframe_base.hpp
similarity index 100%
rename from include/generated/animation/keyframe_base.hpp
rename to include/rive/generated/animation/keyframe_base.hpp


diff --git a/include/generated/animation/keyframe_color_base.hpp b/include/rive/generated/animation/keyframe_color_base.hpp
similarity index 100%
rename from include/generated/animation/keyframe_color_base.hpp
rename to include/rive/generated/animation/keyframe_color_base.hpp


diff --git a/include/generated/animation/keyframe_double_base.hpp b/include/rive/generated/animation/keyframe_double_base.hpp
similarity index 100%
rename from include/generated/animation/keyframe_double_base.hpp
rename to include/rive/generated/animation/keyframe_double_base.hpp


diff --git a/include/generated/animation/keyframe_id_base.hpp b/include/rive/generated/animation/keyframe_id_base.hpp
similarity index 100%
rename from include/generated/animation/keyframe_id_base.hpp
rename to include/rive/generated/animation/keyframe_id_base.hpp


diff --git a/include/generated/animation/layer_state_base.hpp b/include/rive/generated/animation/layer_state_base.hpp
similarity index 100%
rename from include/generated/animation/layer_state_base.hpp
rename to include/rive/generated/animation/layer_state_base.hpp


diff --git a/include/generated/animation/linear_animation_base.hpp b/include/rive/generated/animation/linear_animation_base.hpp
similarity index 100%
rename from include/generated/animation/linear_animation_base.hpp
rename to include/rive/generated/animation/linear_animation_base.hpp


diff --git a/include/generated/animation/state_machine_base.hpp b/include/rive/generated/animation/state_machine_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_base.hpp
rename to include/rive/generated/animation/state_machine_base.hpp


diff --git a/include/generated/animation/state_machine_bool_base.hpp b/include/rive/generated/animation/state_machine_bool_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_bool_base.hpp
rename to include/rive/generated/animation/state_machine_bool_base.hpp


diff --git a/include/generated/animation/state_machine_component_base.hpp b/include/rive/generated/animation/state_machine_component_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_component_base.hpp
rename to include/rive/generated/animation/state_machine_component_base.hpp


diff --git a/include/generated/animation/state_machine_input_base.hpp b/include/rive/generated/animation/state_machine_input_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_input_base.hpp
rename to include/rive/generated/animation/state_machine_input_base.hpp


diff --git a/include/generated/animation/state_machine_layer_base.hpp b/include/rive/generated/animation/state_machine_layer_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_layer_base.hpp
rename to include/rive/generated/animation/state_machine_layer_base.hpp


diff --git a/include/generated/animation/state_machine_layer_component_base.hpp b/include/rive/generated/animation/state_machine_layer_component_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_layer_component_base.hpp
rename to include/rive/generated/animation/state_machine_layer_component_base.hpp


diff --git a/include/generated/animation/state_machine_number_base.hpp b/include/rive/generated/animation/state_machine_number_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_number_base.hpp
rename to include/rive/generated/animation/state_machine_number_base.hpp


diff --git a/include/generated/animation/state_machine_trigger_base.hpp b/include/rive/generated/animation/state_machine_trigger_base.hpp
similarity index 100%
rename from include/generated/animation/state_machine_trigger_base.hpp
rename to include/rive/generated/animation/state_machine_trigger_base.hpp


diff --git a/include/generated/animation/state_transition_base.hpp b/include/rive/generated/animation/state_transition_base.hpp
similarity index 100%
rename from include/generated/animation/state_transition_base.hpp
rename to include/rive/generated/animation/state_transition_base.hpp


diff --git a/include/generated/animation/transition_bool_condition_base.hpp b/include/rive/generated/animation/transition_bool_condition_base.hpp
similarity index 100%
rename from include/generated/animation/transition_bool_condition_base.hpp
rename to include/rive/generated/animation/transition_bool_condition_base.hpp


diff --git a/include/generated/animation/transition_condition_base.hpp b/include/rive/generated/animation/transition_condition_base.hpp
similarity index 100%
rename from include/generated/animation/transition_condition_base.hpp
rename to include/rive/generated/animation/transition_condition_base.hpp


diff --git a/include/generated/animation/transition_number_condition_base.hpp b/include/rive/generated/animation/transition_number_condition_base.hpp
similarity index 100%
rename from include/generated/animation/transition_number_condition_base.hpp
rename to include/rive/generated/animation/transition_number_condition_base.hpp


diff --git a/include/generated/animation/transition_trigger_condition_base.hpp b/include/rive/generated/animation/transition_trigger_condition_base.hpp
similarity index 100%
rename from include/generated/animation/transition_trigger_condition_base.hpp
rename to include/rive/generated/animation/transition_trigger_condition_base.hpp


diff --git a/include/generated/animation/transition_value_condition_base.hpp b/include/rive/generated/animation/transition_value_condition_base.hpp
similarity index 100%
rename from include/generated/animation/transition_value_condition_base.hpp
rename to include/rive/generated/animation/transition_value_condition_base.hpp


diff --git a/include/generated/artboard_base.hpp b/include/rive/generated/artboard_base.hpp
similarity index 100%
rename from include/generated/artboard_base.hpp
rename to include/rive/generated/artboard_base.hpp


diff --git a/include/generated/backboard_base.hpp b/include/rive/generated/backboard_base.hpp
similarity index 100%
rename from include/generated/backboard_base.hpp
rename to include/rive/generated/backboard_base.hpp


diff --git a/include/generated/bones/bone_base.hpp b/include/rive/generated/bones/bone_base.hpp
similarity index 100%
rename from include/generated/bones/bone_base.hpp
rename to include/rive/generated/bones/bone_base.hpp


diff --git a/include/generated/bones/cubic_weight_base.hpp b/include/rive/generated/bones/cubic_weight_base.hpp
similarity index 100%
rename from include/generated/bones/cubic_weight_base.hpp
rename to include/rive/generated/bones/cubic_weight_base.hpp


diff --git a/include/generated/bones/root_bone_base.hpp b/include/rive/generated/bones/root_bone_base.hpp
similarity index 100%
rename from include/generated/bones/root_bone_base.hpp
rename to include/rive/generated/bones/root_bone_base.hpp


diff --git a/include/generated/bones/skeletal_component_base.hpp b/include/rive/generated/bones/skeletal_component_base.hpp
similarity index 100%
rename from include/generated/bones/skeletal_component_base.hpp
rename to include/rive/generated/bones/skeletal_component_base.hpp


diff --git a/include/generated/bones/skin_base.hpp b/include/rive/generated/bones/skin_base.hpp
similarity index 100%
rename from include/generated/bones/skin_base.hpp
rename to include/rive/generated/bones/skin_base.hpp


diff --git a/include/generated/bones/tendon_base.hpp b/include/rive/generated/bones/tendon_base.hpp
similarity index 100%
rename from include/generated/bones/tendon_base.hpp
rename to include/rive/generated/bones/tendon_base.hpp


diff --git a/include/generated/bones/weight_base.hpp b/include/rive/generated/bones/weight_base.hpp
similarity index 100%
rename from include/generated/bones/weight_base.hpp
rename to include/rive/generated/bones/weight_base.hpp


diff --git a/include/generated/component_base.hpp b/include/rive/generated/component_base.hpp
similarity index 100%
rename from include/generated/component_base.hpp
rename to include/rive/generated/component_base.hpp


diff --git a/include/generated/constraints/constraint_base.hpp b/include/rive/generated/constraints/constraint_base.hpp
similarity index 100%
rename from include/generated/constraints/constraint_base.hpp
rename to include/rive/generated/constraints/constraint_base.hpp


diff --git a/include/generated/constraints/distance_constraint_base.hpp b/include/rive/generated/constraints/distance_constraint_base.hpp
similarity index 100%
rename from include/generated/constraints/distance_constraint_base.hpp
rename to include/rive/generated/constraints/distance_constraint_base.hpp


diff --git a/include/generated/constraints/ik_constraint_base.hpp b/include/rive/generated/constraints/ik_constraint_base.hpp
similarity index 100%
rename from include/generated/constraints/ik_constraint_base.hpp
rename to include/rive/generated/constraints/ik_constraint_base.hpp


diff --git a/include/generated/constraints/targeted_constraint_base.hpp b/include/rive/generated/constraints/targeted_constraint_base.hpp
similarity index 100%
rename from include/generated/constraints/targeted_constraint_base.hpp
rename to include/rive/generated/constraints/targeted_constraint_base.hpp


diff --git a/include/generated/constraints/transform_constraint_base.hpp b/include/rive/generated/constraints/transform_constraint_base.hpp
similarity index 100%
rename from include/generated/constraints/transform_constraint_base.hpp
rename to include/rive/generated/constraints/transform_constraint_base.hpp


diff --git a/include/generated/container_component_base.hpp b/include/rive/generated/container_component_base.hpp
similarity index 100%
rename from include/generated/container_component_base.hpp
rename to include/rive/generated/container_component_base.hpp


diff --git a/include/generated/core_registry.hpp b/include/rive/generated/core_registry.hpp
similarity index 100%
rename from include/generated/core_registry.hpp
rename to include/rive/generated/core_registry.hpp


diff --git a/include/generated/draw_rules_base.hpp b/include/rive/generated/draw_rules_base.hpp
similarity index 100%
rename from include/generated/draw_rules_base.hpp
rename to include/rive/generated/draw_rules_base.hpp


diff --git a/include/generated/draw_target_base.hpp b/include/rive/generated/draw_target_base.hpp
similarity index 100%
rename from include/generated/draw_target_base.hpp
rename to include/rive/generated/draw_target_base.hpp


diff --git a/include/generated/drawable_base.hpp b/include/rive/generated/drawable_base.hpp
similarity index 100%
rename from include/generated/drawable_base.hpp
rename to include/rive/generated/drawable_base.hpp


diff --git a/include/generated/node_base.hpp b/include/rive/generated/node_base.hpp
similarity index 100%
rename from include/generated/node_base.hpp
rename to include/rive/generated/node_base.hpp


diff --git a/include/generated/shapes/clipping_shape_base.hpp b/include/rive/generated/shapes/clipping_shape_base.hpp
similarity index 100%
rename from include/generated/shapes/clipping_shape_base.hpp
rename to include/rive/generated/shapes/clipping_shape_base.hpp


diff --git a/include/generated/shapes/cubic_asymmetric_vertex_base.hpp b/include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp
similarity index 100%
rename from include/generated/shapes/cubic_asymmetric_vertex_base.hpp
rename to include/rive/generated/shapes/cubic_asymmetric_vertex_base.hpp


diff --git a/include/generated/shapes/cubic_detached_vertex_base.hpp b/include/rive/generated/shapes/cubic_detached_vertex_base.hpp
similarity index 100%
rename from include/generated/shapes/cubic_detached_vertex_base.hpp
rename to include/rive/generated/shapes/cubic_detached_vertex_base.hpp


diff --git a/include/generated/shapes/cubic_mirrored_vertex_base.hpp b/include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp
similarity index 100%
rename from include/generated/shapes/cubic_mirrored_vertex_base.hpp
rename to include/rive/generated/shapes/cubic_mirrored_vertex_base.hpp


diff --git a/include/generated/shapes/cubic_vertex_base.hpp b/include/rive/generated/shapes/cubic_vertex_base.hpp
similarity index 100%
rename from include/generated/shapes/cubic_vertex_base.hpp
rename to include/rive/generated/shapes/cubic_vertex_base.hpp


diff --git a/include/generated/shapes/ellipse_base.hpp b/include/rive/generated/shapes/ellipse_base.hpp
similarity index 100%
rename from include/generated/shapes/ellipse_base.hpp
rename to include/rive/generated/shapes/ellipse_base.hpp


diff --git a/include/generated/shapes/paint/fill_base.hpp b/include/rive/generated/shapes/paint/fill_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/fill_base.hpp
rename to include/rive/generated/shapes/paint/fill_base.hpp


diff --git a/include/generated/shapes/paint/gradient_stop_base.hpp b/include/rive/generated/shapes/paint/gradient_stop_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/gradient_stop_base.hpp
rename to include/rive/generated/shapes/paint/gradient_stop_base.hpp


diff --git a/include/generated/shapes/paint/linear_gradient_base.hpp b/include/rive/generated/shapes/paint/linear_gradient_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/linear_gradient_base.hpp
rename to include/rive/generated/shapes/paint/linear_gradient_base.hpp


diff --git a/include/generated/shapes/paint/radial_gradient_base.hpp b/include/rive/generated/shapes/paint/radial_gradient_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/radial_gradient_base.hpp
rename to include/rive/generated/shapes/paint/radial_gradient_base.hpp


diff --git a/include/generated/shapes/paint/shape_paint_base.hpp b/include/rive/generated/shapes/paint/shape_paint_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/shape_paint_base.hpp
rename to include/rive/generated/shapes/paint/shape_paint_base.hpp


diff --git a/include/generated/shapes/paint/solid_color_base.hpp b/include/rive/generated/shapes/paint/solid_color_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/solid_color_base.hpp
rename to include/rive/generated/shapes/paint/solid_color_base.hpp


diff --git a/include/generated/shapes/paint/stroke_base.hpp b/include/rive/generated/shapes/paint/stroke_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/stroke_base.hpp
rename to include/rive/generated/shapes/paint/stroke_base.hpp


diff --git a/include/generated/shapes/paint/trim_path_base.hpp b/include/rive/generated/shapes/paint/trim_path_base.hpp
similarity index 100%
rename from include/generated/shapes/paint/trim_path_base.hpp
rename to include/rive/generated/shapes/paint/trim_path_base.hpp


diff --git a/include/generated/shapes/parametric_path_base.hpp b/include/rive/generated/shapes/parametric_path_base.hpp
similarity index 100%
rename from include/generated/shapes/parametric_path_base.hpp
rename to include/rive/generated/shapes/parametric_path_base.hpp


diff --git a/include/generated/shapes/path_base.hpp b/include/rive/generated/shapes/path_base.hpp
similarity index 100%
rename from include/generated/shapes/path_base.hpp
rename to include/rive/generated/shapes/path_base.hpp


diff --git a/include/generated/shapes/path_vertex_base.hpp b/include/rive/generated/shapes/path_vertex_base.hpp
similarity index 100%
rename from include/generated/shapes/path_vertex_base.hpp
rename to include/rive/generated/shapes/path_vertex_base.hpp


diff --git a/include/generated/shapes/points_path_base.hpp b/include/rive/generated/shapes/points_path_base.hpp
similarity index 100%
rename from include/generated/shapes/points_path_base.hpp
rename to include/rive/generated/shapes/points_path_base.hpp


diff --git a/include/generated/shapes/polygon_base.hpp b/include/rive/generated/shapes/polygon_base.hpp
similarity index 100%
rename from include/generated/shapes/polygon_base.hpp
rename to include/rive/generated/shapes/polygon_base.hpp


diff --git a/include/generated/shapes/rectangle_base.hpp b/include/rive/generated/shapes/rectangle_base.hpp
similarity index 100%
rename from include/generated/shapes/rectangle_base.hpp
rename to include/rive/generated/shapes/rectangle_base.hpp


diff --git a/include/generated/shapes/shape_base.hpp b/include/rive/generated/shapes/shape_base.hpp
similarity index 100%
rename from include/generated/shapes/shape_base.hpp
rename to include/rive/generated/shapes/shape_base.hpp


diff --git a/include/generated/shapes/star_base.hpp b/include/rive/generated/shapes/star_base.hpp
similarity index 100%
rename from include/generated/shapes/star_base.hpp
rename to include/rive/generated/shapes/star_base.hpp


diff --git a/include/generated/shapes/straight_vertex_base.hpp b/include/rive/generated/shapes/straight_vertex_base.hpp
similarity index 100%
rename from include/generated/shapes/straight_vertex_base.hpp
rename to include/rive/generated/shapes/straight_vertex_base.hpp


diff --git a/include/generated/shapes/triangle_base.hpp b/include/rive/generated/shapes/triangle_base.hpp
similarity index 100%
rename from include/generated/shapes/triangle_base.hpp
rename to include/rive/generated/shapes/triangle_base.hpp


diff --git a/include/generated/transform_component_base.hpp b/include/rive/generated/transform_component_base.hpp
similarity index 100%
rename from include/generated/transform_component_base.hpp
rename to include/rive/generated/transform_component_base.hpp


diff --git a/include/importers/artboard_importer.hpp b/include/rive/importers/artboard_importer.hpp
similarity index 100%
rename from include/importers/artboard_importer.hpp
rename to include/rive/importers/artboard_importer.hpp


diff --git a/include/importers/import_stack.hpp b/include/rive/importers/import_stack.hpp
similarity index 100%
rename from include/importers/import_stack.hpp
rename to include/rive/importers/import_stack.hpp


diff --git a/include/importers/keyed_object_importer.hpp b/include/rive/importers/keyed_object_importer.hpp
similarity index 100%
rename from include/importers/keyed_object_importer.hpp
rename to include/rive/importers/keyed_object_importer.hpp


diff --git a/include/importers/keyed_property_importer.hpp b/include/rive/importers/keyed_property_importer.hpp
similarity index 100%
rename from include/importers/keyed_property_importer.hpp
rename to include/rive/importers/keyed_property_importer.hpp


diff --git a/include/importers/layer_state_importer.hpp b/include/rive/importers/layer_state_importer.hpp
similarity index 100%
rename from include/importers/layer_state_importer.hpp
rename to include/rive/importers/layer_state_importer.hpp


diff --git a/include/importers/linear_animation_importer.hpp b/include/rive/importers/linear_animation_importer.hpp
similarity index 100%
rename from include/importers/linear_animation_importer.hpp
rename to include/rive/importers/linear_animation_importer.hpp


diff --git a/include/importers/state_machine_importer.hpp b/include/rive/importers/state_machine_importer.hpp
similarity index 100%
rename from include/importers/state_machine_importer.hpp
rename to include/rive/importers/state_machine_importer.hpp


diff --git a/include/importers/state_machine_layer_importer.hpp b/include/rive/importers/state_machine_layer_importer.hpp
similarity index 100%
rename from include/importers/state_machine_layer_importer.hpp
rename to include/rive/importers/state_machine_layer_importer.hpp


diff --git a/include/importers/state_transition_importer.hpp b/include/rive/importers/state_transition_importer.hpp
similarity index 100%
rename from include/importers/state_transition_importer.hpp
rename to include/rive/importers/state_transition_importer.hpp


diff --git a/include/layout.hpp b/include/rive/layout.hpp
similarity index 100%
rename from include/layout.hpp
rename to include/rive/layout.hpp


diff --git a/include/math/aabb.hpp b/include/rive/math/aabb.hpp
similarity index 100%
rename from include/math/aabb.hpp
rename to include/rive/math/aabb.hpp


diff --git a/include/math/circle_constant.hpp b/include/rive/math/circle_constant.hpp
similarity index 100%
rename from include/math/circle_constant.hpp
rename to include/rive/math/circle_constant.hpp


diff --git a/include/math/color.hpp b/include/rive/math/color.hpp
similarity index 100%
rename from include/math/color.hpp
rename to include/rive/math/color.hpp


diff --git a/include/math/mat2d.hpp b/include/rive/math/mat2d.hpp
similarity index 100%
rename from include/math/mat2d.hpp
rename to include/rive/math/mat2d.hpp


diff --git a/include/math/transform_components.hpp b/include/rive/math/transform_components.hpp
similarity index 100%
rename from include/math/transform_components.hpp
rename to include/rive/math/transform_components.hpp


diff --git a/include/math/vec2d.hpp b/include/rive/math/vec2d.hpp
similarity index 100%
rename from include/math/vec2d.hpp
rename to include/rive/math/vec2d.hpp


diff --git a/include/node.hpp b/include/rive/node.hpp
similarity index 100%
rename from include/node.hpp
rename to include/rive/node.hpp


diff --git a/include/renderer.hpp b/include/rive/renderer.hpp
similarity index 100%
rename from include/renderer.hpp
rename to include/rive/renderer.hpp


diff --git a/include/runtime_header.hpp b/include/rive/runtime_header.hpp
similarity index 100%
rename from include/runtime_header.hpp
rename to include/rive/runtime_header.hpp


diff --git a/include/shapes/clipping_shape.hpp b/include/rive/shapes/clipping_shape.hpp
similarity index 100%
rename from include/shapes/clipping_shape.hpp
rename to include/rive/shapes/clipping_shape.hpp


diff --git a/include/shapes/cubic_asymmetric_vertex.hpp b/include/rive/shapes/cubic_asymmetric_vertex.hpp
similarity index 100%
rename from include/shapes/cubic_asymmetric_vertex.hpp
rename to include/rive/shapes/cubic_asymmetric_vertex.hpp


diff --git a/include/shapes/cubic_detached_vertex.hpp b/include/rive/shapes/cubic_detached_vertex.hpp
similarity index 100%
rename from include/shapes/cubic_detached_vertex.hpp
rename to include/rive/shapes/cubic_detached_vertex.hpp


diff --git a/include/shapes/cubic_mirrored_vertex.hpp b/include/rive/shapes/cubic_mirrored_vertex.hpp
similarity index 100%
rename from include/shapes/cubic_mirrored_vertex.hpp
rename to include/rive/shapes/cubic_mirrored_vertex.hpp


diff --git a/include/shapes/cubic_vertex.hpp b/include/rive/shapes/cubic_vertex.hpp
similarity index 100%
rename from include/shapes/cubic_vertex.hpp
rename to include/rive/shapes/cubic_vertex.hpp


diff --git a/include/shapes/ellipse.hpp b/include/rive/shapes/ellipse.hpp
similarity index 100%
rename from include/shapes/ellipse.hpp
rename to include/rive/shapes/ellipse.hpp


diff --git a/include/shapes/metrics_path.hpp b/include/rive/shapes/metrics_path.hpp
similarity index 100%
rename from include/shapes/metrics_path.hpp
rename to include/rive/shapes/metrics_path.hpp


diff --git a/include/shapes/paint/blend_mode.hpp b/include/rive/shapes/paint/blend_mode.hpp
similarity index 100%
rename from include/shapes/paint/blend_mode.hpp
rename to include/rive/shapes/paint/blend_mode.hpp


diff --git a/include/shapes/paint/color.hpp b/include/rive/shapes/paint/color.hpp
similarity index 100%
rename from include/shapes/paint/color.hpp
rename to include/rive/shapes/paint/color.hpp


diff --git a/include/shapes/paint/fill.hpp b/include/rive/shapes/paint/fill.hpp
similarity index 100%
rename from include/shapes/paint/fill.hpp
rename to include/rive/shapes/paint/fill.hpp


diff --git a/include/shapes/paint/gradient_stop.hpp b/include/rive/shapes/paint/gradient_stop.hpp
similarity index 100%
rename from include/shapes/paint/gradient_stop.hpp
rename to include/rive/shapes/paint/gradient_stop.hpp


diff --git a/include/shapes/paint/linear_gradient.hpp b/include/rive/shapes/paint/linear_gradient.hpp
similarity index 100%
rename from include/shapes/paint/linear_gradient.hpp
rename to include/rive/shapes/paint/linear_gradient.hpp


diff --git a/include/shapes/paint/radial_gradient.hpp b/include/rive/shapes/paint/radial_gradient.hpp
similarity index 100%
rename from include/shapes/paint/radial_gradient.hpp
rename to include/rive/shapes/paint/radial_gradient.hpp


diff --git a/include/shapes/paint/shape_paint.hpp b/include/rive/shapes/paint/shape_paint.hpp
similarity index 100%
rename from include/shapes/paint/shape_paint.hpp
rename to include/rive/shapes/paint/shape_paint.hpp


diff --git a/include/shapes/paint/shape_paint_mutator.hpp b/include/rive/shapes/paint/shape_paint_mutator.hpp
similarity index 100%
rename from include/shapes/paint/shape_paint_mutator.hpp
rename to include/rive/shapes/paint/shape_paint_mutator.hpp


diff --git a/include/shapes/paint/solid_color.hpp b/include/rive/shapes/paint/solid_color.hpp
similarity index 100%
rename from include/shapes/paint/solid_color.hpp
rename to include/rive/shapes/paint/solid_color.hpp


diff --git a/include/shapes/paint/stroke.hpp b/include/rive/shapes/paint/stroke.hpp
similarity index 100%
rename from include/shapes/paint/stroke.hpp
rename to include/rive/shapes/paint/stroke.hpp


diff --git a/include/shapes/paint/stroke_cap.hpp b/include/rive/shapes/paint/stroke_cap.hpp
similarity index 100%
rename from include/shapes/paint/stroke_cap.hpp
rename to include/rive/shapes/paint/stroke_cap.hpp


diff --git a/include/shapes/paint/stroke_effect.hpp b/include/rive/shapes/paint/stroke_effect.hpp
similarity index 100%
rename from include/shapes/paint/stroke_effect.hpp
rename to include/rive/shapes/paint/stroke_effect.hpp


diff --git a/include/shapes/paint/stroke_join.hpp b/include/rive/shapes/paint/stroke_join.hpp
similarity index 100%
rename from include/shapes/paint/stroke_join.hpp
rename to include/rive/shapes/paint/stroke_join.hpp


diff --git a/include/shapes/paint/trim_path.hpp b/include/rive/shapes/paint/trim_path.hpp
similarity index 100%
rename from include/shapes/paint/trim_path.hpp
rename to include/rive/shapes/paint/trim_path.hpp


diff --git a/include/shapes/parametric_path.hpp b/include/rive/shapes/parametric_path.hpp
similarity index 100%
rename from include/shapes/parametric_path.hpp
rename to include/rive/shapes/parametric_path.hpp


diff --git a/include/shapes/path.hpp b/include/rive/shapes/path.hpp
similarity index 100%
rename from include/shapes/path.hpp
rename to include/rive/shapes/path.hpp


diff --git a/include/shapes/path_composer.hpp b/include/rive/shapes/path_composer.hpp
similarity index 100%
rename from include/shapes/path_composer.hpp
rename to include/rive/shapes/path_composer.hpp


diff --git a/include/shapes/path_space.hpp b/include/rive/shapes/path_space.hpp
similarity index 100%
rename from include/shapes/path_space.hpp
rename to include/rive/shapes/path_space.hpp


diff --git a/include/shapes/path_vertex.hpp b/include/rive/shapes/path_vertex.hpp
similarity index 100%
rename from include/shapes/path_vertex.hpp
rename to include/rive/shapes/path_vertex.hpp


diff --git a/include/shapes/points_path.hpp b/include/rive/shapes/points_path.hpp
similarity index 100%
rename from include/shapes/points_path.hpp
rename to include/rive/shapes/points_path.hpp


diff --git a/include/shapes/polygon.hpp b/include/rive/shapes/polygon.hpp
similarity index 100%
rename from include/shapes/polygon.hpp
rename to include/rive/shapes/polygon.hpp


diff --git a/include/shapes/rectangle.hpp b/include/rive/shapes/rectangle.hpp
similarity index 100%
rename from include/shapes/rectangle.hpp
rename to include/rive/shapes/rectangle.hpp


diff --git a/include/shapes/shape.hpp b/include/rive/shapes/shape.hpp
similarity index 100%
rename from include/shapes/shape.hpp
rename to include/rive/shapes/shape.hpp


diff --git a/include/shapes/shape_paint_container.hpp b/include/rive/shapes/shape_paint_container.hpp
similarity index 100%
rename from include/shapes/shape_paint_container.hpp
rename to include/rive/shapes/shape_paint_container.hpp


diff --git a/include/shapes/star.hpp b/include/rive/shapes/star.hpp
similarity index 100%
rename from include/shapes/star.hpp
rename to include/rive/shapes/star.hpp


diff --git a/include/shapes/straight_vertex.hpp b/include/rive/shapes/straight_vertex.hpp
similarity index 100%
rename from include/shapes/straight_vertex.hpp
rename to include/rive/shapes/straight_vertex.hpp


diff --git a/include/shapes/triangle.hpp b/include/rive/shapes/triangle.hpp
similarity index 100%
rename from include/shapes/triangle.hpp
rename to include/rive/shapes/triangle.hpp


diff --git a/include/status_code.hpp b/include/rive/status_code.hpp
similarity index 100%
rename from include/status_code.hpp
rename to include/rive/status_code.hpp


diff --git a/include/transform_component.hpp b/include/rive/transform_component.hpp
similarity index 100%
rename from include/transform_component.hpp
rename to include/rive/transform_component.hpp


diff --git a/include/transform_space.hpp b/include/rive/transform_space.hpp
similarity index 100%
rename from include/transform_space.hpp
rename to include/rive/transform_space.hpp


diff --git a/src/animation/animation_state.cpp b/src/animation/animation_state.cpp
index ccb6811..ea63f16 100644
--- a/src/animation/animation_state.cpp
+++ b/src/animation/animation_state.cpp

@@ -1,9 +1,9 @@
-#include "animation/animation_state.hpp"
-#include "animation/linear_animation.hpp"
-#include "animation/animation_state_instance.hpp"
-#include "animation/system_state_instance.hpp"
-#include "core_context.hpp"
-#include "artboard.hpp"
+#include "rive/animation/animation_state.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/animation_state_instance.hpp"
+#include "rive/animation/system_state_instance.hpp"
+#include "rive/core_context.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/animation_state_instance.cpp b/src/animation/animation_state_instance.cpp
index b349b63..6b5ca9b 100644
--- a/src/animation/animation_state_instance.cpp
+++ b/src/animation/animation_state_instance.cpp

@@ -1,5 +1,5 @@
-#include "animation/animation_state_instance.hpp"
-#include "animation/animation_state.hpp"
+#include "rive/animation/animation_state_instance.hpp"
+#include "rive/animation/animation_state.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_animation.cpp b/src/animation/blend_animation.cpp
index 43c4dc7..5a319ba 100644
--- a/src/animation/blend_animation.cpp
+++ b/src/animation/blend_animation.cpp

@@ -1,8 +1,8 @@
-#include "artboard.hpp"
-#include "animation/blend_animation.hpp"
-#include "animation/layer_state.hpp"
-#include "importers/layer_state_importer.hpp"
-#include "importers/artboard_importer.hpp"
+#include "rive/artboard.hpp"
+#include "rive/animation/blend_animation.hpp"
+#include "rive/animation/layer_state.hpp"
+#include "rive/importers/layer_state_importer.hpp"
+#include "rive/importers/artboard_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_animation_1d.cpp b/src/animation/blend_animation_1d.cpp
index 607f142..d4c930d 100644
--- a/src/animation/blend_animation_1d.cpp
+++ b/src/animation/blend_animation_1d.cpp

@@ -1,4 +1,4 @@
-#include "animation/blend_animation_1d.hpp"
+#include "rive/animation/blend_animation_1d.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_animation_direct.cpp b/src/animation/blend_animation_direct.cpp
index 5013f1e..a64eb06 100644
--- a/src/animation/blend_animation_direct.cpp
+++ b/src/animation/blend_animation_direct.cpp

@@ -1,7 +1,7 @@
-#include "animation/blend_animation_direct.hpp"
-#include "animation/state_machine.hpp"
-#include "animation/state_machine_number.hpp"
-#include "importers/state_machine_importer.hpp"
+#include "rive/animation/blend_animation_direct.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/importers/state_machine_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_state.cpp b/src/animation/blend_state.cpp
index 856514d..8ba0fba 100644
--- a/src/animation/blend_state.cpp
+++ b/src/animation/blend_state.cpp

@@ -1,5 +1,5 @@
-#include "animation/blend_state.hpp"
-#include "animation/blend_animation.hpp"
+#include "rive/animation/blend_state.hpp"
+#include "rive/animation/blend_animation.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_state_1d.cpp b/src/animation/blend_state_1d.cpp
index 965a0d1..e4a4da9 100644
--- a/src/animation/blend_state_1d.cpp
+++ b/src/animation/blend_state_1d.cpp

@@ -1,8 +1,8 @@
-#include "animation/blend_state_1d.hpp"
-#include "animation/state_machine.hpp"
-#include "animation/state_machine_number.hpp"
-#include "animation/blend_state_1d_instance.hpp"
-#include "importers/state_machine_importer.hpp"
+#include "rive/animation/blend_state_1d.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/animation/blend_state_1d_instance.hpp"
+#include "rive/importers/state_machine_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_state_1d_instance.cpp b/src/animation/blend_state_1d_instance.cpp
index d14b3d4..690ea3c 100644
--- a/src/animation/blend_state_1d_instance.cpp
+++ b/src/animation/blend_state_1d_instance.cpp

@@ -1,5 +1,5 @@
-#include "animation/blend_state_1d_instance.hpp"
-#include "animation/state_machine_input_instance.hpp"
+#include "rive/animation/blend_state_1d_instance.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_state_direct.cpp b/src/animation/blend_state_direct.cpp
index 67356b2..d439f73 100644
--- a/src/animation/blend_state_direct.cpp
+++ b/src/animation/blend_state_direct.cpp

@@ -1,8 +1,8 @@
-#include "animation/blend_state_direct.hpp"
-#include "animation/state_machine.hpp"
-#include "animation/state_machine_number.hpp"
-#include "animation/blend_state_direct_instance.hpp"
-#include "importers/state_machine_importer.hpp"
+#include "rive/animation/blend_state_direct.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/animation/blend_state_direct_instance.hpp"
+#include "rive/importers/state_machine_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_state_direct_instance.cpp b/src/animation/blend_state_direct_instance.cpp
index 1e2bef8..fa3bf17 100644
--- a/src/animation/blend_state_direct_instance.cpp
+++ b/src/animation/blend_state_direct_instance.cpp

@@ -1,5 +1,5 @@
-#include "animation/blend_state_direct_instance.hpp"
-#include "animation/state_machine_input_instance.hpp"
+#include "rive/animation/blend_state_direct_instance.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/blend_state_transition.cpp b/src/animation/blend_state_transition.cpp
index de3d807..7068a6d 100644
--- a/src/animation/blend_state_transition.cpp
+++ b/src/animation/blend_state_transition.cpp

@@ -1,10 +1,10 @@
-#include "artboard.hpp"
-#include "animation/blend_state_transition.hpp"
-#include "animation/blend_state_instance.hpp"
-#include "animation/blend_state_1d.hpp"
-#include "animation/blend_state_direct.hpp"
-#include "animation/blend_state_1d_instance.hpp"
-#include "animation/blend_state_direct_instance.hpp"
+#include "rive/artboard.hpp"
+#include "rive/animation/blend_state_transition.hpp"
+#include "rive/animation/blend_state_instance.hpp"
+#include "rive/animation/blend_state_1d.hpp"
+#include "rive/animation/blend_state_direct.hpp"
+#include "rive/animation/blend_state_1d_instance.hpp"
+#include "rive/animation/blend_state_direct_instance.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/cubic_interpolator.cpp b/src/animation/cubic_interpolator.cpp
index 7de6139..6d33fc8 100644
--- a/src/animation/cubic_interpolator.cpp
+++ b/src/animation/cubic_interpolator.cpp

@@ -1,7 +1,7 @@
-#include "animation/cubic_interpolator.hpp"
-#include "artboard.hpp"
-#include "importers/artboard_importer.hpp"
-#include "importers/import_stack.hpp"
+#include "rive/animation/cubic_interpolator.hpp"
+#include "rive/artboard.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/importers/import_stack.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/animation/keyed_object.cpp b/src/animation/keyed_object.cpp
index 73738a2..f27386c 100644
--- a/src/animation/keyed_object.cpp
+++ b/src/animation/keyed_object.cpp

@@ -1,8 +1,8 @@
-#include "animation/keyed_object.hpp"
-#include "animation/keyed_property.hpp"
-#include "animation/linear_animation.hpp"
-#include "artboard.hpp"
-#include "importers/linear_animation_importer.hpp"
+#include "rive/animation/keyed_object.hpp"
+#include "rive/animation/keyed_property.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/artboard.hpp"
+#include "rive/importers/linear_animation_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/keyed_property.cpp b/src/animation/keyed_property.cpp
index ab7c9b5..9f6d7b2 100644
--- a/src/animation/keyed_property.cpp
+++ b/src/animation/keyed_property.cpp

@@ -1,8 +1,8 @@
-#include "animation/keyed_property.hpp"
-#include "animation/keyed_object.hpp"
-#include "animation/keyframe.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/keyed_object_importer.hpp"
+#include "rive/animation/keyed_property.hpp"
+#include "rive/animation/keyed_object.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/keyed_object_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/keyframe.cpp b/src/animation/keyframe.cpp
index b25cdf9..3f76471 100644
--- a/src/animation/keyframe.cpp
+++ b/src/animation/keyframe.cpp

@@ -1,9 +1,9 @@
-#include "animation/keyframe.hpp"
-#include "animation/cubic_interpolator.hpp"
-#include "animation/keyed_property.hpp"
-#include "core_context.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/keyed_property_importer.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/animation/cubic_interpolator.hpp"
+#include "rive/animation/keyed_property.hpp"
+#include "rive/core_context.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/keyed_property_importer.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/keyframe_color.cpp b/src/animation/keyframe_color.cpp
index f51ad27..3dcd5ab 100644
--- a/src/animation/keyframe_color.cpp
+++ b/src/animation/keyframe_color.cpp

@@ -1,6 +1,6 @@
-#include "animation/keyframe_color.hpp"
-#include "generated/core_registry.hpp"
-#include "shapes/paint/color.hpp"
+#include "rive/animation/keyframe_color.hpp"
+#include "rive/generated/core_registry.hpp"
+#include "rive/shapes/paint/color.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/keyframe_double.cpp b/src/animation/keyframe_double.cpp
index bc57c04..1fcc2e1 100644
--- a/src/animation/keyframe_double.cpp
+++ b/src/animation/keyframe_double.cpp

@@ -1,5 +1,5 @@
-#include "animation/keyframe_double.hpp"
-#include "generated/core_registry.hpp"
+#include "rive/animation/keyframe_double.hpp"
+#include "rive/generated/core_registry.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/keyframe_id.cpp b/src/animation/keyframe_id.cpp
index 7fbc94c..dfcc104 100644
--- a/src/animation/keyframe_id.cpp
+++ b/src/animation/keyframe_id.cpp

@@ -1,5 +1,5 @@
-#include "animation/keyframe_id.hpp"
-#include "generated/core_registry.hpp"
+#include "rive/animation/keyframe_id.hpp"
+#include "rive/generated/core_registry.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/layer_state.cpp b/src/animation/layer_state.cpp
index a40de0e..f4c5446 100644
--- a/src/animation/layer_state.cpp
+++ b/src/animation/layer_state.cpp

@@ -1,10 +1,10 @@
-#include "animation/layer_state.hpp"
-#include "animation/transition_bool_condition.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/state_machine_layer_importer.hpp"
-#include "generated/animation/state_machine_layer_base.hpp"
-#include "animation/state_transition.hpp"
-#include "animation/system_state_instance.hpp"
+#include "rive/animation/layer_state.hpp"
+#include "rive/animation/transition_bool_condition.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/state_machine_layer_importer.hpp"
+#include "rive/generated/animation/state_machine_layer_base.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/animation/system_state_instance.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/linear_animation.cpp b/src/animation/linear_animation.cpp
index adab0f2..1ec54c4 100644
--- a/src/animation/linear_animation.cpp
+++ b/src/animation/linear_animation.cpp

@@ -1,8 +1,8 @@
-#include "animation/linear_animation.hpp"
-#include "animation/keyed_object.hpp"
-#include "artboard.hpp"
-#include "importers/artboard_importer.hpp"
-#include "importers/import_stack.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/keyed_object.hpp"
+#include "rive/artboard.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/importers/import_stack.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/linear_animation_instance.cpp b/src/animation/linear_animation_instance.cpp
index b58e006..8240476 100644
--- a/src/animation/linear_animation_instance.cpp
+++ b/src/animation/linear_animation_instance.cpp

@@ -1,6 +1,6 @@
-#include "animation/linear_animation_instance.hpp"
-#include "animation/linear_animation.hpp"
-#include "animation/loop.hpp"
+#include "rive/animation/linear_animation_instance.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/loop.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/animation/state_instance.cpp b/src/animation/state_instance.cpp
index dc9e49e..b39b08d 100644
--- a/src/animation/state_instance.cpp
+++ b/src/animation/state_instance.cpp

@@ -1,4 +1,4 @@
-#include "animation/state_instance.hpp"
+#include "rive/animation/state_instance.hpp"
 using namespace rive;
 
 StateInstance::StateInstance(const LayerState* layerState) :

diff --git a/src/animation/state_machine.cpp b/src/animation/state_machine.cpp
index 6103052..7d1caa8 100644
--- a/src/animation/state_machine.cpp
+++ b/src/animation/state_machine.cpp

@@ -1,8 +1,8 @@
-#include "animation/state_machine.hpp"
-#include "artboard.hpp"
-#include "importers/artboard_importer.hpp"
-#include "animation/state_machine_layer.hpp"
-#include "animation/state_machine_input.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/artboard.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/animation/state_machine_layer.hpp"
+#include "rive/animation/state_machine_input.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/state_machine_input.cpp b/src/animation/state_machine_input.cpp
index db65528..1bc26a3 100644
--- a/src/animation/state_machine_input.cpp
+++ b/src/animation/state_machine_input.cpp

@@ -1,7 +1,7 @@
-#include "animation/state_machine_input.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/state_machine_importer.hpp"
-#include "generated/animation/state_machine_base.hpp"
+#include "rive/animation/state_machine_input.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/state_machine_importer.hpp"
+#include "rive/generated/animation/state_machine_base.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/state_machine_input_instance.cpp b/src/animation/state_machine_input_instance.cpp
index 692a8c0..f1a4706 100644
--- a/src/animation/state_machine_input_instance.cpp
+++ b/src/animation/state_machine_input_instance.cpp

@@ -1,8 +1,8 @@
-#include "animation/state_machine_input_instance.hpp"
-#include "animation/state_machine_bool.hpp"
-#include "animation/state_machine_number.hpp"
-#include "animation/state_machine_trigger.hpp"
-#include "animation/state_machine_instance.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
+#include "rive/animation/state_machine_bool.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/animation/state_machine_trigger.hpp"
+#include "rive/animation/state_machine_instance.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/state_machine_instance.cpp b/src/animation/state_machine_instance.cpp
index 86ac51b..ccb5db0 100644
--- a/src/animation/state_machine_instance.cpp
+++ b/src/animation/state_machine_instance.cpp

@@ -1,18 +1,18 @@
-#include "animation/state_machine_instance.hpp"
-#include "animation/state_machine_input.hpp"
-#include "animation/state_machine_bool.hpp"
-#include "animation/state_machine_number.hpp"
-#include "animation/state_machine_trigger.hpp"
-#include "animation/state_machine_input_instance.hpp"
-#include "animation/state_machine.hpp"
-#include "animation/state_machine_layer.hpp"
-#include "animation/any_state.hpp"
-#include "animation/entry_state.hpp"
-#include "animation/state_transition.hpp"
-#include "animation/transition_condition.hpp"
-#include "animation/animation_state.hpp"
-#include "animation/state_instance.hpp"
-#include "animation/animation_state_instance.hpp"
+#include "rive/animation/state_machine_instance.hpp"
+#include "rive/animation/state_machine_input.hpp"
+#include "rive/animation/state_machine_bool.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/animation/state_machine_trigger.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/animation/state_machine_layer.hpp"
+#include "rive/animation/any_state.hpp"
+#include "rive/animation/entry_state.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/animation/transition_condition.hpp"
+#include "rive/animation/animation_state.hpp"
+#include "rive/animation/state_instance.hpp"
+#include "rive/animation/animation_state_instance.hpp"
 
 using namespace rive;
 namespace rive

diff --git a/src/animation/state_machine_layer.cpp b/src/animation/state_machine_layer.cpp
index 5f17007..de5e157 100644
--- a/src/animation/state_machine_layer.cpp
+++ b/src/animation/state_machine_layer.cpp

@@ -1,10 +1,10 @@
-#include "animation/state_machine_layer.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/state_machine_importer.hpp"
-#include "generated/animation/state_machine_base.hpp"
-#include "animation/any_state.hpp"
-#include "animation/entry_state.hpp"
-#include "animation/exit_state.hpp"
+#include "rive/animation/state_machine_layer.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/state_machine_importer.hpp"
+#include "rive/generated/animation/state_machine_base.hpp"
+#include "rive/animation/any_state.hpp"
+#include "rive/animation/entry_state.hpp"
+#include "rive/animation/exit_state.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/state_transition.cpp b/src/animation/state_transition.cpp
index 8bbce44..754b657 100644
--- a/src/animation/state_transition.cpp
+++ b/src/animation/state_transition.cpp

@@ -1,14 +1,14 @@
-#include "animation/state_transition.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/layer_state_importer.hpp"
-#include "animation/layer_state.hpp"
-#include "animation/transition_condition.hpp"
-#include "animation/animation_state.hpp"
-#include "animation/linear_animation.hpp"
-#include "animation/state_machine_input_instance.hpp"
-#include "animation/state_machine_trigger.hpp"
-#include "animation/animation_state_instance.hpp"
-#include "animation/transition_trigger_condition.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/layer_state_importer.hpp"
+#include "rive/animation/layer_state.hpp"
+#include "rive/animation/transition_condition.hpp"
+#include "rive/animation/animation_state.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
+#include "rive/animation/state_machine_trigger.hpp"
+#include "rive/animation/animation_state_instance.hpp"
+#include "rive/animation/transition_trigger_condition.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/system_state_instance.cpp b/src/animation/system_state_instance.cpp
index 54c5d0e..347f7d5 100644
--- a/src/animation/system_state_instance.cpp
+++ b/src/animation/system_state_instance.cpp

@@ -1,4 +1,4 @@
-#include "animation/system_state_instance.hpp"
+#include "rive/animation/system_state_instance.hpp"
 using namespace rive;
 
 SystemStateInstance::SystemStateInstance(const LayerState* layerState) :

diff --git a/src/animation/transition_bool_condition.cpp b/src/animation/transition_bool_condition.cpp
index a4c795c..2437bdc 100644
--- a/src/animation/transition_bool_condition.cpp
+++ b/src/animation/transition_bool_condition.cpp

@@ -1,7 +1,7 @@
-#include "animation/transition_bool_condition.hpp"
-#include "animation/state_machine_input_instance.hpp"
-#include "animation/state_machine_bool.hpp"
-#include "animation/transition_condition_op.hpp"
+#include "rive/animation/transition_bool_condition.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
+#include "rive/animation/state_machine_bool.hpp"
+#include "rive/animation/transition_condition_op.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/transition_condition.cpp b/src/animation/transition_condition.cpp
index e12a50b..e9012e7 100644
--- a/src/animation/transition_condition.cpp
+++ b/src/animation/transition_condition.cpp

@@ -1,8 +1,8 @@
-#include "animation/transition_bool_condition.hpp"
-#include "animation/state_transition.hpp"
-#include "importers/state_transition_importer.hpp"
-#include "importers/state_machine_importer.hpp"
-#include "animation/state_machine.hpp"
+#include "rive/animation/transition_bool_condition.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/importers/state_transition_importer.hpp"
+#include "rive/importers/state_machine_importer.hpp"
+#include "rive/animation/state_machine.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/transition_number_condition.cpp b/src/animation/transition_number_condition.cpp
index 815312f..33b44fa 100644
--- a/src/animation/transition_number_condition.cpp
+++ b/src/animation/transition_number_condition.cpp

@@ -1,7 +1,7 @@
-#include "animation/transition_number_condition.hpp"
-#include "animation/state_machine_input_instance.hpp"
-#include "animation/state_machine_number.hpp"
-#include "animation/transition_condition_op.hpp"
+#include "rive/animation/transition_number_condition.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
+#include "rive/animation/state_machine_number.hpp"
+#include "rive/animation/transition_condition_op.hpp"
 
 using namespace rive;
 

diff --git a/src/animation/transition_trigger_condition.cpp b/src/animation/transition_trigger_condition.cpp
index 63306e8..f4755e5 100644
--- a/src/animation/transition_trigger_condition.cpp
+++ b/src/animation/transition_trigger_condition.cpp

@@ -1,7 +1,7 @@
-#include "animation/transition_trigger_condition.hpp"
-#include "animation/state_machine_input_instance.hpp"
-#include "animation/state_machine_trigger.hpp"
-#include "animation/transition_condition_op.hpp"
+#include "rive/animation/transition_trigger_condition.hpp"
+#include "rive/animation/state_machine_input_instance.hpp"
+#include "rive/animation/state_machine_trigger.hpp"
+#include "rive/animation/transition_condition_op.hpp"
 
 using namespace rive;
 

diff --git a/src/artboard.cpp b/src/artboard.cpp
index 5f5f4a5..78b8844 100644
--- a/src/artboard.cpp
+++ b/src/artboard.cpp

@@ -1,13 +1,13 @@
-#include "artboard.hpp"
-#include "animation/animation.hpp"
-#include "dependency_sorter.hpp"
-#include "draw_rules.hpp"
-#include "draw_target.hpp"
-#include "draw_target_placement.hpp"
-#include "drawable.hpp"
-#include "node.hpp"
-#include "renderer.hpp"
-#include "shapes/paint/shape_paint.hpp"
+#include "rive/artboard.hpp"
+#include "rive/animation/animation.hpp"
+#include "rive/dependency_sorter.hpp"
+#include "rive/draw_rules.hpp"
+#include "rive/draw_target.hpp"
+#include "rive/draw_target_placement.hpp"
+#include "rive/drawable.hpp"
+#include "rive/node.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
 #include <unordered_map>
 
 using namespace rive;

diff --git a/src/bones/bone.cpp b/src/bones/bone.cpp
index 16abe0c..49e1990 100644
--- a/src/bones/bone.cpp
+++ b/src/bones/bone.cpp

@@ -1,5 +1,5 @@
-#include "bones/bone.hpp"
-#include "math/vec2d.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/math/vec2d.hpp"
 #include <algorithm>
 
 using namespace rive;

diff --git a/src/bones/root_bone.cpp b/src/bones/root_bone.cpp
index 02d2a47..8ae5598 100644
--- a/src/bones/root_bone.cpp
+++ b/src/bones/root_bone.cpp

@@ -1,4 +1,4 @@
-#include "bones/root_bone.hpp"
+#include "rive/bones/root_bone.hpp"
 
 using namespace rive;
 

diff --git a/src/bones/skin.cpp b/src/bones/skin.cpp
index 202e1c5..a0d38a1 100644
--- a/src/bones/skin.cpp
+++ b/src/bones/skin.cpp

@@ -1,9 +1,9 @@
-#include "bones/skin.hpp"
-#include "bones/bone.hpp"
-#include "bones/skinnable.hpp"
-#include "bones/tendon.hpp"
-#include "shapes/path_vertex.hpp"
-#include "constraints/constraint.hpp"
+#include "rive/bones/skin.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/bones/skinnable.hpp"
+#include "rive/bones/tendon.hpp"
+#include "rive/shapes/path_vertex.hpp"
+#include "rive/constraints/constraint.hpp"
 
 using namespace rive;
 

diff --git a/src/bones/skinnable.cpp b/src/bones/skinnable.cpp
index 7c09ed4..95f6dcb 100644
--- a/src/bones/skinnable.cpp
+++ b/src/bones/skinnable.cpp

@@ -1,5 +1,5 @@
-#include "bones/skinnable.hpp"
-#include "shapes/points_path.hpp"
+#include "rive/bones/skinnable.hpp"
+#include "rive/shapes/points_path.hpp"
 
 using namespace rive;
 

diff --git a/src/bones/tendon.cpp b/src/bones/tendon.cpp
index 1e5aea3..f213446 100644
--- a/src/bones/tendon.cpp
+++ b/src/bones/tendon.cpp

@@ -1,7 +1,7 @@
-#include "bones/tendon.hpp"
-#include "bones/bone.hpp"
-#include "bones/skin.hpp"
-#include "core_context.hpp"
+#include "rive/bones/tendon.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/bones/skin.hpp"
+#include "rive/core_context.hpp"
 
 using namespace rive;
 

diff --git a/src/bones/weight.cpp b/src/bones/weight.cpp
index 5c16a94..3630617 100644
--- a/src/bones/weight.cpp
+++ b/src/bones/weight.cpp

@@ -1,6 +1,6 @@
-#include "bones/weight.hpp"
-#include "container_component.hpp"
-#include "shapes/path_vertex.hpp"
+#include "rive/bones/weight.hpp"
+#include "rive/container_component.hpp"
+#include "rive/shapes/path_vertex.hpp"
 
 using namespace rive;
 

diff --git a/src/component.cpp b/src/component.cpp
index 9598bf0..08bfec0 100644
--- a/src/component.cpp
+++ b/src/component.cpp

@@ -1,9 +1,9 @@
-#include "component.hpp"
-#include "artboard.hpp"
-#include "container_component.hpp"
-#include "core_context.hpp"
-#include "importers/artboard_importer.hpp"
-#include "importers/import_stack.hpp"
+#include "rive/component.hpp"
+#include "rive/artboard.hpp"
+#include "rive/container_component.hpp"
+#include "rive/core_context.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/importers/import_stack.hpp"
 #include <algorithm>
 
 using namespace rive;

diff --git a/src/constraints/constraint.cpp b/src/constraints/constraint.cpp
index 503f024..292c638 100644
--- a/src/constraints/constraint.cpp
+++ b/src/constraints/constraint.cpp

@@ -1,9 +1,9 @@
-#include "constraints/constraint.hpp"
-#include "container_component.hpp"
-#include "transform_component.hpp"
-#include "core_context.hpp"
-#include "artboard.hpp"
-#include "math/mat2d.hpp"
+#include "rive/constraints/constraint.hpp"
+#include "rive/container_component.hpp"
+#include "rive/transform_component.hpp"
+#include "rive/core_context.hpp"
+#include "rive/artboard.hpp"
+#include "rive/math/mat2d.hpp"
 
 using namespace rive;
 

diff --git a/src/constraints/distance_constraint.cpp b/src/constraints/distance_constraint.cpp
index 24aae5c..06873fe 100644
--- a/src/constraints/distance_constraint.cpp
+++ b/src/constraints/distance_constraint.cpp

@@ -1,6 +1,6 @@
-#include "constraints/distance_constraint.hpp"
-#include "bones/bone.hpp"
-#include "artboard.hpp"
+#include "rive/constraints/distance_constraint.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/artboard.hpp"
 #include <algorithm>
 
 using namespace rive;

diff --git a/src/constraints/ik_constraint.cpp b/src/constraints/ik_constraint.cpp
index 2f74b92..66e3a2d 100644
--- a/src/constraints/ik_constraint.cpp
+++ b/src/constraints/ik_constraint.cpp

@@ -1,6 +1,6 @@
-#include "constraints/ik_constraint.hpp"
-#include "bones/bone.hpp"
-#include "artboard.hpp"
+#include "rive/constraints/ik_constraint.hpp"
+#include "rive/bones/bone.hpp"
+#include "rive/artboard.hpp"
 #include <algorithm>
 
 using namespace rive;

diff --git a/src/constraints/targeted_constraint.cpp b/src/constraints/targeted_constraint.cpp
index 762462c..4ab500b 100644
--- a/src/constraints/targeted_constraint.cpp
+++ b/src/constraints/targeted_constraint.cpp

@@ -1,6 +1,6 @@
-#include "constraints/targeted_constraint.hpp"
-#include "transform_component.hpp"
-#include "core_context.hpp"
+#include "rive/constraints/targeted_constraint.hpp"
+#include "rive/transform_component.hpp"
+#include "rive/core_context.hpp"
 
 using namespace rive;
 

diff --git a/src/constraints/transform_constraint.cpp b/src/constraints/transform_constraint.cpp
index 36a9ab3..c29dacd 100644
--- a/src/constraints/transform_constraint.cpp
+++ b/src/constraints/transform_constraint.cpp

@@ -1,6 +1,6 @@
-#include "constraints/transform_constraint.hpp"
-#include "transform_component.hpp"
-#include "math/mat2d.hpp"
+#include "rive/constraints/transform_constraint.hpp"
+#include "rive/transform_component.hpp"
+#include "rive/math/mat2d.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/core/binary_reader.cpp b/src/core/binary_reader.cpp
index 66efb61..d2fbae6 100644
--- a/src/core/binary_reader.cpp
+++ b/src/core/binary_reader.cpp

@@ -1,5 +1,5 @@
-#include "core/binary_reader.hpp"
-#include "core/reader.h"
+#include "rive/core/binary_reader.hpp"
+#include "rive/core/reader.h"
 #include <vector>
 
 using namespace rive;

diff --git a/src/core/field_types/core_bool_type.cpp b/src/core/field_types/core_bool_type.cpp
index eb956eb..9fa5681 100644
--- a/src/core/field_types/core_bool_type.cpp
+++ b/src/core/field_types/core_bool_type.cpp

@@ -1,5 +1,5 @@
-#include "core/field_types/core_bool_type.hpp"
-#include "core/binary_reader.hpp"
+#include "rive/core/field_types/core_bool_type.hpp"
+#include "rive/core/binary_reader.hpp"
 
 using namespace rive;
 

diff --git a/src/core/field_types/core_color_type.cpp b/src/core/field_types/core_color_type.cpp
index ade817b..99a6133 100644
--- a/src/core/field_types/core_color_type.cpp
+++ b/src/core/field_types/core_color_type.cpp

@@ -1,5 +1,5 @@
-#include "core/field_types/core_color_type.hpp"
-#include "core/binary_reader.hpp"
+#include "rive/core/field_types/core_color_type.hpp"
+#include "rive/core/binary_reader.hpp"
 
 using namespace rive;
 

diff --git a/src/core/field_types/core_double_type.cpp b/src/core/field_types/core_double_type.cpp
index a645d8a..496a2ab 100644
--- a/src/core/field_types/core_double_type.cpp
+++ b/src/core/field_types/core_double_type.cpp

@@ -1,5 +1,5 @@
-#include "core/field_types/core_double_type.hpp"
-#include "core/binary_reader.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/binary_reader.hpp"
 
 using namespace rive;
 

diff --git a/src/core/field_types/core_string_type.cpp b/src/core/field_types/core_string_type.cpp
index 37da03d..48ffc44 100644
--- a/src/core/field_types/core_string_type.cpp
+++ b/src/core/field_types/core_string_type.cpp

@@ -1,5 +1,5 @@
-#include "core/field_types/core_string_type.hpp"
-#include "core/binary_reader.hpp"
+#include "rive/core/field_types/core_string_type.hpp"
+#include "rive/core/binary_reader.hpp"
 
 using namespace rive;
 

diff --git a/src/core/field_types/core_uint_type.cpp b/src/core/field_types/core_uint_type.cpp
index aeb7a60..a2b54fc 100644
--- a/src/core/field_types/core_uint_type.cpp
+++ b/src/core/field_types/core_uint_type.cpp

@@ -1,5 +1,5 @@
-#include "core/field_types/core_uint_type.hpp"
-#include "core/binary_reader.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/core/binary_reader.hpp"
 
 using namespace rive;
 

diff --git a/src/dependency_sorter.cpp b/src/dependency_sorter.cpp
index 34b3033..3ae140d 100644
--- a/src/dependency_sorter.cpp
+++ b/src/dependency_sorter.cpp

@@ -1,5 +1,5 @@
-#include "dependency_sorter.hpp"
-#include "component.hpp"
+#include "rive/dependency_sorter.hpp"
+#include "rive/component.hpp"
 
 using namespace rive;
 

diff --git a/src/draw_rules.cpp b/src/draw_rules.cpp
index f838320..13cd4ee 100644
--- a/src/draw_rules.cpp
+++ b/src/draw_rules.cpp

@@ -1,7 +1,7 @@
-#include "draw_rules.hpp"
-#include "artboard.hpp"
-#include "core_context.hpp"
-#include "draw_target.hpp"
+#include "rive/draw_rules.hpp"
+#include "rive/artboard.hpp"
+#include "rive/core_context.hpp"
+#include "rive/draw_target.hpp"
 
 using namespace rive;
 

diff --git a/src/draw_target.cpp b/src/draw_target.cpp
index c061036..05e1efe 100644
--- a/src/draw_target.cpp
+++ b/src/draw_target.cpp

@@ -1,7 +1,7 @@
-#include "draw_target.hpp"
-#include "core_context.hpp"
-#include "drawable.hpp"
-#include "artboard.hpp"
+#include "rive/draw_target.hpp"
+#include "rive/core_context.hpp"
+#include "rive/drawable.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 

diff --git a/src/drawable.cpp b/src/drawable.cpp
index 40760bd..02ed17b 100644
--- a/src/drawable.cpp
+++ b/src/drawable.cpp

@@ -1,8 +1,8 @@
-#include "drawable.hpp"
-#include "artboard.hpp"
-#include "shapes/clipping_shape.hpp"
-#include "shapes/path_composer.hpp"
-#include "shapes/shape.hpp"
+#include "rive/drawable.hpp"
+#include "rive/artboard.hpp"
+#include "rive/shapes/clipping_shape.hpp"
+#include "rive/shapes/path_composer.hpp"
+#include "rive/shapes/shape.hpp"
 
 using namespace rive;
 

diff --git a/src/file.cpp b/src/file.cpp
index 02002d9..d4f8fb7 100644
--- a/src/file.cpp
+++ b/src/file.cpp

@@ -1,26 +1,26 @@
-#include "file.hpp"
-#include "animation/animation.hpp"
-#include "core/field_types/core_color_type.hpp"
-#include "core/field_types/core_double_type.hpp"
-#include "core/field_types/core_string_type.hpp"
-#include "core/field_types/core_uint_type.hpp"
-#include "generated/core_registry.hpp"
-#include "importers/artboard_importer.hpp"
-#include "importers/import_stack.hpp"
-#include "importers/keyed_object_importer.hpp"
-#include "importers/keyed_property_importer.hpp"
-#include "importers/linear_animation_importer.hpp"
-#include "importers/state_machine_importer.hpp"
-#include "importers/state_machine_layer_importer.hpp"
-#include "importers/layer_state_importer.hpp"
-#include "importers/state_transition_importer.hpp"
-#include "animation/blend_state_transition.hpp"
-#include "animation/any_state.hpp"
-#include "animation/entry_state.hpp"
-#include "animation/exit_state.hpp"
-#include "animation/animation_state.hpp"
-#include "animation/blend_state_1d.hpp"
-#include "animation/blend_state_direct.hpp"
+#include "rive/file.hpp"
+#include "rive/animation/animation.hpp"
+#include "rive/core/field_types/core_color_type.hpp"
+#include "rive/core/field_types/core_double_type.hpp"
+#include "rive/core/field_types/core_string_type.hpp"
+#include "rive/core/field_types/core_uint_type.hpp"
+#include "rive/generated/core_registry.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/importers/import_stack.hpp"
+#include "rive/importers/keyed_object_importer.hpp"
+#include "rive/importers/keyed_property_importer.hpp"
+#include "rive/importers/linear_animation_importer.hpp"
+#include "rive/importers/state_machine_importer.hpp"
+#include "rive/importers/state_machine_layer_importer.hpp"
+#include "rive/importers/layer_state_importer.hpp"
+#include "rive/importers/state_transition_importer.hpp"
+#include "rive/animation/blend_state_transition.hpp"
+#include "rive/animation/any_state.hpp"
+#include "rive/animation/entry_state.hpp"
+#include "rive/animation/exit_state.hpp"
+#include "rive/animation/animation_state.hpp"
+#include "rive/animation/blend_state_1d.hpp"
+#include "rive/animation/blend_state_direct.hpp"
 
 // Default namespace for Rive Cpp code
 using namespace rive;

diff --git a/src/generated/animation/animation_base.cpp b/src/generated/animation/animation_base.cpp
index f91d78d..e464750 100644
--- a/src/generated/animation/animation_base.cpp
+++ b/src/generated/animation/animation_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/animation_base.hpp"
-#include "animation/animation.hpp"
+#include "rive/generated/animation/animation_base.hpp"
+#include "rive/animation/animation.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/animation_state_base.cpp b/src/generated/animation/animation_state_base.cpp
index 1ca34dc..b4a0766 100644
--- a/src/generated/animation/animation_state_base.cpp
+++ b/src/generated/animation/animation_state_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/animation_state_base.hpp"
-#include "animation/animation_state.hpp"
+#include "rive/generated/animation/animation_state_base.hpp"
+#include "rive/animation/animation_state.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/any_state_base.cpp b/src/generated/animation/any_state_base.cpp
index f94d5d1..4856036 100644
--- a/src/generated/animation/any_state_base.cpp
+++ b/src/generated/animation/any_state_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/any_state_base.hpp"
-#include "animation/any_state.hpp"
+#include "rive/generated/animation/any_state_base.hpp"
+#include "rive/animation/any_state.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/blend_animation_1d_base.cpp b/src/generated/animation/blend_animation_1d_base.cpp
index 977b998..05a461e 100644
--- a/src/generated/animation/blend_animation_1d_base.cpp
+++ b/src/generated/animation/blend_animation_1d_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/blend_animation_1d_base.hpp"
-#include "animation/blend_animation_1d.hpp"
+#include "rive/generated/animation/blend_animation_1d_base.hpp"
+#include "rive/animation/blend_animation_1d.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/blend_animation_direct_base.cpp b/src/generated/animation/blend_animation_direct_base.cpp
index 78b893b..5b95866 100644
--- a/src/generated/animation/blend_animation_direct_base.cpp
+++ b/src/generated/animation/blend_animation_direct_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/blend_animation_direct_base.hpp"
-#include "animation/blend_animation_direct.hpp"
+#include "rive/generated/animation/blend_animation_direct_base.hpp"
+#include "rive/animation/blend_animation_direct.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/blend_state_1d_base.cpp b/src/generated/animation/blend_state_1d_base.cpp
index 000e3aa..81bffaa 100644
--- a/src/generated/animation/blend_state_1d_base.cpp
+++ b/src/generated/animation/blend_state_1d_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/blend_state_1d_base.hpp"
-#include "animation/blend_state_1d.hpp"
+#include "rive/generated/animation/blend_state_1d_base.hpp"
+#include "rive/animation/blend_state_1d.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/blend_state_direct_base.cpp b/src/generated/animation/blend_state_direct_base.cpp
index 8ba42f5..3e794ae 100644
--- a/src/generated/animation/blend_state_direct_base.cpp
+++ b/src/generated/animation/blend_state_direct_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/blend_state_direct_base.hpp"
-#include "animation/blend_state_direct.hpp"
+#include "rive/generated/animation/blend_state_direct_base.hpp"
+#include "rive/animation/blend_state_direct.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/blend_state_transition_base.cpp b/src/generated/animation/blend_state_transition_base.cpp
index a0749c9..372aeb4 100644
--- a/src/generated/animation/blend_state_transition_base.cpp
+++ b/src/generated/animation/blend_state_transition_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/blend_state_transition_base.hpp"
-#include "animation/blend_state_transition.hpp"
+#include "rive/generated/animation/blend_state_transition_base.hpp"
+#include "rive/animation/blend_state_transition.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/cubic_interpolator_base.cpp b/src/generated/animation/cubic_interpolator_base.cpp
index 86b7683..98f75a0 100644
--- a/src/generated/animation/cubic_interpolator_base.cpp
+++ b/src/generated/animation/cubic_interpolator_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/cubic_interpolator_base.hpp"
-#include "animation/cubic_interpolator.hpp"
+#include "rive/generated/animation/cubic_interpolator_base.hpp"
+#include "rive/animation/cubic_interpolator.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/entry_state_base.cpp b/src/generated/animation/entry_state_base.cpp
index 5f5ec14..8e232a0 100644
--- a/src/generated/animation/entry_state_base.cpp
+++ b/src/generated/animation/entry_state_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/entry_state_base.hpp"
-#include "animation/entry_state.hpp"
+#include "rive/generated/animation/entry_state_base.hpp"
+#include "rive/animation/entry_state.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/exit_state_base.cpp b/src/generated/animation/exit_state_base.cpp
index 56c790c..baa32c1 100644
--- a/src/generated/animation/exit_state_base.cpp
+++ b/src/generated/animation/exit_state_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/exit_state_base.hpp"
-#include "animation/exit_state.hpp"
+#include "rive/generated/animation/exit_state_base.hpp"
+#include "rive/animation/exit_state.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/keyed_object_base.cpp b/src/generated/animation/keyed_object_base.cpp
index e428590..aed4062 100644
--- a/src/generated/animation/keyed_object_base.cpp
+++ b/src/generated/animation/keyed_object_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/keyed_object_base.hpp"
-#include "animation/keyed_object.hpp"
+#include "rive/generated/animation/keyed_object_base.hpp"
+#include "rive/animation/keyed_object.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/keyed_property_base.cpp b/src/generated/animation/keyed_property_base.cpp
index 6c1c3d7..302cc49 100644
--- a/src/generated/animation/keyed_property_base.cpp
+++ b/src/generated/animation/keyed_property_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/keyed_property_base.hpp"
-#include "animation/keyed_property.hpp"
+#include "rive/generated/animation/keyed_property_base.hpp"
+#include "rive/animation/keyed_property.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/keyframe_color_base.cpp b/src/generated/animation/keyframe_color_base.cpp
index 1fa4fab..df61549 100644
--- a/src/generated/animation/keyframe_color_base.cpp
+++ b/src/generated/animation/keyframe_color_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/keyframe_color_base.hpp"
-#include "animation/keyframe_color.hpp"
+#include "rive/generated/animation/keyframe_color_base.hpp"
+#include "rive/animation/keyframe_color.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/keyframe_double_base.cpp b/src/generated/animation/keyframe_double_base.cpp
index 9d5975d..0dd3be5 100644
--- a/src/generated/animation/keyframe_double_base.cpp
+++ b/src/generated/animation/keyframe_double_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/keyframe_double_base.hpp"
-#include "animation/keyframe_double.hpp"
+#include "rive/generated/animation/keyframe_double_base.hpp"
+#include "rive/animation/keyframe_double.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/keyframe_id_base.cpp b/src/generated/animation/keyframe_id_base.cpp
index 87815bc..254362c 100644
--- a/src/generated/animation/keyframe_id_base.cpp
+++ b/src/generated/animation/keyframe_id_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/keyframe_id_base.hpp"
-#include "animation/keyframe_id.hpp"
+#include "rive/generated/animation/keyframe_id_base.hpp"
+#include "rive/animation/keyframe_id.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/linear_animation_base.cpp b/src/generated/animation/linear_animation_base.cpp
index 0024799..4f29801 100644
--- a/src/generated/animation/linear_animation_base.cpp
+++ b/src/generated/animation/linear_animation_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/linear_animation_base.hpp"
-#include "animation/linear_animation.hpp"
+#include "rive/generated/animation/linear_animation_base.hpp"
+#include "rive/animation/linear_animation.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/state_machine_base.cpp b/src/generated/animation/state_machine_base.cpp
index 3eb6814..e638f38 100644
--- a/src/generated/animation/state_machine_base.cpp
+++ b/src/generated/animation/state_machine_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/state_machine_base.hpp"
-#include "animation/state_machine.hpp"
+#include "rive/generated/animation/state_machine_base.hpp"
+#include "rive/animation/state_machine.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/state_machine_bool_base.cpp b/src/generated/animation/state_machine_bool_base.cpp
index 65f8d0d..b94b2ec 100644
--- a/src/generated/animation/state_machine_bool_base.cpp
+++ b/src/generated/animation/state_machine_bool_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/state_machine_bool_base.hpp"
-#include "animation/state_machine_bool.hpp"
+#include "rive/generated/animation/state_machine_bool_base.hpp"
+#include "rive/animation/state_machine_bool.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/state_machine_layer_base.cpp b/src/generated/animation/state_machine_layer_base.cpp
index 907e9ca..d012d93 100644
--- a/src/generated/animation/state_machine_layer_base.cpp
+++ b/src/generated/animation/state_machine_layer_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/state_machine_layer_base.hpp"
-#include "animation/state_machine_layer.hpp"
+#include "rive/generated/animation/state_machine_layer_base.hpp"
+#include "rive/animation/state_machine_layer.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/state_machine_number_base.cpp b/src/generated/animation/state_machine_number_base.cpp
index d1f9a25..bc04fe8 100644
--- a/src/generated/animation/state_machine_number_base.cpp
+++ b/src/generated/animation/state_machine_number_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/state_machine_number_base.hpp"
-#include "animation/state_machine_number.hpp"
+#include "rive/generated/animation/state_machine_number_base.hpp"
+#include "rive/animation/state_machine_number.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/state_machine_trigger_base.cpp b/src/generated/animation/state_machine_trigger_base.cpp
index aae23cc..9bdaa96 100644
--- a/src/generated/animation/state_machine_trigger_base.cpp
+++ b/src/generated/animation/state_machine_trigger_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/state_machine_trigger_base.hpp"
-#include "animation/state_machine_trigger.hpp"
+#include "rive/generated/animation/state_machine_trigger_base.hpp"
+#include "rive/animation/state_machine_trigger.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/state_transition_base.cpp b/src/generated/animation/state_transition_base.cpp
index 3ba27d5..ded9d53 100644
--- a/src/generated/animation/state_transition_base.cpp
+++ b/src/generated/animation/state_transition_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/state_transition_base.hpp"
-#include "animation/state_transition.hpp"
+#include "rive/generated/animation/state_transition_base.hpp"
+#include "rive/animation/state_transition.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/transition_bool_condition_base.cpp b/src/generated/animation/transition_bool_condition_base.cpp
index 1d61d07..9f7aebf 100644
--- a/src/generated/animation/transition_bool_condition_base.cpp
+++ b/src/generated/animation/transition_bool_condition_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/transition_bool_condition_base.hpp"
-#include "animation/transition_bool_condition.hpp"
+#include "rive/generated/animation/transition_bool_condition_base.hpp"
+#include "rive/animation/transition_bool_condition.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/transition_number_condition_base.cpp b/src/generated/animation/transition_number_condition_base.cpp
index bbca747..44cd977 100644
--- a/src/generated/animation/transition_number_condition_base.cpp
+++ b/src/generated/animation/transition_number_condition_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/transition_number_condition_base.hpp"
-#include "animation/transition_number_condition.hpp"
+#include "rive/generated/animation/transition_number_condition_base.hpp"
+#include "rive/animation/transition_number_condition.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/animation/transition_trigger_condition_base.cpp b/src/generated/animation/transition_trigger_condition_base.cpp
index 5ef1634..250859c 100644
--- a/src/generated/animation/transition_trigger_condition_base.cpp
+++ b/src/generated/animation/transition_trigger_condition_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/animation/transition_trigger_condition_base.hpp"
-#include "animation/transition_trigger_condition.hpp"
+#include "rive/generated/animation/transition_trigger_condition_base.hpp"
+#include "rive/animation/transition_trigger_condition.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/artboard_base.cpp b/src/generated/artboard_base.cpp
index b5a34fd..02740a5 100644
--- a/src/generated/artboard_base.cpp
+++ b/src/generated/artboard_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/artboard_base.hpp"
-#include "artboard.hpp"
+#include "rive/generated/artboard_base.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/backboard_base.cpp b/src/generated/backboard_base.cpp
index 28a609f..ec7a500 100644
--- a/src/generated/backboard_base.cpp
+++ b/src/generated/backboard_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/backboard_base.hpp"
-#include "backboard.hpp"
+#include "rive/generated/backboard_base.hpp"
+#include "rive/backboard.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/bones/bone_base.cpp b/src/generated/bones/bone_base.cpp
index 4a10a1e..fe76923 100644
--- a/src/generated/bones/bone_base.cpp
+++ b/src/generated/bones/bone_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/bones/bone_base.hpp"
-#include "bones/bone.hpp"
+#include "rive/generated/bones/bone_base.hpp"
+#include "rive/bones/bone.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/bones/cubic_weight_base.cpp b/src/generated/bones/cubic_weight_base.cpp
index 5b9ebb0..989c013 100644
--- a/src/generated/bones/cubic_weight_base.cpp
+++ b/src/generated/bones/cubic_weight_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/bones/cubic_weight_base.hpp"
-#include "bones/cubic_weight.hpp"
+#include "rive/generated/bones/cubic_weight_base.hpp"
+#include "rive/bones/cubic_weight.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/bones/root_bone_base.cpp b/src/generated/bones/root_bone_base.cpp
index c88b526..13645c0 100644
--- a/src/generated/bones/root_bone_base.cpp
+++ b/src/generated/bones/root_bone_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/bones/root_bone_base.hpp"
-#include "bones/root_bone.hpp"
+#include "rive/generated/bones/root_bone_base.hpp"
+#include "rive/bones/root_bone.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/bones/skin_base.cpp b/src/generated/bones/skin_base.cpp
index 64d2d30..e388930 100644
--- a/src/generated/bones/skin_base.cpp
+++ b/src/generated/bones/skin_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/bones/skin_base.hpp"
-#include "bones/skin.hpp"
+#include "rive/generated/bones/skin_base.hpp"
+#include "rive/bones/skin.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/bones/tendon_base.cpp b/src/generated/bones/tendon_base.cpp
index 014854f..18fae18 100644
--- a/src/generated/bones/tendon_base.cpp
+++ b/src/generated/bones/tendon_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/bones/tendon_base.hpp"
-#include "bones/tendon.hpp"
+#include "rive/generated/bones/tendon_base.hpp"
+#include "rive/bones/tendon.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/bones/weight_base.cpp b/src/generated/bones/weight_base.cpp
index e2347e3..a963a6b 100644
--- a/src/generated/bones/weight_base.cpp
+++ b/src/generated/bones/weight_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/bones/weight_base.hpp"
-#include "bones/weight.hpp"
+#include "rive/generated/bones/weight_base.hpp"
+#include "rive/bones/weight.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/constraints/distance_constraint_base.cpp b/src/generated/constraints/distance_constraint_base.cpp
index 6ce4104..e08fc58 100644
--- a/src/generated/constraints/distance_constraint_base.cpp
+++ b/src/generated/constraints/distance_constraint_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/constraints/distance_constraint_base.hpp"
-#include "constraints/distance_constraint.hpp"
+#include "rive/generated/constraints/distance_constraint_base.hpp"
+#include "rive/constraints/distance_constraint.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/constraints/ik_constraint_base.cpp b/src/generated/constraints/ik_constraint_base.cpp
index d60b4c0..be4f4b9 100644
--- a/src/generated/constraints/ik_constraint_base.cpp
+++ b/src/generated/constraints/ik_constraint_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/constraints/ik_constraint_base.hpp"
-#include "constraints/ik_constraint.hpp"
+#include "rive/generated/constraints/ik_constraint_base.hpp"
+#include "rive/constraints/ik_constraint.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/constraints/transform_constraint_base.cpp b/src/generated/constraints/transform_constraint_base.cpp
index 8214dae..f7b3544 100644
--- a/src/generated/constraints/transform_constraint_base.cpp
+++ b/src/generated/constraints/transform_constraint_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/constraints/transform_constraint_base.hpp"
-#include "constraints/transform_constraint.hpp"
+#include "rive/generated/constraints/transform_constraint_base.hpp"
+#include "rive/constraints/transform_constraint.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/draw_rules_base.cpp b/src/generated/draw_rules_base.cpp
index 8d3b56b..200ed27 100644
--- a/src/generated/draw_rules_base.cpp
+++ b/src/generated/draw_rules_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/draw_rules_base.hpp"
-#include "draw_rules.hpp"
+#include "rive/generated/draw_rules_base.hpp"
+#include "rive/draw_rules.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/draw_target_base.cpp b/src/generated/draw_target_base.cpp
index 4e8fb32..ef6a485 100644
--- a/src/generated/draw_target_base.cpp
+++ b/src/generated/draw_target_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/draw_target_base.hpp"
-#include "draw_target.hpp"
+#include "rive/generated/draw_target_base.hpp"
+#include "rive/draw_target.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/node_base.cpp b/src/generated/node_base.cpp
index d78200d..8155ae2 100644
--- a/src/generated/node_base.cpp
+++ b/src/generated/node_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/node_base.hpp"
-#include "node.hpp"
+#include "rive/generated/node_base.hpp"
+#include "rive/node.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/clipping_shape_base.cpp b/src/generated/shapes/clipping_shape_base.cpp
index 2a824a7..d15f0ac 100644
--- a/src/generated/shapes/clipping_shape_base.cpp
+++ b/src/generated/shapes/clipping_shape_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/clipping_shape_base.hpp"
-#include "shapes/clipping_shape.hpp"
+#include "rive/generated/shapes/clipping_shape_base.hpp"
+#include "rive/shapes/clipping_shape.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/cubic_asymmetric_vertex_base.cpp b/src/generated/shapes/cubic_asymmetric_vertex_base.cpp
index e4e15e3..9cd329d 100644
--- a/src/generated/shapes/cubic_asymmetric_vertex_base.cpp
+++ b/src/generated/shapes/cubic_asymmetric_vertex_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/cubic_asymmetric_vertex_base.hpp"
-#include "shapes/cubic_asymmetric_vertex.hpp"
+#include "rive/generated/shapes/cubic_asymmetric_vertex_base.hpp"
+#include "rive/shapes/cubic_asymmetric_vertex.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/cubic_detached_vertex_base.cpp b/src/generated/shapes/cubic_detached_vertex_base.cpp
index c261c9a..b8c9cec 100644
--- a/src/generated/shapes/cubic_detached_vertex_base.cpp
+++ b/src/generated/shapes/cubic_detached_vertex_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/cubic_detached_vertex_base.hpp"
-#include "shapes/cubic_detached_vertex.hpp"
+#include "rive/generated/shapes/cubic_detached_vertex_base.hpp"
+#include "rive/shapes/cubic_detached_vertex.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/cubic_mirrored_vertex_base.cpp b/src/generated/shapes/cubic_mirrored_vertex_base.cpp
index 5042916..037fa8d 100644
--- a/src/generated/shapes/cubic_mirrored_vertex_base.cpp
+++ b/src/generated/shapes/cubic_mirrored_vertex_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/cubic_mirrored_vertex_base.hpp"
-#include "shapes/cubic_mirrored_vertex.hpp"
+#include "rive/generated/shapes/cubic_mirrored_vertex_base.hpp"
+#include "rive/shapes/cubic_mirrored_vertex.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/ellipse_base.cpp b/src/generated/shapes/ellipse_base.cpp
index 0bd28db..97f3860 100644
--- a/src/generated/shapes/ellipse_base.cpp
+++ b/src/generated/shapes/ellipse_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/ellipse_base.hpp"
-#include "shapes/ellipse.hpp"
+#include "rive/generated/shapes/ellipse_base.hpp"
+#include "rive/shapes/ellipse.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/fill_base.cpp b/src/generated/shapes/paint/fill_base.cpp
index 50f77d1..31d0627 100644
--- a/src/generated/shapes/paint/fill_base.cpp
+++ b/src/generated/shapes/paint/fill_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/fill_base.hpp"
-#include "shapes/paint/fill.hpp"
+#include "rive/generated/shapes/paint/fill_base.hpp"
+#include "rive/shapes/paint/fill.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/gradient_stop_base.cpp b/src/generated/shapes/paint/gradient_stop_base.cpp
index 1675e99..ccac754 100644
--- a/src/generated/shapes/paint/gradient_stop_base.cpp
+++ b/src/generated/shapes/paint/gradient_stop_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/gradient_stop_base.hpp"
-#include "shapes/paint/gradient_stop.hpp"
+#include "rive/generated/shapes/paint/gradient_stop_base.hpp"
+#include "rive/shapes/paint/gradient_stop.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/linear_gradient_base.cpp b/src/generated/shapes/paint/linear_gradient_base.cpp
index ce52929..5d2b198 100644
--- a/src/generated/shapes/paint/linear_gradient_base.cpp
+++ b/src/generated/shapes/paint/linear_gradient_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/linear_gradient_base.hpp"
-#include "shapes/paint/linear_gradient.hpp"
+#include "rive/generated/shapes/paint/linear_gradient_base.hpp"
+#include "rive/shapes/paint/linear_gradient.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/radial_gradient_base.cpp b/src/generated/shapes/paint/radial_gradient_base.cpp
index a337539..9ee1e75 100644
--- a/src/generated/shapes/paint/radial_gradient_base.cpp
+++ b/src/generated/shapes/paint/radial_gradient_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/radial_gradient_base.hpp"
-#include "shapes/paint/radial_gradient.hpp"
+#include "rive/generated/shapes/paint/radial_gradient_base.hpp"
+#include "rive/shapes/paint/radial_gradient.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/solid_color_base.cpp b/src/generated/shapes/paint/solid_color_base.cpp
index ea66a82..24076dc 100644
--- a/src/generated/shapes/paint/solid_color_base.cpp
+++ b/src/generated/shapes/paint/solid_color_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/solid_color_base.hpp"
-#include "shapes/paint/solid_color.hpp"
+#include "rive/generated/shapes/paint/solid_color_base.hpp"
+#include "rive/shapes/paint/solid_color.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/stroke_base.cpp b/src/generated/shapes/paint/stroke_base.cpp
index aa05103..274ab2e 100644
--- a/src/generated/shapes/paint/stroke_base.cpp
+++ b/src/generated/shapes/paint/stroke_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/stroke_base.hpp"
-#include "shapes/paint/stroke.hpp"
+#include "rive/generated/shapes/paint/stroke_base.hpp"
+#include "rive/shapes/paint/stroke.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/paint/trim_path_base.cpp b/src/generated/shapes/paint/trim_path_base.cpp
index a1c9c47..6acfb19 100644
--- a/src/generated/shapes/paint/trim_path_base.cpp
+++ b/src/generated/shapes/paint/trim_path_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/paint/trim_path_base.hpp"
-#include "shapes/paint/trim_path.hpp"
+#include "rive/generated/shapes/paint/trim_path_base.hpp"
+#include "rive/shapes/paint/trim_path.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/points_path_base.cpp b/src/generated/shapes/points_path_base.cpp
index e6708f8..926c233 100644
--- a/src/generated/shapes/points_path_base.cpp
+++ b/src/generated/shapes/points_path_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/points_path_base.hpp"
-#include "shapes/points_path.hpp"
+#include "rive/generated/shapes/points_path_base.hpp"
+#include "rive/shapes/points_path.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/polygon_base.cpp b/src/generated/shapes/polygon_base.cpp
index 58dd71f..ed2d887 100644
--- a/src/generated/shapes/polygon_base.cpp
+++ b/src/generated/shapes/polygon_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/polygon_base.hpp"
-#include "shapes/polygon.hpp"
+#include "rive/generated/shapes/polygon_base.hpp"
+#include "rive/shapes/polygon.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/rectangle_base.cpp b/src/generated/shapes/rectangle_base.cpp
index 7a7c168..9f475a4 100644
--- a/src/generated/shapes/rectangle_base.cpp
+++ b/src/generated/shapes/rectangle_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/rectangle_base.hpp"
-#include "shapes/rectangle.hpp"
+#include "rive/generated/shapes/rectangle_base.hpp"
+#include "rive/shapes/rectangle.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/shape_base.cpp b/src/generated/shapes/shape_base.cpp
index e6d187b..d167a50 100644
--- a/src/generated/shapes/shape_base.cpp
+++ b/src/generated/shapes/shape_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/shape_base.hpp"
-#include "shapes/shape.hpp"
+#include "rive/generated/shapes/shape_base.hpp"
+#include "rive/shapes/shape.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/star_base.cpp b/src/generated/shapes/star_base.cpp
index 3e0e7f0..b5287f1 100644
--- a/src/generated/shapes/star_base.cpp
+++ b/src/generated/shapes/star_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/star_base.hpp"
-#include "shapes/star.hpp"
+#include "rive/generated/shapes/star_base.hpp"
+#include "rive/shapes/star.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/straight_vertex_base.cpp b/src/generated/shapes/straight_vertex_base.cpp
index 606b80c..b2f9166 100644
--- a/src/generated/shapes/straight_vertex_base.cpp
+++ b/src/generated/shapes/straight_vertex_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/straight_vertex_base.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/generated/shapes/straight_vertex_base.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 
 using namespace rive;
 

diff --git a/src/generated/shapes/triangle_base.cpp b/src/generated/shapes/triangle_base.cpp
index d365815..e9b7ebf 100644
--- a/src/generated/shapes/triangle_base.cpp
+++ b/src/generated/shapes/triangle_base.cpp

@@ -1,5 +1,5 @@
-#include "generated/shapes/triangle_base.hpp"
-#include "shapes/triangle.hpp"
+#include "rive/generated/shapes/triangle_base.hpp"
+#include "rive/shapes/triangle.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/artboard_importer.cpp b/src/importers/artboard_importer.cpp
index 768912b..1bf6551 100644
--- a/src/importers/artboard_importer.cpp
+++ b/src/importers/artboard_importer.cpp

@@ -1,8 +1,8 @@
-#include "artboard.hpp"
-#include "importers/artboard_importer.hpp"
-#include "animation/linear_animation.hpp"
-#include "animation/state_machine.hpp"
-#include "artboard.hpp"
+#include "rive/artboard.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/animation/state_machine.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/keyed_object_importer.cpp b/src/importers/keyed_object_importer.cpp
index e7ec3aa..9b0b9fb 100644
--- a/src/importers/keyed_object_importer.cpp
+++ b/src/importers/keyed_object_importer.cpp

@@ -1,7 +1,7 @@
-#include "importers/keyed_object_importer.hpp"
-#include "animation/keyed_object.hpp"
-#include "animation/keyed_property.hpp"
-#include "artboard.hpp"
+#include "rive/importers/keyed_object_importer.hpp"
+#include "rive/animation/keyed_object.hpp"
+#include "rive/animation/keyed_property.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/keyed_property_importer.cpp b/src/importers/keyed_property_importer.cpp
index 733bd00..2e48c74 100644
--- a/src/importers/keyed_property_importer.cpp
+++ b/src/importers/keyed_property_importer.cpp

@@ -1,7 +1,7 @@
-#include "importers/keyed_property_importer.hpp"
-#include "animation/keyed_property.hpp"
-#include "animation/keyframe.hpp"
-#include "animation/linear_animation.hpp"
+#include "rive/importers/keyed_property_importer.hpp"
+#include "rive/animation/keyed_property.hpp"
+#include "rive/animation/keyframe.hpp"
+#include "rive/animation/linear_animation.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/layer_state_importer.cpp b/src/importers/layer_state_importer.cpp
index 8b3fa60..7f7824e 100644
--- a/src/importers/layer_state_importer.cpp
+++ b/src/importers/layer_state_importer.cpp

@@ -1,8 +1,8 @@
-#include "importers/layer_state_importer.hpp"
-#include "animation/state_transition.hpp"
-#include "animation/layer_state.hpp"
-#include "animation/blend_state.hpp"
-#include "animation/blend_state_transition.hpp"
+#include "rive/importers/layer_state_importer.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/animation/layer_state.hpp"
+#include "rive/animation/blend_state.hpp"
+#include "rive/animation/blend_state_transition.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/linear_animation_importer.cpp b/src/importers/linear_animation_importer.cpp
index 37d9607..d5540e9 100644
--- a/src/importers/linear_animation_importer.cpp
+++ b/src/importers/linear_animation_importer.cpp

@@ -1,7 +1,7 @@
-#include "importers/linear_animation_importer.hpp"
-#include "animation/keyed_object.hpp"
-#include "animation/linear_animation.hpp"
-#include "artboard.hpp"
+#include "rive/importers/linear_animation_importer.hpp"
+#include "rive/animation/keyed_object.hpp"
+#include "rive/animation/linear_animation.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/state_machine_importer.cpp b/src/importers/state_machine_importer.cpp
index f734d73..c4915ff 100644
--- a/src/importers/state_machine_importer.cpp
+++ b/src/importers/state_machine_importer.cpp

@@ -1,5 +1,5 @@
-#include "importers/state_machine_importer.hpp"
-#include "animation/state_machine.hpp"
+#include "rive/importers/state_machine_importer.hpp"
+#include "rive/animation/state_machine.hpp"
 
 using namespace rive;
 

diff --git a/src/importers/state_machine_layer_importer.cpp b/src/importers/state_machine_layer_importer.cpp
index 4ab1722..0d785ac 100644
--- a/src/importers/state_machine_layer_importer.cpp
+++ b/src/importers/state_machine_layer_importer.cpp

@@ -1,9 +1,9 @@
-#include "importers/state_machine_layer_importer.hpp"
-#include "importers/artboard_importer.hpp"
-#include "animation/state_machine_layer.hpp"
-#include "animation/animation_state.hpp"
-#include "animation/state_transition.hpp"
-#include "artboard.hpp"
+#include "rive/importers/state_machine_layer_importer.hpp"
+#include "rive/importers/artboard_importer.hpp"
+#include "rive/animation/state_machine_layer.hpp"
+#include "rive/animation/animation_state.hpp"
+#include "rive/animation/state_transition.hpp"
+#include "rive/artboard.hpp"
 
 using namespace rive;
 StateMachineLayerImporter::StateMachineLayerImporter(StateMachineLayer* layer,

diff --git a/src/importers/state_transition_importer.cpp b/src/importers/state_transition_importer.cpp
index 387ae6e..f48aa28 100644
--- a/src/importers/state_transition_importer.cpp
+++ b/src/importers/state_transition_importer.cpp

@@ -1,6 +1,6 @@
-#include "importers/state_transition_importer.hpp"
-#include "animation/transition_condition.hpp"
-#include "animation/state_transition.hpp"
+#include "rive/importers/state_transition_importer.hpp"
+#include "rive/animation/transition_condition.hpp"
+#include "rive/animation/state_transition.hpp"
 
 using namespace rive;
 

diff --git a/src/layout.cpp b/src/layout.cpp
index 6c7d33d..55d9e8f 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp

@@ -1,4 +1,4 @@
-#include "layout.hpp"
+#include "rive/layout.hpp"
 
 using namespace rive;
 

diff --git a/src/math/aabb.cpp b/src/math/aabb.cpp
index c170f8b..d480a61 100644
--- a/src/math/aabb.cpp
+++ b/src/math/aabb.cpp

@@ -1,4 +1,4 @@
-#include "math/aabb.hpp"
+#include "rive/math/aabb.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/math/mat2d.cpp b/src/math/mat2d.cpp
index f2d96b5..410f1fc 100644
--- a/src/math/mat2d.cpp
+++ b/src/math/mat2d.cpp

@@ -1,6 +1,6 @@
-#include "math/mat2d.hpp"
-#include "math/transform_components.hpp"
-#include "math/vec2d.hpp"
+#include "rive/math/mat2d.hpp"
+#include "rive/math/transform_components.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/math/vec2d.cpp b/src/math/vec2d.cpp
index 8aac69e..468fd16 100644
--- a/src/math/vec2d.cpp
+++ b/src/math/vec2d.cpp

@@ -1,5 +1,5 @@
-#include "math/vec2d.hpp"
-#include "math/mat2d.hpp"
+#include "rive/math/vec2d.hpp"
+#include "rive/math/mat2d.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/node.cpp b/src/node.cpp
index 74578cb..7cc4664 100644
--- a/src/node.cpp
+++ b/src/node.cpp

@@ -1,4 +1,4 @@
-#include "node.hpp"
+#include "rive/node.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/clipping_shape.cpp b/src/shapes/clipping_shape.cpp
index 27ede97..9a6b78b 100644
--- a/src/shapes/clipping_shape.cpp
+++ b/src/shapes/clipping_shape.cpp

@@ -1,10 +1,10 @@
-#include "shapes/clipping_shape.hpp"
-#include "artboard.hpp"
-#include "core_context.hpp"
-#include "node.hpp"
-#include "renderer.hpp"
-#include "shapes/path_composer.hpp"
-#include "shapes/shape.hpp"
+#include "rive/shapes/clipping_shape.hpp"
+#include "rive/artboard.hpp"
+#include "rive/core_context.hpp"
+#include "rive/node.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/path_composer.hpp"
+#include "rive/shapes/shape.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/cubic_asymmetric_vertex.cpp b/src/shapes/cubic_asymmetric_vertex.cpp
index da34b09..51c58ff 100644
--- a/src/shapes/cubic_asymmetric_vertex.cpp
+++ b/src/shapes/cubic_asymmetric_vertex.cpp

@@ -1,5 +1,5 @@
-#include "shapes/cubic_asymmetric_vertex.hpp"
-#include "math/vec2d.hpp"
+#include "rive/shapes/cubic_asymmetric_vertex.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/shapes/cubic_detached_vertex.cpp b/src/shapes/cubic_detached_vertex.cpp
index 2cb2d78..5d03bab 100644
--- a/src/shapes/cubic_detached_vertex.cpp
+++ b/src/shapes/cubic_detached_vertex.cpp

@@ -1,5 +1,5 @@
-#include "shapes/cubic_detached_vertex.hpp"
-#include "math/vec2d.hpp"
+#include "rive/shapes/cubic_detached_vertex.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/shapes/cubic_mirrored_vertex.cpp b/src/shapes/cubic_mirrored_vertex.cpp
index bf171a9..09735db 100644
--- a/src/shapes/cubic_mirrored_vertex.cpp
+++ b/src/shapes/cubic_mirrored_vertex.cpp

@@ -1,5 +1,5 @@
-#include "shapes/cubic_mirrored_vertex.hpp"
-#include "math/vec2d.hpp"
+#include "rive/shapes/cubic_mirrored_vertex.hpp"
+#include "rive/math/vec2d.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/shapes/cubic_vertex.cpp b/src/shapes/cubic_vertex.cpp
index 4851c86..795c127 100644
--- a/src/shapes/cubic_vertex.cpp
+++ b/src/shapes/cubic_vertex.cpp

@@ -1,5 +1,5 @@
-#include "shapes/cubic_vertex.hpp"
-#include "bones/cubic_weight.hpp"
+#include "rive/shapes/cubic_vertex.hpp"
+#include "rive/bones/cubic_weight.hpp"
 using namespace rive;
 
 const Vec2D& CubicVertex::renderIn()

diff --git a/src/shapes/ellipse.cpp b/src/shapes/ellipse.cpp
index 0642fc2..334400e 100644
--- a/src/shapes/ellipse.cpp
+++ b/src/shapes/ellipse.cpp

@@ -1,6 +1,6 @@
-#include "shapes/ellipse.hpp"
-#include "component_dirt.hpp"
-#include "math/circle_constant.hpp"
+#include "rive/shapes/ellipse.hpp"
+#include "rive/component_dirt.hpp"
+#include "rive/math/circle_constant.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/metrics_path.cpp b/src/shapes/metrics_path.cpp
index c3a26c1..a16f89e 100644
--- a/src/shapes/metrics_path.cpp
+++ b/src/shapes/metrics_path.cpp

@@ -1,5 +1,5 @@
-#include "shapes/metrics_path.hpp"
-#include "renderer.hpp"
+#include "rive/shapes/metrics_path.hpp"
+#include "rive/renderer.hpp"
 #include <math.h>
 
 using namespace rive;

diff --git a/src/shapes/paint/color.cpp b/src/shapes/paint/color.cpp
index 5b79d90..dbcb959 100644
--- a/src/shapes/paint/color.cpp
+++ b/src/shapes/paint/color.cpp

@@ -1,4 +1,4 @@
-#include "shapes/paint/color.hpp"
+#include "rive/shapes/paint/color.hpp"
 #include <stdio.h>
 
 namespace rive

diff --git a/src/shapes/paint/fill.cpp b/src/shapes/paint/fill.cpp
index 0b45e67..f0f6ed4 100644
--- a/src/shapes/paint/fill.cpp
+++ b/src/shapes/paint/fill.cpp

@@ -1,4 +1,4 @@
-#include "shapes/paint/fill.hpp"
+#include "rive/shapes/paint/fill.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/gradient_stop.cpp b/src/shapes/paint/gradient_stop.cpp
index 9ea6ba3..fa9f516 100644
--- a/src/shapes/paint/gradient_stop.cpp
+++ b/src/shapes/paint/gradient_stop.cpp

@@ -1,5 +1,5 @@
-#include "shapes/paint/gradient_stop.hpp"
-#include "shapes/paint/linear_gradient.hpp"
+#include "rive/shapes/paint/gradient_stop.hpp"
+#include "rive/shapes/paint/linear_gradient.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/linear_gradient.cpp b/src/shapes/paint/linear_gradient.cpp
index 1724c60..bd078fb 100644
--- a/src/shapes/paint/linear_gradient.cpp
+++ b/src/shapes/paint/linear_gradient.cpp

@@ -1,11 +1,11 @@
-#include "shapes/paint/linear_gradient.hpp"
-#include "math/vec2d.hpp"
-#include "node.hpp"
-#include "renderer.hpp"
-#include "shapes/paint/color.hpp"
-#include "shapes/paint/gradient_stop.hpp"
-#include "shapes/shape_paint_container.hpp"
-#include "shapes/paint/shape_paint.hpp"
+#include "rive/shapes/paint/linear_gradient.hpp"
+#include "rive/math/vec2d.hpp"
+#include "rive/node.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/paint/color.hpp"
+#include "rive/shapes/paint/gradient_stop.hpp"
+#include "rive/shapes/shape_paint_container.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
 #include <algorithm>
 
 using namespace rive;

diff --git a/src/shapes/paint/radial_gradient.cpp b/src/shapes/paint/radial_gradient.cpp
index 1a97ba8..4d17891 100644
--- a/src/shapes/paint/radial_gradient.cpp
+++ b/src/shapes/paint/radial_gradient.cpp

@@ -1,5 +1,5 @@
-#include "shapes/paint/radial_gradient.hpp"
-#include "renderer.hpp"
+#include "rive/shapes/paint/radial_gradient.hpp"
+#include "rive/renderer.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/shape_paint.cpp b/src/shapes/paint/shape_paint.cpp
index f500e5f..b2499d6 100644
--- a/src/shapes/paint/shape_paint.cpp
+++ b/src/shapes/paint/shape_paint.cpp

@@ -1,7 +1,7 @@
-#include "shapes/paint/shape_paint.hpp"
-#include "shapes/shape_paint_container.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
+#include "rive/shapes/shape_paint_container.hpp"
 
-#include "renderer.hpp"
+#include "rive/renderer.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/shape_paint_mutator.cpp b/src/shapes/paint/shape_paint_mutator.cpp
index c1263fa..f9fec3f 100644
--- a/src/shapes/paint/shape_paint_mutator.cpp
+++ b/src/shapes/paint/shape_paint_mutator.cpp

@@ -1,6 +1,6 @@
-#include "shapes/paint/shape_paint_mutator.hpp"
-#include "component.hpp"
-#include "shapes/paint/shape_paint.hpp"
+#include "rive/shapes/paint/shape_paint_mutator.hpp"
+#include "rive/component.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/solid_color.cpp b/src/shapes/paint/solid_color.cpp
index 987b31e..9459f65 100644
--- a/src/shapes/paint/solid_color.cpp
+++ b/src/shapes/paint/solid_color.cpp

@@ -1,7 +1,7 @@
-#include "shapes/paint/solid_color.hpp"
-#include "container_component.hpp"
-#include "renderer.hpp"
-#include "shapes/paint/color.hpp"
+#include "rive/shapes/paint/solid_color.hpp"
+#include "rive/container_component.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/paint/color.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/stroke.cpp b/src/shapes/paint/stroke.cpp
index 6f7110a..c8a8805 100644
--- a/src/shapes/paint/stroke.cpp
+++ b/src/shapes/paint/stroke.cpp

@@ -1,7 +1,7 @@
-#include "shapes/paint/stroke.hpp"
-#include "shapes/paint/stroke_cap.hpp"
-#include "shapes/paint/stroke_effect.hpp"
-#include "shapes/paint/stroke_join.hpp"
+#include "rive/shapes/paint/stroke.hpp"
+#include "rive/shapes/paint/stroke_cap.hpp"
+#include "rive/shapes/paint/stroke_effect.hpp"
+#include "rive/shapes/paint/stroke_join.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/paint/trim_path.cpp b/src/shapes/paint/trim_path.cpp
index 9132792..972aa35 100644
--- a/src/shapes/paint/trim_path.cpp
+++ b/src/shapes/paint/trim_path.cpp

@@ -1,6 +1,6 @@
-#include "shapes/paint/trim_path.hpp"
-#include "shapes/metrics_path.hpp"
-#include "shapes/paint/stroke.hpp"
+#include "rive/shapes/paint/trim_path.hpp"
+#include "rive/shapes/metrics_path.hpp"
+#include "rive/shapes/paint/stroke.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/parametric_path.cpp b/src/shapes/parametric_path.cpp
index d5d7fe6..923d1d7 100644
--- a/src/shapes/parametric_path.cpp
+++ b/src/shapes/parametric_path.cpp

@@ -1,4 +1,4 @@
-#include "shapes/parametric_path.hpp"
+#include "rive/shapes/parametric_path.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/path.cpp b/src/shapes/path.cpp
index 348d07a..e201c98 100644
--- a/src/shapes/path.cpp
+++ b/src/shapes/path.cpp

@@ -1,11 +1,11 @@
-#include "shapes/path.hpp"
-#include "math/circle_constant.hpp"
-#include "renderer.hpp"
-#include "shapes/cubic_vertex.hpp"
-#include "shapes/cubic_detached_vertex.hpp"
-#include "shapes/path_vertex.hpp"
-#include "shapes/shape.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/shapes/path.hpp"
+#include "rive/math/circle_constant.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/cubic_vertex.hpp"
+#include "rive/shapes/cubic_detached_vertex.hpp"
+#include "rive/shapes/path_vertex.hpp"
+#include "rive/shapes/shape.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 #include <cassert>
 
 using namespace rive;

diff --git a/src/shapes/path_composer.cpp b/src/shapes/path_composer.cpp
index d1415ec..5877005 100644
--- a/src/shapes/path_composer.cpp
+++ b/src/shapes/path_composer.cpp

@@ -1,8 +1,8 @@
-#include "shapes/path_composer.hpp"
-#include "artboard.hpp"
-#include "renderer.hpp"
-#include "shapes/path.hpp"
-#include "shapes/shape.hpp"
+#include "rive/shapes/path_composer.hpp"
+#include "rive/artboard.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/path.hpp"
+#include "rive/shapes/shape.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/path_vertex.cpp b/src/shapes/path_vertex.cpp
index 24cea98..c34e39b 100644
--- a/src/shapes/path_vertex.cpp
+++ b/src/shapes/path_vertex.cpp

@@ -1,5 +1,5 @@
-#include "shapes/path_vertex.hpp"
-#include "shapes/path.hpp"
+#include "rive/shapes/path_vertex.hpp"
+#include "rive/shapes/path.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/points_path.cpp b/src/shapes/points_path.cpp
index 02c9860..16c80c4 100644
--- a/src/shapes/points_path.cpp
+++ b/src/shapes/points_path.cpp

@@ -1,5 +1,5 @@
-#include "shapes/points_path.hpp"
-#include "bones/skin.hpp"
+#include "rive/shapes/points_path.hpp"
+#include "rive/bones/skin.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/polygon.cpp b/src/shapes/polygon.cpp
index 9a8a7a5..144cf2c 100644
--- a/src/shapes/polygon.cpp
+++ b/src/shapes/polygon.cpp

@@ -1,6 +1,6 @@
-#include "shapes/polygon.hpp"
-#include "shapes/star.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/shapes/polygon.hpp"
+#include "rive/shapes/star.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 #include <cmath>
 
 using namespace rive;

diff --git a/src/shapes/rectangle.cpp b/src/shapes/rectangle.cpp
index 3cd739e..ac22bc3 100644
--- a/src/shapes/rectangle.cpp
+++ b/src/shapes/rectangle.cpp

@@ -1,4 +1,4 @@
-#include "shapes/rectangle.hpp"
+#include "rive/shapes/rectangle.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/shape.cpp b/src/shapes/shape.cpp
index 8ad26f1..f92ba15 100644
--- a/src/shapes/shape.cpp
+++ b/src/shapes/shape.cpp

@@ -1,8 +1,8 @@
-#include "shapes/shape.hpp"
-#include "shapes/clipping_shape.hpp"
-#include "shapes/paint/blend_mode.hpp"
-#include "shapes/paint/shape_paint.hpp"
-#include "shapes/path_composer.hpp"
+#include "rive/shapes/shape.hpp"
+#include "rive/shapes/clipping_shape.hpp"
+#include "rive/shapes/paint/blend_mode.hpp"
+#include "rive/shapes/paint/shape_paint.hpp"
+#include "rive/shapes/path_composer.hpp"
 #include <algorithm>
 
 using namespace rive;

diff --git a/src/shapes/shape_paint_container.cpp b/src/shapes/shape_paint_container.cpp
index b49725e..514282a 100644
--- a/src/shapes/shape_paint_container.cpp
+++ b/src/shapes/shape_paint_container.cpp

@@ -1,11 +1,11 @@
-#include "shapes/shape_paint_container.hpp"
-#include "artboard.hpp"
-#include "component.hpp"
-#include "renderer.hpp"
-#include "shapes/metrics_path.hpp"
-#include "shapes/paint/fill.hpp"
-#include "shapes/paint/stroke.hpp"
-#include "shapes/shape.hpp"
+#include "rive/shapes/shape_paint_container.hpp"
+#include "rive/artboard.hpp"
+#include "rive/component.hpp"
+#include "rive/renderer.hpp"
+#include "rive/shapes/metrics_path.hpp"
+#include "rive/shapes/paint/fill.hpp"
+#include "rive/shapes/paint/stroke.hpp"
+#include "rive/shapes/shape.hpp"
 
 using namespace rive;
 ShapePaintContainer* ShapePaintContainer::from(Component* component)

diff --git a/src/shapes/star.cpp b/src/shapes/star.cpp
index 6f95266..e1dd7e7 100644
--- a/src/shapes/star.cpp
+++ b/src/shapes/star.cpp

@@ -1,5 +1,5 @@
-#include "shapes/star.hpp"
-#include "shapes/straight_vertex.hpp"
+#include "rive/shapes/star.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 #include <cmath>
 #include <cstdio>
 

diff --git a/src/shapes/straight_vertex.cpp b/src/shapes/straight_vertex.cpp
index f35f76d..07d0d2b 100644
--- a/src/shapes/straight_vertex.cpp
+++ b/src/shapes/straight_vertex.cpp

@@ -1,4 +1,4 @@
-#include "shapes/straight_vertex.hpp"
+#include "rive/shapes/straight_vertex.hpp"
 
 using namespace rive;
 

diff --git a/src/shapes/triangle.cpp b/src/shapes/triangle.cpp
index 4b2d162..73af0bc 100644
--- a/src/shapes/triangle.cpp
+++ b/src/shapes/triangle.cpp

@@ -1,6 +1,6 @@
-#include "shapes/triangle.hpp"
-#include "component_dirt.hpp"
-#include "math/circle_constant.hpp"
+#include "rive/shapes/triangle.hpp"
+#include "rive/component_dirt.hpp"
+#include "rive/math/circle_constant.hpp"
 
 using namespace rive;
 

diff --git a/src/transform_component.cpp b/src/transform_component.cpp
index 46e0299..df4af10 100644
--- a/src/transform_component.cpp
+++ b/src/transform_component.cpp

@@ -1,7 +1,7 @@
-#include "transform_component.hpp"
-#include "shapes/clipping_shape.hpp"
-#include "math/vec2d.hpp"
-#include "constraints/constraint.hpp"
+#include "rive/transform_component.hpp"
+#include "rive/shapes/clipping_shape.hpp"
+#include "rive/math/vec2d.hpp"
+#include "rive/constraints/constraint.hpp"
 
 using namespace rive;