SDL RPC plugin CMAKElist

361 files changed, 73 insertions, 280 deletions

diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt
index 966dbee353..024cd2813d 100644
--- a/src/components/application_manager/CMakeLists.txt
+++ b/src/components/application_manager/CMakeLists.txt
@@ -121,273 +121,6 @@ set (COMMANDS_SOURCE_DIR
 )
 collect_sources(POLICIES_SOURCES "${POLICIES_PATHS}")
 
-set(MOBILE_COMMANDS_EXCLUDE_PATHS
-  ${COMMANDS_SOURCE_DIR}/hmi
-)
-
-set (MOBILE_COMMANDS_PATHS
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/application_manager/commands
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/application_manager/commands/mobile
-  ${COMMANDS_SOURCE_DIR}
-  ${COMMANDS_SOURCE_DIR}/mobile
-)
-collect_sources(MOBILE_COMMANDS_SOURCES "${MOBILE_COMMANDS_PATHS}" "${MOBILE_COMMANDS_EXCLUDE_PATHS}")
-
-set (HMI_COMMANDS_SOURCES
-  ${COMMANDS_SOURCE_DIR}/hmi/request_to_hmi.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/response_from_hmi.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/request_from_hmi.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/response_to_hmi.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/notification_to_hmi.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/notification_from_hmi.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/allow_all_apps_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/allow_all_apps_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/allow_app_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/allow_app_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/update_sdl_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/update_sdl_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/activate_app_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/activate_app_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/get_system_info_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/get_system_info_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_get_system_time_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_get_system_time_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_system_time_ready_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_get_list_of_permissions_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_get_list_of_permissions_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_get_user_friendly_message_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_get_user_friendly_message_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_get_status_update_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_get_status_update_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_status_update_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_activate_app_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_activate_app_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/mixing_audio_supported_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/mixing_audio_supported_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/update_app_list_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/update_app_list_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_update_device_list.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/update_device_list_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/update_device_list_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_audio_data_streaming_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_video_data_streaming_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_sdl_consent_needed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_sdl_persistence_complete_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_exit_all_applications_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_exit_application_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_navi_way_point_change_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_start_device_discovery.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/close_popup_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/close_popup_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_app_activated_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/button_get_capabilities_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/button_get_capabilities_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_is_ready_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_is_ready_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_add_command_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_add_command_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_delete_command_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_delete_command_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_change_registration_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_change_registration_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_get_supported_languages_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_get_supported_languages_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_get_language_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_get_language_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_get_capabilities_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_get_capabilities_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_is_ready_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_is_ready_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_change_registration_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_change_registration_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_get_language_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_get_language_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_get_supported_languages_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_get_supported_languages_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_stop_speaking_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_stop_speaking_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_speak_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_speak_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_set_global_properties_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_set_global_properties_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_get_capabilities_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/tts_get_capabilities_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_perform_interaction_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vr_perform_interaction_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_add_command_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_add_command_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_delete_command_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_delete_command_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_add_submenu_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_add_submenu_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_delete_submenu_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_delete_submenu_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_get_supported_languages_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_get_supported_languages_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_get_language_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_get_language_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_get_capabilities_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_get_capabilities_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_change_registration_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_change_registration_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_show_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_show_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_alert_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_alert_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_slider_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_scrollable_message_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_scrollable_message_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_global_properties_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_global_properties_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_slider_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_is_ready_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_is_ready_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_perform_audio_pass_thru_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_perform_audio_pass_thru_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_end_audio_pass_thru_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_end_audio_pass_thru_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_perform_interaction_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_perform_interaction_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_app_icon_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_app_icon_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_media_clock_timer_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_media_clock_timer_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_show_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_show_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_is_ready_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_is_ready_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_read_did_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_read_did_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_get_dtcs_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_get_dtcs_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_diagnostic_message_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_diagnostic_message_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_get_vehicle_type_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_get_vehicle_type_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_is_ready_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_is_ready_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_alert_maneuver_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_alert_maneuver_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_update_turn_list_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_update_turn_list_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_show_constant_tbt_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_show_constant_tbt_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_send_location_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_send_location_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_subscribe_way_points_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_subscribe_way_points_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_unsubscribe_way_points_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_unsubscribe_way_points_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ready_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_system_context_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_device_chosen_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_allow_sdl_functionality_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_app_permission_consent_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_app_registered_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_app_permission_changed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_app_unregistered_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_driver_distraction_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ignition_cycle_over_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_system_info_changed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_file_removed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_tts_started_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_tts_stopped_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vr_started_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vr_stopped_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vr_command_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ui_command_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_navi_tbt_client_state_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_app_deactivated_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_tts_language_change_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vr_language_change_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ui_language_change_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_button_event_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_button_press_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_button_subscription_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_find_applications.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ui_keyboard_input_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ui_touch_event_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_ui_reset_timeout_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_start_stream_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_start_stream_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_stop_stream_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_stop_stream_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_audio_start_stream_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_audio_start_stream_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_audio_stop_stream_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_audio_stop_stream_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_get_way_points_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_get_way_points_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_set_video_config_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/navi_set_video_config_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_system_request_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_put_file_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_resume_audio_source_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_sdl_close_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_display_layout_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_display_layout_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_record_start_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/add_statistics_info_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_system_error_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_system_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_system_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/basic_communication_on_awake_sdl.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_policy_update.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/sdl_policy_update_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_received_policy_update.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_policy_update.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/get_urls.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/get_urls_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_device_state_changed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_tts_reset_timeout_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/dial_number_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/dial_number_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_event_changed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/decrypt_certificate_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/decrypt_certificate_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_set_icon_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/rc_is_ready_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/rc_is_ready_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/rc_get_capabilities_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/rc_get_capabilities_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_send_haptic_data_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/ui_send_haptic_data_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_get_vehicle_data_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_get_vehicle_data_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_subscribe_vehicle_data_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_subscribe_vehicle_data_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_unsubscribe_vehicle_data_request.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/vi_unsubscribe_vehicle_data_response.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_vehicle_data_notification.cc
-)
-
-set (HMI_COMMANDS_SOURCES_JSON
-)
-
-set (HMI_COMMANDS_SOURCES_DBUS
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_gps_data_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_speed_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_rpm_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_fuel_level_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_fuel_level_state_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_instant_fuel_consumption_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_external_temperature_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_vin_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_prndl_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_tire_pressure_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_odometer_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_belt_status_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_body_information_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_device_status_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_driver_braking_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_wiper_status_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_head_lamp_status_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_engine_torque_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_acc_pedal_position_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_steering_wheel_angle_notification.cc
-  ${COMMANDS_SOURCE_DIR}/hmi/on_vi_my_key_notification.cc
-)
-
 if (${HMI_JSON_API})
   set (HMI_COMMANDS_SOURCES ${HMI_COMMANDS_SOURCES} ${HMI_COMMANDS_SOURCES_JSON})
 endif (${HMI_JSON_API})
