diff --git a/celadon_ivi/AndroidBoard.mk b/AndroidBoard.mk similarity index 100% rename from celadon_ivi/AndroidBoard.mk rename to AndroidBoard.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 84ff1a0a0..ccd05cae2 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -14,12 +14,8 @@ # limitations under the License. # -PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/celadon_ivi/celadon_ivi.mk \ - $(LOCAL_DIR)/apollo_ivi/apollo_ivi.mk \ - $(LOCAL_DIR)/blizzard_ivi/blizzard_ivi.mk +PRODUCT_MAKEFILES += \ + $(LOCAL_DIR)/celadon_ivi.mk \ COMMON_LUNCH_CHOICES += \ celadon_ivi-userdebug \ - apollo_ivi-userdebug \ - blizzard_ivi-userdebug diff --git a/celadon_ivi/BoardConfig.mk b/BoardConfig.mk similarity index 100% rename from celadon_ivi/BoardConfig.mk rename to BoardConfig.mk diff --git a/celadon_ivi/acpi/dummy.dtb b/acpi/dummy.dtb similarity index 100% rename from celadon_ivi/acpi/dummy.dtb rename to acpi/dummy.dtb diff --git a/celadon_ivi/audio/AndroidBoard.mk b/audio/AndroidBoard.mk similarity index 100% rename from celadon_ivi/audio/AndroidBoard.mk rename to audio/AndroidBoard.mk diff --git a/celadon_ivi/audio/default/AndroidBoard.mk b/audio/default/AndroidBoard.mk similarity index 100% rename from celadon_ivi/audio/default/AndroidBoard.mk rename to audio/default/AndroidBoard.mk diff --git a/celadon_ivi/audio/default/effect/audio_effects.xml b/audio/default/effect/audio_effects.xml similarity index 100% rename from celadon_ivi/audio/default/effect/audio_effects.xml rename to audio/default/effect/audio_effects.xml diff --git a/celadon_ivi/audio/default/mixer_paths_0.xml b/audio/default/mixer_paths_0.xml similarity index 100% rename from celadon_ivi/audio/default/mixer_paths_0.xml rename to audio/default/mixer_paths_0.xml diff --git a/celadon_ivi/audio/default/mixer_paths_ehl.xml b/audio/default/mixer_paths_ehl.xml similarity index 100% rename from celadon_ivi/audio/default/mixer_paths_ehl.xml rename to audio/default/mixer_paths_ehl.xml diff --git a/celadon_ivi/audio/default/mixer_paths_usb.xml b/audio/default/mixer_paths_usb.xml similarity index 100% rename from celadon_ivi/audio/default/mixer_paths_usb.xml rename to audio/default/mixer_paths_usb.xml diff --git a/celadon_ivi/audio/default/parameter-framework/AudioCriteria.txt b/audio/default/parameter-framework/AudioCriteria.txt similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/AudioCriteria.txt rename to audio/default/parameter-framework/AudioCriteria.txt diff --git a/celadon_ivi/audio/default/parameter-framework/AudioParameterFramework.xml b/audio/default/parameter-framework/AudioParameterFramework.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/AudioParameterFramework.xml rename to audio/default/parameter-framework/AudioParameterFramework.xml diff --git a/celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw b/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw rename to audio/default/parameter-framework/Settings/Audio/routing_defaulthda.pfw diff --git a/celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw b/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw rename to audio/default/parameter-framework/Settings/Audio/routing_hdmi.pfw diff --git a/celadon_ivi/audio/default/parameter-framework/Structure/Audio/AudioClass.xml b/audio/default/parameter-framework/Structure/Audio/AudioClass.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Structure/Audio/AudioClass.xml rename to audio/default/parameter-framework/Structure/Audio/AudioClass.xml diff --git a/celadon_ivi/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml b/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml rename to audio/default/parameter-framework/Structure/Audio/DefaultHDaudioSubsystem.xml diff --git a/celadon_ivi/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml b/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml similarity index 100% rename from celadon_ivi/audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml rename to audio/default/parameter-framework/Structure/Audio/HdmiSubsystem.xml diff --git a/celadon_ivi/audio/default/policy/a2dp_audio_policy_configuration.xml b/audio/default/policy/a2dp_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/a2dp_audio_policy_configuration.xml rename to audio/default/policy/a2dp_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_configuration.xml b/audio/default/policy/audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_configuration.xml rename to audio/default/policy/audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_criteria.conf b/audio/default/policy/audio_policy_criteria.conf similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_criteria.conf rename to audio/default/policy/audio_policy_criteria.conf diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_configuration.xml b/audio/default/policy/audio_policy_engine_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_configuration.xml rename to audio/default/policy/audio_policy_engine_configuration.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_criteria.xml b/audio/default/policy/audio_policy_engine_criteria.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_criteria.xml rename to audio/default/policy/audio_policy_engine_criteria.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_criterion_types.xml.in b/audio/default/policy/audio_policy_engine_criterion_types.xml.in similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_criterion_types.xml.in rename to audio/default/policy/audio_policy_engine_criterion_types.xml.in diff --git a/celadon_ivi/audio/default/policy/audio_policy_engine_product_strategies.xml b/audio/default/policy/audio_policy_engine_product_strategies.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_engine_product_strategies.xml rename to audio/default/policy/audio_policy_engine_product_strategies.xml diff --git a/celadon_ivi/audio/default/policy/audio_policy_volumes.xml b/audio/default/policy/audio_policy_volumes.xml similarity index 100% rename from celadon_ivi/audio/default/policy/audio_policy_volumes.xml rename to audio/default/policy/audio_policy_volumes.xml diff --git a/celadon_ivi/audio/default/policy/default_volume_tables.xml b/audio/default/policy/default_volume_tables.xml similarity index 100% rename from celadon_ivi/audio/default/policy/default_volume_tables.xml rename to audio/default/policy/default_volume_tables.xml diff --git a/celadon_ivi/audio/default/policy/fallback/audio_policy_configuration_generic.xml b/audio/default/policy/fallback/audio_policy_configuration_generic.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/audio_policy_configuration_generic.xml rename to audio/default/policy/fallback/audio_policy_configuration_generic.xml diff --git a/celadon_ivi/audio/default/policy/fallback/audio_policy_volumes.xml b/audio/default/policy/fallback/audio_policy_volumes.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/audio_policy_volumes.xml rename to audio/default/policy/fallback/audio_policy_volumes.xml diff --git a/celadon_ivi/audio/default/policy/fallback/default_volume_tables.xml b/audio/default/policy/fallback/default_volume_tables.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/default_volume_tables.xml rename to audio/default/policy/fallback/default_volume_tables.xml diff --git a/celadon_ivi/audio/default/policy/fallback/primary_audio_policy_configuration.xml b/audio/default/policy/fallback/primary_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/primary_audio_policy_configuration.xml rename to audio/default/policy/fallback/primary_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml b/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/fallback/r_submix_audio_policy_configuration.xml rename to audio/default/policy/fallback/r_submix_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/hdmi_audio_policy_configuration.xml b/audio/default/policy/hdmi_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/hdmi_audio_policy_configuration.xml rename to audio/default/policy/hdmi_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/r_submix_audio_policy_configuration.xml b/audio/default/policy/r_submix_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/r_submix_audio_policy_configuration.xml rename to audio/default/policy/r_submix_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/stub_audio_policy_configuration.xml b/audio/default/policy/stub_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/stub_audio_policy_configuration.xml rename to audio/default/policy/stub_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/policy/usb_audio_policy_configuration.xml b/audio/default/policy/usb_audio_policy_configuration.xml similarity index 100% rename from celadon_ivi/audio/default/policy/usb_audio_policy_configuration.xml rename to audio/default/policy/usb_audio_policy_configuration.xml diff --git a/celadon_ivi/audio/default/route/audio_criteria.xml b/audio/default/route/audio_criteria.xml similarity index 100% rename from celadon_ivi/audio/default/route/audio_criteria.xml rename to audio/default/route/audio_criteria.xml diff --git a/celadon_ivi/audio/default/route/audio_criterion_types.xml b/audio/default/route/audio_criterion_types.xml similarity index 100% rename from celadon_ivi/audio/default/route/audio_criterion_types.xml rename to audio/default/route/audio_criterion_types.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/AndroidBoard.mk b/audio/reference_configurable_audio_policy/AndroidBoard.mk similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/AndroidBoard.mk rename to audio/reference_configurable_audio_policy/AndroidBoard.mk diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in b/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in rename to audio/reference_configurable_audio_policy/ParameterFrameworkConfigurationPolicy.xml.in diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/README.md b/audio/reference_configurable_audio_policy/README.md similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/README.md rename to audio/reference_configurable_audio_policy/README.md diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml b/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml rename to audio/reference_configurable_audio_policy/Settings/PolicyConfigurableDomains.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_input_source.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_accessibility.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_dtmf.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_enforced_audible.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_media.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_phone.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_rerouting.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_sonification_respectful.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw b/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw rename to audio/reference_configurable_audio_policy/Settings/device_for_strategy_transmitted_through_speaker.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw b/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw rename to audio/reference_configurable_audio_policy/Settings/strategy_for_stream.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw b/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw rename to audio/reference_configurable_audio_policy/Settings/strategy_for_usage.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Settings/volumes.pfw b/audio/reference_configurable_audio_policy/Settings/volumes.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Settings/volumes.pfw rename to audio/reference_configurable_audio_policy/Settings/volumes.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw b/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw rename to audio/reference_configurable_audio_policy/SettingsNoInput/device_for_input_source.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw b/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw rename to audio/reference_configurable_audio_policy/SettingsNoOutput/device_for_strategies.pfw diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml b/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicyClass.xml rename to audio/reference_configurable_audio_policy/Structure/PolicyClass.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml b/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml rename to audio/reference_configurable_audio_policy/Structure/PolicySubsystem-CommonTypes.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml b/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml rename to audio/reference_configurable_audio_policy/Structure/PolicySubsystem.xml diff --git a/celadon_ivi/audio/reference_configurable_audio_policy/policy_criteria.txt b/audio/reference_configurable_audio_policy/policy_criteria.txt similarity index 100% rename from celadon_ivi/audio/reference_configurable_audio_policy/policy_criteria.txt rename to audio/reference_configurable_audio_policy/policy_criteria.txt diff --git a/celadon_ivi/auto_switch_pt_usb_vms.sh b/auto_switch_pt_usb_vms.sh similarity index 100% rename from celadon_ivi/auto_switch_pt_usb_vms.sh rename to auto_switch_pt_usb_vms.sh diff --git a/celadon_ivi/bldr_utils.img b/bldr_utils.img similarity index 100% rename from celadon_ivi/bldr_utils.img rename to bldr_utils.img diff --git a/celadon_ivi/cam_sharing/0001-Netlink-sync.patch b/cam_sharing/0001-Netlink-sync.patch similarity index 100% rename from celadon_ivi/cam_sharing/0001-Netlink-sync.patch rename to cam_sharing/0001-Netlink-sync.patch diff --git a/celadon_ivi/cam_sharing/IntelCameraService b/cam_sharing/IntelCameraService similarity index 100% rename from celadon_ivi/cam_sharing/IntelCameraService rename to cam_sharing/IntelCameraService diff --git a/celadon_ivi/cam_sharing/virtualcamera.service b/cam_sharing/virtualcamera.service similarity index 100% rename from celadon_ivi/cam_sharing/virtualcamera.service rename to cam_sharing/virtualcamera.service diff --git a/celadon_ivi/celadon_ivi.mk b/celadon_ivi.mk similarity index 100% rename from celadon_ivi/celadon_ivi.mk rename to celadon_ivi.mk diff --git a/celadon_ivi/check_lowmem.sh b/check_lowmem.sh similarity index 100% rename from celadon_ivi/check_lowmem.sh rename to check_lowmem.sh diff --git a/celadon_ivi/compatibility_matrix.xml b/compatibility_matrix.xml similarity index 100% rename from celadon_ivi/compatibility_matrix.xml rename to compatibility_matrix.xml diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/caas_diffconfig b/config-lts/linux-intel-lts2021/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/linux-intel-lts2021/caas_diffconfig rename to config-lts/linux-intel-lts2021/caas_diffconfig diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/debug_diffconfig b/config-lts/linux-intel-lts2021/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/linux-intel-lts2021/debug_diffconfig rename to config-lts/linux-intel-lts2021/debug_diffconfig diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig b/config-lts/linux-intel-lts2021/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig rename to config-lts/linux-intel-lts2021/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/abl_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/apl_nuc_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/bxtp_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/car_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/cbc_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/eng_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/modules_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/sbl_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/ull_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig b/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig rename to config-lts/lts2018/bxt/android/non-embargoed/vsbl_diffconfig diff --git a/celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig b/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig rename to config-lts/lts2018/bxt/android/non-embargoed/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/caas_diffconfig b/config-lts/lts2019-chromium/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/caas_diffconfig rename to config-lts/lts2019-chromium/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/cfc_diffconfig b/config-lts/lts2019-chromium/cfc_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/cfc_diffconfig rename to config-lts/lts2019-chromium/cfc_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/debug_diffconfig b/config-lts/lts2019-chromium/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/debug_diffconfig rename to config-lts/lts2019-chromium/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-chromium/x86_64_defconfig b/config-lts/lts2019-chromium/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-chromium/x86_64_defconfig rename to config-lts/lts2019-chromium/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2019-yocto/caas_diffconfig b/config-lts/lts2019-yocto/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-yocto/caas_diffconfig rename to config-lts/lts2019-yocto/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-yocto/debug_diffconfig b/config-lts/lts2019-yocto/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-yocto/debug_diffconfig rename to config-lts/lts2019-yocto/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2019-yocto/x86_64_defconfig b/config-lts/lts2019-yocto/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2019-yocto/x86_64_defconfig rename to config-lts/lts2019-yocto/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2020-chromium/caas_diffconfig b/config-lts/lts2020-chromium/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-chromium/caas_diffconfig rename to config-lts/lts2020-chromium/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-chromium/debug_diffconfig b/config-lts/lts2020-chromium/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-chromium/debug_diffconfig rename to config-lts/lts2020-chromium/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-chromium/x86_64_defconfig b/config-lts/lts2020-chromium/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-chromium/x86_64_defconfig rename to config-lts/lts2020-chromium/x86_64_defconfig diff --git a/celadon_ivi/config-lts/lts2020-yocto/caas_diffconfig b/config-lts/lts2020-yocto/caas_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-yocto/caas_diffconfig rename to config-lts/lts2020-yocto/caas_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-yocto/debug_diffconfig b/config-lts/lts2020-yocto/debug_diffconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-yocto/debug_diffconfig rename to config-lts/lts2020-yocto/debug_diffconfig diff --git a/celadon_ivi/config-lts/lts2020-yocto/x86_64_defconfig b/config-lts/lts2020-yocto/x86_64_defconfig similarity index 100% rename from celadon_ivi/config-lts/lts2020-yocto/x86_64_defconfig rename to config-lts/lts2020-yocto/x86_64_defconfig diff --git a/celadon_ivi/device.mk b/device.mk similarity index 100% rename from celadon_ivi/device.mk rename to device.mk diff --git a/celadon_ivi/display_settings.xml b/display_settings.xml similarity index 100% rename from celadon_ivi/display_settings.xml rename to display_settings.xml diff --git a/celadon_ivi/extra_files/abota-fw/update_ifwi_ab.sh b/extra_files/abota-fw/update_ifwi_ab.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/update_ifwi_ab.sh rename to extra_files/abota-fw/update_ifwi_ab.sh diff --git a/celadon_ivi/extra_files/abota-fw/update_ifwi_boot.sh b/extra_files/abota-fw/update_ifwi_boot.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/update_ifwi_boot.sh rename to extra_files/abota-fw/update_ifwi_boot.sh diff --git a/celadon_ivi/extra_files/abota-fw/upgrade_o/fw_update.sh b/extra_files/abota-fw/upgrade_o/fw_update.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/upgrade_o/fw_update.sh rename to extra_files/abota-fw/upgrade_o/fw_update.sh diff --git a/celadon_ivi/extra_files/abota-fw/upgrade_o/updater_ab.sh b/extra_files/abota-fw/upgrade_o/updater_ab.sh similarity index 100% rename from celadon_ivi/extra_files/abota-fw/upgrade_o/updater_ab.sh rename to extra_files/abota-fw/upgrade_o/updater_ab.sh diff --git a/celadon_ivi/extra_files/acpio-partition/dummy-ssdt.asl b/extra_files/acpio-partition/dummy-ssdt.asl similarity index 100% rename from celadon_ivi/extra_files/acpio-partition/dummy-ssdt.asl rename to extra_files/acpio-partition/dummy-ssdt.asl diff --git a/celadon_ivi/extra_files/audio/auto_hal.in b/extra_files/audio/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/audio/auto_hal.in rename to extra_files/audio/auto_hal.in diff --git a/celadon_ivi/extra_files/avx/checkavx.sh b/extra_files/avx/checkavx.sh similarity index 100% rename from celadon_ivi/extra_files/avx/checkavx.sh rename to extra_files/avx/checkavx.sh diff --git a/celadon_ivi/extra_files/boot-arch/set_soc_prop.sh b/extra_files/boot-arch/set_soc_prop.sh similarity index 100% rename from celadon_ivi/extra_files/boot-arch/set_soc_prop.sh rename to extra_files/boot-arch/set_soc_prop.sh diff --git a/celadon_ivi/extra_files/boot-arch/startup.nsh b/extra_files/boot-arch/startup.nsh similarity index 100% rename from celadon_ivi/extra_files/boot-arch/startup.nsh rename to extra_files/boot-arch/startup.nsh diff --git a/celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh b/extra_files/boot-arch/update_ifwi_ab.sh similarity index 100% rename from celadon_ivi/extra_files/boot-arch/update_ifwi_ab.sh rename to extra_files/boot-arch/update_ifwi_ab.sh diff --git a/celadon_ivi/extra_files/camera-ext/external_camera_config.xml b/extra_files/camera-ext/external_camera_config.xml similarity index 100% rename from celadon_ivi/extra_files/camera-ext/external_camera_config.xml rename to extra_files/camera-ext/external_camera_config.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_c2.xml b/extra_files/codec2/media_codecs_c2.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_c2.xml rename to extra_files/codec2/media_codecs_c2.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_intel_c2_video.xml b/extra_files/codec2/media_codecs_intel_c2_video.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_intel_c2_video.xml rename to extra_files/codec2/media_codecs_intel_c2_video.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_performance_c2_adl.xml b/extra_files/codec2/media_codecs_performance_c2_adl.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_performance_c2_adl.xml rename to extra_files/codec2/media_codecs_performance_c2_adl.xml diff --git a/celadon_ivi/extra_files/codec2/media_codecs_performance_c2_tgl.xml b/extra_files/codec2/media_codecs_performance_c2_tgl.xml similarity index 100% rename from celadon_ivi/extra_files/codec2/media_codecs_performance_c2_tgl.xml rename to extra_files/codec2/media_codecs_performance_c2_tgl.xml diff --git a/celadon_ivi/extra_files/codec2/mfx_c2_store.conf b/extra_files/codec2/mfx_c2_store.conf similarity index 100% rename from celadon_ivi/extra_files/codec2/mfx_c2_store.conf rename to extra_files/codec2/mfx_c2_store.conf diff --git a/celadon_ivi/extra_files/codecs/auto_hal.in b/extra_files/codecs/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/codecs/auto_hal.in rename to extra_files/codecs/auto_hal.in diff --git a/celadon_ivi/extra_files/codecs/media_codecs_gen12.xml b/extra_files/codecs/media_codecs_gen12.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_gen12.xml rename to extra_files/codecs/media_codecs_gen12.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_gen9.xml b/extra_files/codecs/media_codecs_gen9.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_gen9.xml rename to extra_files/codecs/media_codecs_gen9.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_performance_adl.xml b/extra_files/codecs/media_codecs_performance_adl.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_performance_adl.xml rename to extra_files/codecs/media_codecs_performance_adl.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_performance_cml.xml b/extra_files/codecs/media_codecs_performance_cml.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_performance_cml.xml rename to extra_files/codecs/media_codecs_performance_cml.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_performance_tgl.xml b/extra_files/codecs/media_codecs_performance_tgl.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_performance_tgl.xml rename to extra_files/codecs/media_codecs_performance_tgl.xml diff --git a/celadon_ivi/extra_files/codecs/media_codecs_vp9.xml b/extra_files/codecs/media_codecs_vp9.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_codecs_vp9.xml rename to extra_files/codecs/media_codecs_vp9.xml diff --git a/celadon_ivi/extra_files/codecs/media_profiles.xml b/extra_files/codecs/media_profiles.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_profiles.xml rename to extra_files/codecs/media_profiles.xml diff --git a/celadon_ivi/extra_files/codecs/media_profiles_1080p.xml b/extra_files/codecs/media_profiles_1080p.xml similarity index 100% rename from celadon_ivi/extra_files/codecs/media_profiles_1080p.xml rename to extra_files/codecs/media_profiles_1080p.xml diff --git a/celadon_ivi/extra_files/codecs/mfx_omxil_core.conf b/extra_files/codecs/mfx_omxil_core.conf similarity index 100% rename from celadon_ivi/extra_files/codecs/mfx_omxil_core.conf rename to extra_files/codecs/mfx_omxil_core.conf diff --git a/celadon_ivi/extra_files/codecs/mfx_omxil_core_vp9.conf b/extra_files/codecs/mfx_omxil_core_vp9.conf similarity index 100% rename from celadon_ivi/extra_files/codecs/mfx_omxil_core_vp9.conf rename to extra_files/codecs/mfx_omxil_core_vp9.conf diff --git a/celadon_ivi/extra_files/debug-crashlogd/init.crashlogd.rc b/extra_files/debug-crashlogd/init.crashlogd.rc similarity index 100% rename from celadon_ivi/extra_files/debug-crashlogd/init.crashlogd.rc rename to extra_files/debug-crashlogd/init.crashlogd.rc diff --git a/celadon_ivi/extra_files/docker/99-ignore-keyboard.rules b/extra_files/docker/99-ignore-keyboard.rules similarity index 100% rename from celadon_ivi/extra_files/docker/99-ignore-keyboard.rules rename to extra_files/docker/99-ignore-keyboard.rules diff --git a/celadon_ivi/extra_files/docker/99-ignore-mouse.rules b/extra_files/docker/99-ignore-mouse.rules similarity index 100% rename from celadon_ivi/extra_files/docker/99-ignore-mouse.rules rename to extra_files/docker/99-ignore-mouse.rules diff --git a/celadon_ivi/extra_files/docker/config.toml b/extra_files/docker/config.toml similarity index 100% rename from celadon_ivi/extra_files/docker/config.toml rename to extra_files/docker/config.toml diff --git a/celadon_ivi/extra_files/docker/containerd b/extra_files/docker/containerd similarity index 100% rename from celadon_ivi/extra_files/docker/containerd rename to extra_files/docker/containerd diff --git a/celadon_ivi/extra_files/docker/containerd-shim-runc-v2 b/extra_files/docker/containerd-shim-runc-v2 similarity index 100% rename from celadon_ivi/extra_files/docker/containerd-shim-runc-v2 rename to extra_files/docker/containerd-shim-runc-v2 diff --git a/celadon_ivi/extra_files/docker/daemon.json b/extra_files/docker/daemon.json similarity index 100% rename from celadon_ivi/extra_files/docker/daemon.json rename to extra_files/docker/daemon.json diff --git a/celadon_ivi/extra_files/docker/docker b/extra_files/docker/docker similarity index 100% rename from celadon_ivi/extra_files/docker/docker rename to extra_files/docker/docker diff --git a/celadon_ivi/extra_files/docker/docker_manager b/extra_files/docker/docker_manager similarity index 100% rename from celadon_ivi/extra_files/docker/docker_manager rename to extra_files/docker/docker_manager diff --git a/celadon_ivi/extra_files/docker/dockerd b/extra_files/docker/dockerd similarity index 100% rename from celadon_ivi/extra_files/docker/dockerd rename to extra_files/docker/dockerd diff --git a/celadon_ivi/extra_files/docker/dockerd-dev b/extra_files/docker/dockerd-dev similarity index 100% rename from celadon_ivi/extra_files/docker/dockerd-dev rename to extra_files/docker/dockerd-dev diff --git a/celadon_ivi/extra_files/docker/lic_install.sh b/extra_files/docker/lic_install.sh similarity index 100% rename from celadon_ivi/extra_files/docker/lic_install.sh rename to extra_files/docker/lic_install.sh diff --git a/celadon_ivi/extra_files/docker/runc b/extra_files/docker/runc similarity index 100% rename from celadon_ivi/extra_files/docker/runc rename to extra_files/docker/runc diff --git a/celadon_ivi/extra_files/ethernet/load_eth_modules.in b/extra_files/ethernet/load_eth_modules.in similarity index 100% rename from celadon_ivi/extra_files/ethernet/load_eth_modules.in rename to extra_files/ethernet/load_eth_modules.in diff --git a/celadon_ivi/extra_files/firststage-mount/config.asl b/extra_files/firststage-mount/config.asl similarity index 100% rename from celadon_ivi/extra_files/firststage-mount/config.asl rename to extra_files/firststage-mount/config.asl diff --git a/celadon_ivi/extra_files/graphics/auto_hal.in b/extra_files/graphics/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/graphics/auto_hal.in rename to extra_files/graphics/auto_hal.in diff --git a/celadon_ivi/extra_files/graphics/drirc b/extra_files/graphics/drirc similarity index 100% rename from celadon_ivi/extra_files/graphics/drirc rename to extra_files/graphics/drirc diff --git a/celadon_ivi/extra_files/intel_prop/intel_prop.cfg b/extra_files/intel_prop/intel_prop.cfg similarity index 100% rename from celadon_ivi/extra_files/intel_prop/intel_prop.cfg rename to extra_files/intel_prop/intel_prop.cfg diff --git a/celadon_ivi/extra_files/kernel/load_kernel_modules.in b/extra_files/kernel/load_kernel_modules.in similarity index 100% rename from celadon_ivi/extra_files/kernel/load_kernel_modules.in rename to extra_files/kernel/load_kernel_modules.in diff --git a/celadon_ivi/extra_files/media/auto_hal.in b/extra_files/media/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/media/auto_hal.in rename to extra_files/media/auto_hal.in diff --git a/celadon_ivi/extra_files/neuralnetworks/plugins.xml b/extra_files/neuralnetworks/plugins.xml similarity index 100% rename from celadon_ivi/extra_files/neuralnetworks/plugins.xml rename to extra_files/neuralnetworks/plugins.xml diff --git a/celadon_ivi/extra_files/power/auto_hal.in b/extra_files/power/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/power/auto_hal.in rename to extra_files/power/auto_hal.in diff --git a/celadon_ivi/extra_files/public-libraries/public.libraries.txt b/extra_files/public-libraries/public.libraries.txt similarity index 100% rename from celadon_ivi/extra_files/public-libraries/public.libraries.txt rename to extra_files/public-libraries/public.libraries.txt diff --git a/celadon_ivi/extra_files/sensors/auto_hal.in b/extra_files/sensors/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/sensors/auto_hal.in rename to extra_files/sensors/auto_hal.in diff --git a/celadon_ivi/extra_files/slot-ab/postinstall.sh b/extra_files/slot-ab/postinstall.sh similarity index 100% rename from celadon_ivi/extra_files/slot-ab/postinstall.sh rename to extra_files/slot-ab/postinstall.sh diff --git a/celadon_ivi/extra_files/suspend/auto_hal.in b/extra_files/suspend/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/suspend/auto_hal.in rename to extra_files/suspend/auto_hal.in diff --git a/celadon_ivi/extra_files/thermal/auto_hal.in b/extra_files/thermal/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/thermal/auto_hal.in rename to extra_files/thermal/auto_hal.in diff --git a/celadon_ivi/extra_files/usb-gadget/auto_hal.in b/extra_files/usb-gadget/auto_hal.in similarity index 100% rename from celadon_ivi/extra_files/usb-gadget/auto_hal.in rename to extra_files/usb-gadget/auto_hal.in diff --git a/celadon_ivi/extra_files/usb-init/load_usb_modules.in b/extra_files/usb-init/load_usb_modules.in similarity index 100% rename from celadon_ivi/extra_files/usb-init/load_usb_modules.in rename to extra_files/usb-init/load_usb_modules.in diff --git a/celadon_ivi/extra_files/usb-otg-switch/usb_otg_switch.sh b/extra_files/usb-otg-switch/usb_otg_switch.sh similarity index 100% rename from celadon_ivi/extra_files/usb-otg-switch/usb_otg_switch.sh rename to extra_files/usb-otg-switch/usb_otg_switch.sh diff --git a/celadon_ivi/extra_files/vendor-partition/mkshrc_recovery b/extra_files/vendor-partition/mkshrc_recovery similarity index 100% rename from celadon_ivi/extra_files/vendor-partition/mkshrc_recovery rename to extra_files/vendor-partition/mkshrc_recovery diff --git a/celadon_ivi/extra_files/vendor-partition/sh_recovery b/extra_files/vendor-partition/sh_recovery similarity index 100% rename from celadon_ivi/extra_files/vendor-partition/sh_recovery rename to extra_files/vendor-partition/sh_recovery diff --git a/celadon_ivi/extra_files/vendor-partition/toolbox_recovery b/extra_files/vendor-partition/toolbox_recovery similarity index 100% rename from celadon_ivi/extra_files/vendor-partition/toolbox_recovery rename to extra_files/vendor-partition/toolbox_recovery diff --git a/celadon_ivi/file_share.sh b/file_share.sh similarity index 100% rename from celadon_ivi/file_share.sh rename to file_share.sh diff --git a/celadon_ivi/findall.py b/findall.py similarity index 100% rename from celadon_ivi/findall.py rename to findall.py diff --git a/celadon_ivi/flash_cmd.sh b/flash_cmd.sh similarity index 100% rename from celadon_ivi/flash_cmd.sh rename to flash_cmd.sh diff --git a/celadon_ivi/flashfiles.ini b/flashfiles.ini similarity index 100% rename from celadon_ivi/flashfiles.ini rename to flashfiles.ini diff --git a/celadon_ivi/framework_manifest.xml b/framework_manifest.xml similarity index 100% rename from celadon_ivi/framework_manifest.xml rename to framework_manifest.xml diff --git a/celadon_ivi/fstab b/fstab similarity index 100% rename from celadon_ivi/fstab rename to fstab diff --git a/celadon_ivi/fstab.recovery b/fstab.recovery similarity index 100% rename from celadon_ivi/fstab.recovery rename to fstab.recovery diff --git a/celadon_ivi/gpt.ini b/gpt.ini similarity index 100% rename from celadon_ivi/gpt.ini rename to gpt.ini diff --git a/celadon_ivi/guest_pm_control b/guest_pm_control similarity index 100% rename from celadon_ivi/guest_pm_control rename to guest_pm_control diff --git a/celadon_ivi/init.rc b/init.rc similarity index 100% rename from celadon_ivi/init.rc rename to init.rc diff --git a/celadon_ivi/init.recovery.rc b/init.recovery.rc similarity index 100% rename from celadon_ivi/init.recovery.rc rename to init.recovery.rc diff --git a/celadon_ivi/intel-thermal-conf.xml b/intel-thermal-conf.xml similarity index 100% rename from celadon_ivi/intel-thermal-conf.xml rename to intel-thermal-conf.xml diff --git a/celadon_ivi/manifest.xml b/manifest.xml similarity index 100% rename from celadon_ivi/manifest.xml rename to manifest.xml diff --git a/celadon_ivi/mixins.spec b/mixins.spec similarity index 100% rename from celadon_ivi/mixins.spec rename to mixins.spec diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/values/config.xml rename to overlay/frameworks/base/core/res/res/values/config.xml diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/values/strings.xml b/overlay/frameworks/base/core/res/res/values/strings.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/values/strings.xml rename to overlay/frameworks/base/core/res/res/values/strings.xml diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/values/symbols.xml b/overlay/frameworks/base/core/res/res/values/symbols.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/values/symbols.xml rename to overlay/frameworks/base/core/res/res/values/symbols.xml diff --git a/celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/core/res/res/xml/power_profile.xml rename to overlay/frameworks/base/core/res/res/xml/power_profile.xml diff --git a/celadon_ivi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml rename to overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml diff --git a/celadon_ivi/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml similarity index 100% rename from celadon_ivi/overlay/frameworks/base/packages/SystemUI/res/values/config.xml rename to overlay/frameworks/base/packages/SystemUI/res/values/config.xml diff --git a/celadon_ivi/overlay/packages/apps/Bluetooth/res/values/config.xml b/overlay/packages/apps/Bluetooth/res/values/config.xml similarity index 100% rename from celadon_ivi/overlay/packages/apps/Bluetooth/res/values/config.xml rename to overlay/packages/apps/Bluetooth/res/values/config.xml diff --git a/celadon_ivi/setup_audio_host.sh b/setup_audio_host.sh similarity index 100% rename from celadon_ivi/setup_audio_host.sh rename to setup_audio_host.sh diff --git a/celadon_ivi/sof_audio/configure_sof.sh b/sof_audio/configure_sof.sh similarity index 100% rename from celadon_ivi/sof_audio/configure_sof.sh rename to sof_audio/configure_sof.sh diff --git a/celadon_ivi/system.prop b/system.prop similarity index 100% rename from celadon_ivi/system.prop rename to system.prop diff --git a/celadon_ivi/thermald.service b/thermald.service similarity index 100% rename from celadon_ivi/thermald.service rename to thermald.service diff --git a/celadon_ivi/ueventd.rc b/ueventd.rc similarity index 100% rename from celadon_ivi/ueventd.rc rename to ueventd.rc diff --git a/celadon_ivi/wakeup.py b/wakeup.py similarity index 100% rename from celadon_ivi/wakeup.py rename to wakeup.py