@@ -448,18 +181,11 @@ target_link_libraries("AMEventEngine" ${LIBRARIES})
 add_library("AMPolicyLibrary" ${POLICIES_MANAGER_SOURCES} )
 target_link_libraries("AMPolicyLibrary" ${LIBRARIES} AMEventEngine)
 
-add_library("AMHMICommandsLibrary" ${HMI_COMMANDS_SOURCES})
-target_link_libraries("AMHMICommandsLibrary" ${LIBRARIES} AMEventEngine)
-
-add_library("MessageHelper" ${MESSAGE_HELPER_SOURCES})
-target_link_libraries("MessageHelper" ${LIBRARIES})
-
 add_library("SystemTimeLibrary" ${SYSTEM_TIME_SOURCES})
 target_link_libraries("SystemTimeLibrary" ${LIBRARIES} AMEventEngine)
-add_dependencies("MessageHelper" HMI_API MOBILE_API)
 
-add_library("AMMobileCommandsLibrary" ${MOBILE_COMMANDS_SOURCES} )
-target_link_libraries("AMMobileCommandsLibrary" ${LIBRARIES} AMEventEngine)
+add_library("MessageHelper" ${MESSAGE_HELPER_SOURCES})
+target_link_libraries("MessageHelper" ${LIBRARIES})
 
 add_library("ApplicationManager" ${SOURCES})
 
@@ -480,3 +206,5 @@ target_link_libraries("ApplicationManager" ${LIBRARIES})
 if(BUILD_TESTS)
   add_subdirectory(test)
 endif()
+
+add_subdirectory(rpc_plugins)
diff --git a/src/components/application_manager/rpc_plugins/CMakeLists.txt b/src/components/application_manager/rpc_plugins/CMakeLists.txt
new file mode 100644
index 0000000000..b2789f9120
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Copyright (c) 2014, Ford Motor Company
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided with the
+# distribution.
+#
+# Neither the name of the Ford Motor Company nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# --- Utils
+add_subdirectory(sdl_rpc_plugin)
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
index 21e1afdf40..730634722d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
@@ -28,9 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-collect_sources(
-  RPC_PLUGIN_SOURCES
-  "${CMAKE_CURRENT_SOURCE_DIR}/src")
+include_directories(include)
 
 set (COMMANDS_SOURCE_DIR
   ${CMAKE_CURRENT_SOURCE_DIR}/src/commands
@@ -55,10 +53,12 @@ set(LIBRARIES
   SmartObjects
   Utils
 )
+
 if(ENABLE_LOG)
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 
+add_library("sdl_rpc_plugin" SHARED ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${RPC_PLUGIN_SOURCES})
 target_link_libraries("sdl_rpc_plugin" ${LIBRARIES})
 
 if(BUILD_TESTS)
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/activate_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h
index fd4cc12468..fd4cc12468 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/activate_app_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h
index 1470bf8651..1470bf8651 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/activate_app_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
index 3e0f81f167..3e0f81f167 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/add_statistics_info_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h
index c1c5b36e5b..c1c5b36e5b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_all_apps_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h
index 711825cfab..711825cfab 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_all_apps_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h
index 10424a2661..10424a2661 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_app_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h
index 4f2642f550..4f2642f550 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/allow_app_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/basic_communication_on_awake_sdl.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h
index daa71e68b5..daa71e68b5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/basic_communication_on_awake_sdl.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h
index bdfdfffd66..bdfdfffd66 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/basic_communication_system_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
index de433568b1..de433568b1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/basic_communication_system_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h
index 45dc690c6c..45dc690c6c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/button_get_capabilities_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
index 4efa576079..4efa576079 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/button_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/close_popup_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h
index d7d4d18d97..d7d4d18d97 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/close_popup_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/close_popup_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h
index fdba83d3b6..fdba83d3b6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/close_popup_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/decrypt_certificate_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h
index 8688698883..8688698883 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/decrypt_certificate_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/decrypt_certificate_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h
index 45c2258489..45c2258489 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/decrypt_certificate_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/dial_number_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h
index 2b002c31dd..2b002c31dd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/dial_number_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h
index 1fbef15307..1fbef15307 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/dial_number_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_system_info_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h
index 0e0c271eef..0e0c271eef 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_system_info_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_system_info_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h
index 10e28a839e..10e28a839e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_system_info_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_urls.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h
index 1fcc1e626a..1fcc1e626a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_urls.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_urls_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h
index ba058a0ec9..ba058a0ec9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/get_urls_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h
index 4989208f7a..4989208f7a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/mixing_audio_supported_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
index a0cf89f558..a0cf89f558 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/mixing_audio_supported_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h
index 123c0ab0d6..123c0ab0d6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_alert_maneuver_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h
index d4a57e9e2f..d4a57e9e2f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_alert_maneuver_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h
index d6f4fd36e2..d6f4fd36e2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_start_stream_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h
index 485b510bf2..485b510bf2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_start_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_stop_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h
index 3a21e3e827..3a21e3e827 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_stop_stream_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h
index ce32d5b627..ce32d5b627 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_audio_stop_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h
index 33c5dfe2db..33c5dfe2db 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_get_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h
index 633d927715..633d927715 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_get_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h
index 08826743cc..08826743cc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h
index 72c001b863..72c001b863 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_send_location_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h
index 56a9594c0b..56a9594c0b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_send_location_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h
index ec3392642a..ec3392642a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_send_location_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_set_video_config_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h
index 0788a5595e..0788a5595e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_set_video_config_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_set_video_config_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h
index 3c53687a93..3c53687a93 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_set_video_config_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h
index 4cb8ddd7f7..4cb8ddd7f7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_show_constant_tbt_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h
index d9e7b1d234..d9e7b1d234 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_show_constant_tbt_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h
index 6fcb3f3267..6fcb3f3267 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_start_stream_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h
index 3e18767194..3e18767194 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_start_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_stop_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h
index d6952d0305..d6952d0305 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_stop_stream_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h
index b3107b5e61..b3107b5e61 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_stop_stream_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h
index 33a2077918..33a2077918 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_subscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
index eff2b281f2..eff2b281f2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_subscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h
index 607bb1ef26..607bb1ef26 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_unsubscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
index 936814f2fe..936814f2fe 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_unsubscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h
index 830e9358ec..830e9358ec 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_update_turn_list_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h
index 93c714b4f4..93c714b4f4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/navi_update_turn_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/notification_from_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_from_hmi.h
index ccf3e6d7f3..ccf3e6d7f3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/notification_from_hmi.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_from_hmi.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/notification_to_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_to_hmi.h
index dd2db8804a..dd2db8804a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/notification_to_hmi.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/notification_to_hmi.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
index 8d8d2d8eb0..8d8d2d8eb0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_allow_sdl_functionality_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
index 6772d49781..6772d49781 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_activated_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
index 687d492a01..687d492a01 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_deactivated_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
index 236e1b5071..236e1b5071 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_permission_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
index 21f96fc055..21f96fc055 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_permission_consent_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
index 58e92a977a..58e92a977a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_registered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
index f49dac071f..f49dac071f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_app_unregistered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
index 13fa41ac22..13fa41ac22 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_audio_data_streaming_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
index f294bce2c8..f294bce2c8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_button_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
index 8936ed8a0f..8936ed8a0f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_button_press_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
index d98ba3a90b..d98ba3a90b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_button_subscription_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
index 5345135583..5345135583 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_device_chosen_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
index 62a87f4599..62a87f4599 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_device_state_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
index 69d1707bf7..69d1707bf7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_driver_distraction_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
index cbe301179d..cbe301179d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_event_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
index 92ef97a4aa..92ef97a4aa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_exit_all_applications_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
index bb96a4f14e..bb96a4f14e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_exit_application_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h
index 3f1ac17fc4..3f1ac17fc4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_file_removed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_find_applications.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h
index 70347cc44f..70347cc44f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_find_applications.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
index acb1ff31ac..acb1ff31ac 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ignition_cycle_over_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
index 0150853546..0150853546 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_navi_tbt_client_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
index d304685008..d304685008 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_navi_way_point_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h
index 5569131c2b..5569131c2b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_policy_update.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_put_file_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h
index 809623fda0..809623fda0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_put_file_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ready_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h
index 7df1bf5ac0..7df1bf5ac0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ready_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_received_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h
index cec707b44f..cec707b44f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_received_policy_update.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_record_start_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
index fbb8a0522a..fbb8a0522a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_record_start_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
index 764ee6d180..764ee6d180 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_resume_audio_source_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h
index ef1d289ca7..ef1d289ca7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_sdl_close_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
index 5b0f4a1667..5b0f4a1667 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_sdl_consent_needed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
index 1d91faece6..1d91faece6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_sdl_persistence_complete_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h
index 2e523924db..2e523924db 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_start_device_discovery.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_status_update_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
index 05cb5a4931..05cb5a4931 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_status_update_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_context_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
index 9008a20cc9..9008a20cc9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_context_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_error_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
index 1e65b15c20..1e65b15c20 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_error_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
index 1c2bf0266f..1c2bf0266f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_info_changed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
index 8e4db24822..8e4db24822 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_system_request_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
index 245dc32386..245dc32386 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
index be84a93215..be84a93215 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_reset_timeout_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
index 234d8036eb..234d8036eb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_started_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
index 4e058fde64..4e058fde64 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_tts_stopped_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h
index 618bc13017..618bc13017 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_command_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
index 6e881dc94a..6e881dc94a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_keyboard_input_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
index cc8cd1eb0e..cc8cd1eb0e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
index f5dd173998..f5dd173998 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_reset_timeout_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
index 9e9384fffe..9e9384fffe 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_ui_touch_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_update_device_list.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h
index ee53445606..ee53445606 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_update_device_list.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
index 9c5a8cd955..9c5a8cd955 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_acc_pedal_position_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
index c4f92269bb..c4f92269bb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_belt_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
index 9d9854c50b..9d9854c50b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_body_information_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
index c31ee1f209..c31ee1f209 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_device_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
index 108f02b5a4..108f02b5a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_driver_braking_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
index bbd13963aa..bbd13963aa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_engine_torque_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
index b996febacf..b996febacf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_external_temperature_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
index 9c30b6c32c..9c30b6c32c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_fuel_level_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
index 53b6ea209f..53b6ea209f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_fuel_level_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h
index 579344b538..579344b538 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_gps_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
index 5fd3be85a4..5fd3be85a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_head_lamp_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
index ee82b1397f..ee82b1397f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_instant_fuel_consumption_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h
index 364e42081c..364e42081c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_my_key_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
index 7d93530f04..7d93530f04 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_odometer_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h
index c09220d2a6..c09220d2a6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_prndl_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h
index d05e1221df..d05e1221df 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_rpm_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h
index b1908cde28..b1908cde28 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_speed_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
index 28f78ac4d5..28f78ac4d5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_steering_wheel_angle_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
index eef4f0e4a4..eef4f0e4a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_tire_pressure_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
index 2422c47813..2422c47813 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h
index 4ea04fbb0d..4ea04fbb0d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_vin_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
index 2b57ef1dd3..2b57ef1dd3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vi_wiper_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
index 81493a0a33..81493a0a33 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_video_data_streaming_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h
index fa85ba8468..fa85ba8468 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_command_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
index d0f86e5f83..d0f86e5f83 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h
index f142fcc25c..f142fcc25c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_started_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h
index d1dbcc91cd..d1dbcc91cd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/on_vr_stopped_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h
index 58654d81d9..58654d81d9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_get_capabilities_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h
index 006f38cbb5..006f38cbb5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h
index 40e05c2b1f..40e05c2b1f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h
index 547b89a30d..547b89a30d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/rc_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/request_from_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/request_from_hmi.h
index 628d3257d9..628d3257d9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/request_from_hmi.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/request_from_hmi.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/request_to_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/request_to_hmi.h
index b30044fd26..b30044fd26 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/request_to_hmi.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/request_to_hmi.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/response_from_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_from_hmi.h
index 05fd23adf0..05fd23adf0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/response_from_hmi.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_from_hmi.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/response_to_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_to_hmi.h
index 1dd0657815..1dd0657815 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/response_to_hmi.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/response_to_hmi.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h
index 9ce15a0970..9ce15a0970 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_activate_app_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h
index 50bc319569..50bc319569 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_activate_app_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h
index 69e4ec227c..69e4ec227c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_list_of_permissions_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
index b82f16e113..b82f16e113 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_list_of_permissions_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h
index 4f5ce887bd..4f5ce887bd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_status_update_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h
index f8aeb6135f..f8aeb6135f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_status_update_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h
index 9837e6af09..9837e6af09 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_user_friendly_message_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
index bb2fba8433..bb2fba8433 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_get_user_friendly_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h
index 99b627431c..99b627431c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_policy_update.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h
index 12850f4b8a..12850f4b8a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/sdl_policy_update_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h
index 0f36e82b44..0f36e82b44 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_change_registration_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
index ca9c114156..ca9c114156 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h
index bea41b7371..bea41b7371 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_capabilities_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h
index a70ee2b33b..a70ee2b33b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h
index 627cf3da06..627cf3da06 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_language_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h
index f44492a6ed..f44492a6ed 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_language_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h
index 9500d54eea..9500d54eea 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_supported_languages_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
index 1bc569ebb8..1bc569ebb8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h
index 340a00d294..340a00d294 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h
index 833d3d0a82..833d3d0a82 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h
index b18e372b3e..b18e372b3e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_set_global_properties_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
index aa7c85eece..aa7c85eece 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_speak_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h
index 87384beedf..87384beedf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_speak_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h
index 9f15afb33b..9f15afb33b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_speak_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h
index c51daee84d..c51daee84d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_stop_speaking_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h
index a23889a733..a23889a733 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/tts_stop_speaking_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h
index 294fd11912..294fd11912 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_command_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h
index ed48e13322..ed48e13322 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h
index 96fa0557ae..96fa0557ae 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_submenu_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h
index 62abf10b60..62abf10b60 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_add_submenu_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h
index 123246e596..123246e596 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_alert_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h
index db48699a23..db48699a23 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_alert_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h
index 744ed82cad..744ed82cad 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_change_registration_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h
index 57814b9acf..57814b9acf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h
index 21a4c6dd42..21a4c6dd42 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_command_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h
index c9baba728f..c9baba728f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h
index d238e39a10..d238e39a10 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_submenu_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h
index 36d7bee528..36d7bee528 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_delete_submenu_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h
index d8bd10a9ca..d8bd10a9ca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_end_audio_pass_thru_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h
index c2a373d8c0..c2a373d8c0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_end_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h
index cffba5ca42..cffba5ca42 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_capabilities_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h
index 525dd7ad9d..525dd7ad9d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h
index 4bf8e11d7e..4bf8e11d7e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_language_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h
index 29bbba85ff..29bbba85ff 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_language_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h
index 94c197b7bc..94c197b7bc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_supported_languages_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
index 8962b77833..8962b77833 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h
index 49942d81a7..49942d81a7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h
index 93b2d9a569..93b2d9a569 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h
index 4cec5a5600..4cec5a5600 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
index 9fb502233f..9fb502233f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h
index 8232043395..8232043395 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_interaction_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
index 4db471bbae..4db471bbae 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h
index 8ba828a25e..8ba828a25e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_scrollable_message_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h
index 4ae432d658..4ae432d658 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_scrollable_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_send_haptic_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h
index b697176a36..b697176a36 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_send_haptic_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h
index 96abe4665d..96abe4665d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_send_haptic_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h
index b1025035d6..b1025035d6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_app_icon_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h
index 6ad80bc9fe..6ad80bc9fe 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_app_icon_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h
index 573e9351b1..573e9351b1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_display_layout_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h
index 595ee93c30..595ee93c30 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_display_layout_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h
index 83bf11e2e1..83bf11e2e1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_global_properties_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
index 91de5e6df7..91de5e6df7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h
index b7d759916e..b7d759916e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_icon_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
index a9739bc802..a9739bc802 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_icon_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_icon_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h
index 92565e6f02..92565e6f02 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_media_clock_timer_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
index 0d71ff00f0..0d71ff00f0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_set_media_clock_timer_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h
index 80348de63b..80348de63b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_show_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h
index d696d2b9f8..d696d2b9f8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_show_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h
index 583f52084d..583f52084d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_slider_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h
index cabb54f6cb..cabb54f6cb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/ui_slider_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_app_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h
index 61be04d04f..61be04d04f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_app_list_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_app_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h
index 5ff8948393..5ff8948393 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_app_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_device_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h
index f304f404a1..f304f404a1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_device_list_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_device_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h
index 9320de1387..9320de1387 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_device_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_sdl_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h
index d8be10da2e..d8be10da2e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_sdl_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_sdl_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h
index bc0375d5fa..bc0375d5fa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/update_sdl_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h
index 099f27b734..099f27b734 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_diagnostic_message_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h
index f0ae76ccb7..f0ae76ccb7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_diagnostic_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h
index 3b7e502a57..3b7e502a57 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_dtcs_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h
index 7b7dab567b..7b7dab567b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_dtcs_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h
index 006f18e864..006f18e864 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h
index 6e90656600..6e90656600 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_request_template.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h
index ef19072bb0..ef19072bb0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h
index 557c33df13..557c33df13 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_data_response_template.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h
index cd70c3349b..cd70c3349b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_type_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h
index 0ef35dd7fc..0ef35dd7fc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_get_vehicle_type_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h
index 07ab9df605..07ab9df605 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h
index a7866a1e73..a7866a1e73 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_read_did_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_request.h
index cdbdb45a8b..cdbdb45a8b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_read_did_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_read_did_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h
index acb8760c5b..acb8760c5b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_read_did_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_read_did_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h
index 58d4984f8d..58d4984f8d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h
index 76245af0f9..76245af0f9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
index 8f038bf941..8f038bf941 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h
index e8272971e2..e8272971e2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_subscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h
index b99eee47e7..b99eee47e7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
index 2014896f11..2014896f11 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index 3f930b5a5b..3f930b5a5b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
index 0817ca90af..0817ca90af 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h
index 1ef4125c89..1ef4125c89 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_add_command_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h
index 1b419ed6ec..1b419ed6ec 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_add_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h
index 642319e8d6..642319e8d6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_change_registration_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
index 8dc5e96729..8dc5e96729 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h
index bc5c24a350..bc5c24a350 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_delete_command_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h
index 526c296321..526c296321 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_delete_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h
index 8dcc240e9b..8dcc240e9b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_capabilities_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h
index b6c8e081f5..b6c8e081f5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_capabilities_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h
index 05373784f3..05373784f3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_language_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h
index fad2f219df..fad2f219df 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_language_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h
index 6ed56ebd32..6ed56ebd32 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_supported_languages_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
index c4e742ecd0..c4e742ecd0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_get_supported_languages_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h
index 55a2101e1a..55a2101e1a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h
index 474b3373a3..474b3373a3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h
index 1f54d29beb..1f54d29beb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_perform_interaction_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
index 7c445416ce..7c445416ce 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/hmi/vr_perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h
index 2aed94c448..2aed94c448 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_command_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h
index b385b3bc5c..b385b3bc5c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h
index 36b0b38464..36b0b38464 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_sub_menu_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_sub_menu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h
index b09254369f..b09254369f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/add_sub_menu_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_maneuver_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h
index 17ad75b7a6..17ad75b7a6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_maneuver_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h
index 2d45435a8b..2d45435a8b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_maneuver_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h
index 01b9782662..01b9782662 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h
index e03dad7564..e03dad7564 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/alert_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
index 2cd8e386e0..2cd8e386e0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/change_registration_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h
index 995764a15f..995764a15f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/change_registration_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h
index c00d310e7d..c00d310e7d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/create_interaction_choice_set_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/create_interaction_choice_set_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h
index bb2083e0b5..bb2083e0b5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/create_interaction_choice_set_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h
index afb2e226f6..afb2e226f6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_command_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h
index a6a25f9cd5..a6a25f9cd5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_command_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h
index beb8ae73cd..beb8ae73cd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_file_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_file_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h
index 08f734ec13..08f734ec13 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_file_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h
index ead60be1af..ead60be1af 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_interaction_choice_set_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_interaction_choice_set_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h
index 7a926399ee..7a926399ee 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_interaction_choice_set_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h
index 37863598ac..37863598ac 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_sub_menu_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_sub_menu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h
index 4319d88ea0..4319d88ea0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/delete_sub_menu_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h
index d55bce6613..d55bce6613 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/diagnostic_message_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h
index 7ac810eabf..7ac810eabf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/diagnostic_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/dial_number_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h
index c8ae2b2cd9..c8ae2b2cd9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/dial_number_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h
index 688c9a7207..688c9a7207 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/dial_number_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h
index 04f4fa53ab..04f4fa53ab 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/end_audio_pass_thru_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h
index ca756cf5d7..ca756cf5d7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/end_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/generic_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h
index 6cfc6e5891..6cfc6e5891 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/generic_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_dtcs_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_request.h
index b70c04bcca..b70c04bcca 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_dtcs_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_dtcs_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_response.h
index 10d0d0f86d..10d0d0f86d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_dtcs_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_dtcs_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_system_capability_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h
index ba55a6b4cd..ba55a6b4cd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_system_capability_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_system_capability_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h
index 9fa6f9b5bb..9fa6f9b5bb 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_system_capability_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h
index 030a3afedc..030a3afedc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h
index 11691d1f84..11691d1f84 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h
index bf23121177..bf23121177 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h
index cb4f840763..cb4f840763 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/get_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/list_files_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h
index f1e9204eea..f1e9204eea 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/list_files_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/list_files_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h
index 81165c9bc4..81165c9bc4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/list_files_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_app_interface_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h
index 758fdaf760..758fdaf760 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_app_interface_unregistered_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_audio_pass_thru_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h
index 68e1d4f548..68e1d4f548 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_audio_pass_thru_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h
index d6a15caf4b..d6a15caf4b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_button_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h
index 9acd31f8da..9acd31f8da 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_button_press_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h
index e2faf9b05c..e2faf9b05c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_command_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h
index 1f9ee4ed8c..1f9ee4ed8c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_driver_distraction_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_hash_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h
index 07544c573f..07544c573f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_hash_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_hmi_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h
index 58659cbc4b..58659cbc4b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_hmi_status_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_hmi_status_notification_from_mobile.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h
index b2802e9fe9..b2802e9fe9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_hmi_status_notification_from_mobile.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h
index 911ca70cdf..911ca70cdf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_keyboard_input_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h
index bbd7679a6b..bbd7679a6b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_language_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_permissions_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h
index 9fd2832218..9fd2832218 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_permissions_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h
index d42e42649a..d42e42649a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_system_request_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h
index 42a81043f9..42a81043f9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_tbt_client_state_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h
index abbf6787db..abbf6787db 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_touch_event_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h
index efe2ce8c55..efe2ce8c55 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h
index e33de74fd8..e33de74fd8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/on_way_point_change_notification.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h
index 6e0e634459..6e0e634459 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_audio_pass_thru_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h
index 29005d7b01..29005d7b01 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_audio_pass_thru_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h
index c482e2d548..c482e2d548 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_interaction_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h
index 209b469d0d..209b469d0d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/perform_interaction_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/put_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h
index ad13f0ee52..ad13f0ee52 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/put_file_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/put_file_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h
index aa407c8d83..aa407c8d83 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/put_file_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/read_did_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_request.h
index c88f16dab0..c88f16dab0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/read_did_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/read_did_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_response.h
index 2e493fa0ec..2e493fa0ec 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/read_did_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/read_did_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/register_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
index 5713e2e814..5713e2e814 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/register_app_interface_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h
index b125cc7c55..b125cc7c55 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/register_app_interface_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/reset_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h
index c16a014c9f..c16a014c9f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/reset_global_properties_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/reset_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h
index 39e28486d4..39e28486d4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/reset_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h
index b3058c9a26..b3058c9a26 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/scrollable_message_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h
index aa0ac01e9d..aa0ac01e9d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/scrollable_message_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_haptic_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h
index 13ed06cce6..13ed06cce6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_haptic_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h
index 2a60746c61..2a60746c61 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_haptic_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_location_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h
index 570e70d007..570e70d007 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_location_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h
index 0be0be8ca3..0be0be8ca3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/send_location_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
index 4735d89fb0..4735d89fb0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_app_icon_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h
index 742332742b..742332742b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_app_icon_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h
index 06e8d70f79..06e8d70f79 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_display_layout_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h
index a2040307b0..a2040307b0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_display_layout_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h
index da28d33de8..da28d33de8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_global_properties_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h
index c5beda084d..c5beda084d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_global_properties_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h
index 96d4ac6f1e..96d4ac6f1e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_icon_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h
index 83be0d4a4b..83be0d4a4b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_icon_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_icon_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_media_clock_timer_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h
index 283dd41622..283dd41622 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_media_clock_timer_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h
index 3f41ae2dab..3f41ae2dab 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/set_media_clock_timer_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h
index f015d740df..f015d740df 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_constant_tbt_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h
index 73aad5de89..73aad5de89 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_constant_tbt_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h
index a10997bacd..a10997bacd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h
index 0a54fb9cde..0a54fb9cde 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/show_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h
index 2446c9ff20..2446c9ff20 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/slider_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h
index bc0efaadd0..bc0efaadd0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/slider_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/speak_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h
index dc22652b27..dc22652b27 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/speak_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h
index 2808526603..2808526603 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/speak_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h
index cf65e2a6a4..cf65e2a6a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_button_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_button_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h
index 38e0dd2dc6..38e0dd2dc6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_button_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
index f556f81764..f556f81764 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h
index 7e3cffc387..7e3cffc387 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h
index f392dd6dd1..f392dd6dd1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h
index cfdc0eede7..cfdc0eede7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/subscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h
index 1d163b6cd8..1d163b6cd8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/system_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h
index efee210b7b..efee210b7b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/system_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unregister_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h
index acc7374e18..acc7374e18 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unregister_app_interface_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unregister_app_interface_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h
index 1a459e109c..1a459e109c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unregister_app_interface_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h
index b0206c4407..b0206c4407 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_button_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_button_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h
index 06dbe84578..06dbe84578 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_button_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
index 1c7d80797d..1c7d80797d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h
index a34a36688c..a34a36688c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h
index 0b5462b7b5..0b5462b7b5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_way_points_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h
index 70211330a9..70211330a9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/unsubscribe_way_points_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h
index e15e81caf5..e15e81caf5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/update_turn_list_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h
index 481ad9f219..481ad9f219 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/commands/mobile/update_turn_list_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
index 3e2868710d..52b7fab035 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
@@ -3,7 +3,7 @@
 #include "application_manager/plugin_manager/rpc_plugin.h"
 namespace sdl_rpc_plugin {
 namespace plugins = application_manager::plugin_manager;
-class SDLRPCPlugin : plugins::RPCPlugin {
+class SDLRPCPlugin : public plugins::RPCPlugin {
   // RPCPlugin interface
  public:
   bool Init() OVERRIDE;
@@ -22,4 +22,6 @@ class SDLRPCPlugin : plugins::RPCPlugin {
 };
 }
 
+extern "C" application_manager::plugin_manager::RPCPlugin* Create();
+
 #endif  // SDL_RPC_PLUGIN_H
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
new file mode 100644
index 0000000000..cb08d53256
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
@@ -0,0 +1,31 @@
+#include "sdl_rpc_plugin/sdl_rpc_plugin.h"
+
+namespace sdl_rpc_plugin {
+namespace plugins = application_manager::plugin_manager;
+bool SDLRPCPlugin::Init() {
+  return true;
+}
+
+bool SDLRPCPlugin::IsAbleToProcess(
+    const int32_t function_id,
+    const application_manager::commands::Command::CommandOrigin
+        message_source) {
+  return true;
+}
+
+std::string SDLRPCPlugin::PluginName() {
+  return "SDL RPC Plugin";
+}
+
+void SDLRPCPlugin::OnPolicyEvent(
+    application_manager::plugin_manager::PolicyEvent event) {}
+
+void SDLRPCPlugin::OnApplicationEvent(
+    application_manager::plugin_manager::ApplicationEvent event,
+    application_manager::ApplicationSharedPtr application) {}
+
+}  // namespace sdl_rpc_plugin
+
+extern "C" application_manager::plugin_manager::RPCPlugin* Create() {
+  return new sdl_rpc_plugin::SDLRPCPlugin();
+}