Re-organized sub-directory by category

Since all the sub-directories were placed in the
first level, created sub-directories, "hal", "module",
and "service" for classification and relocated each component.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: Ifdf743ac0d1893bd8e445455cf0d2c199a011d5c

diff --git a/boot_hal/LICENSE b/hal/boot_hal/LICENSE
similarity index 100%
rename from boot_hal/LICENSE
rename to hal/boot_hal/LICENSE

diff --git a/boot_hal/Makefile b/hal/boot_hal/Makefile
similarity index 100%
rename from boot_hal/Makefile
rename to hal/boot_hal/Makefile

diff --git a/boot_hal/hal_api/boot_hal.h b/hal/boot_hal/hal_api/boot_hal.h
similarity index 100%
rename from boot_hal/hal_api/boot_hal.h
rename to hal/boot_hal/hal_api/boot_hal.h

diff --git a/boot_hal/inc/boot_hal_boothallog.h b/hal/boot_hal/inc/boot_hal_boothallog.h
similarity index 100%
rename from boot_hal/inc/boot_hal_boothallog.h
rename to hal/boot_hal/inc/boot_hal_boothallog.h

diff --git a/boot_hal/src/boot_hal.cpp b/hal/boot_hal/src/boot_hal.cpp
similarity index 100%
rename from boot_hal/src/boot_hal.cpp
rename to hal/boot_hal/src/boot_hal.cpp

diff --git a/can_hal/LICENSE b/hal/can_hal/LICENSE
similarity index 100%
rename from can_hal/LICENSE
rename to hal/can_hal/LICENSE

diff --git a/can_hal/Makefile b/hal/can_hal/Makefile
similarity index 100%
rename from can_hal/Makefile
rename to hal/can_hal/Makefile

diff --git a/can_hal/README.md b/hal/can_hal/README.md
similarity index 100%
rename from can_hal/README.md
rename to hal/can_hal/README.md

diff --git a/can_hal/can_hal.mk b/hal/can_hal/can_hal.mk
similarity index 100%
rename from can_hal/can_hal.mk
rename to hal/can_hal/can_hal.mk

diff --git a/can_hal/hal_api/can_hal.h b/hal/can_hal/hal_api/can_hal.h
similarity index 100%
rename from can_hal/hal_api/can_hal.h
rename to hal/can_hal/hal_api/can_hal.h

diff --git a/can_hal/src/Makefile b/hal/can_hal/src/Makefile
similarity index 100%
rename from can_hal/src/Makefile
rename to hal/can_hal/src/Makefile

diff --git a/can_hal/src/can_hal_api.cpp b/hal/can_hal/src/can_hal_api.cpp
similarity index 100%
rename from can_hal/src/can_hal_api.cpp
rename to hal/can_hal/src/can_hal_api.cpp

diff --git a/can_hal/src/can_hal_core.cpp b/hal/can_hal/src/can_hal_core.cpp
similarity index 100%
rename from can_hal/src/can_hal_core.cpp
rename to hal/can_hal/src/can_hal_core.cpp

diff --git a/can_hal/src/can_hal_stm.cpp b/hal/can_hal/src/can_hal_stm.cpp
similarity index 100%
rename from can_hal/src/can_hal_stm.cpp
rename to hal/can_hal/src/can_hal_stm.cpp

diff --git a/can_hal/src/driver_can__CWORD31_.c b/hal/can_hal/src/driver_can__CWORD31_.c
similarity index 100%
rename from can_hal/src/driver_can__CWORD31_.c
rename to hal/can_hal/src/driver_can__CWORD31_.c

diff --git a/can_hal/src/inc/can_hal_core.h b/hal/can_hal/src/inc/can_hal_core.h
similarity index 100%
rename from can_hal/src/inc/can_hal_core.h
rename to hal/can_hal/src/inc/can_hal_core.h

diff --git a/can_hal/src/inc/can_hal_frameworkunifiedlog.h b/hal/can_hal/src/inc/can_hal_frameworkunifiedlog.h
similarity index 100%
rename from can_hal/src/inc/can_hal_frameworkunifiedlog.h
rename to hal/can_hal/src/inc/can_hal_frameworkunifiedlog.h

diff --git a/can_hal/src/inc/can_hal_internal.h b/hal/can_hal/src/inc/can_hal_internal.h
similarity index 100%
rename from can_hal/src/inc/can_hal_internal.h
rename to hal/can_hal/src/inc/can_hal_internal.h

diff --git a/can_hal/src/inc/can_hal_stm.h b/hal/can_hal/src/inc/can_hal_stm.h
similarity index 100%
rename from can_hal/src/inc/can_hal_stm.h
rename to hal/can_hal/src/inc/can_hal_stm.h

diff --git a/can_hal/src/inc/can_mng_api.h b/hal/can_hal/src/inc/can_mng_api.h
similarity index 100%
rename from can_hal/src/inc/can_mng_api.h
rename to hal/can_hal/src/inc/can_mng_api.h

diff --git a/clock_hal/LICENSE b/hal/clock_hal/LICENSE
similarity index 100%
rename from clock_hal/LICENSE
rename to hal/clock_hal/LICENSE

diff --git a/clock_hal/Makefile b/hal/clock_hal/Makefile
similarity index 100%
rename from clock_hal/Makefile
rename to hal/clock_hal/Makefile

diff --git a/clock_hal/README.md b/hal/clock_hal/README.md
similarity index 100%
rename from clock_hal/README.md
rename to hal/clock_hal/README.md

diff --git a/clock_hal/hal_api/clock_hal.h b/hal/clock_hal/hal_api/clock_hal.h
similarity index 100%
rename from clock_hal/hal_api/clock_hal.h
rename to hal/clock_hal/hal_api/clock_hal.h

diff --git a/clock_hal/inc/clock_hal_clockhallog.h b/hal/clock_hal/inc/clock_hal_clockhallog.h
similarity index 100%
rename from clock_hal/inc/clock_hal_clockhallog.h
rename to hal/clock_hal/inc/clock_hal_clockhallog.h

diff --git a/clock_hal/src/clock_hal.cpp b/hal/clock_hal/src/clock_hal.cpp
similarity index 100%
rename from clock_hal/src/clock_hal.cpp
rename to hal/clock_hal/src/clock_hal.cpp

diff --git a/deck_hal/LICENSE b/hal/deck_hal/LICENSE
similarity index 100%
rename from deck_hal/LICENSE
rename to hal/deck_hal/LICENSE

diff --git a/deck_hal/Makefile b/hal/deck_hal/Makefile
similarity index 100%
rename from deck_hal/Makefile
rename to hal/deck_hal/Makefile

diff --git a/deck_hal/hal_api/deck_hal.h b/hal/deck_hal/hal_api/deck_hal.h
similarity index 100%
rename from deck_hal/hal_api/deck_hal.h
rename to hal/deck_hal/hal_api/deck_hal.h

diff --git a/deck_hal/inc/deck_hal_deckhallog.h b/hal/deck_hal/inc/deck_hal_deckhallog.h
similarity index 100%
rename from deck_hal/inc/deck_hal_deckhallog.h
rename to hal/deck_hal/inc/deck_hal_deckhallog.h

diff --git a/deck_hal/src/deck_hal.cpp b/hal/deck_hal/src/deck_hal.cpp
similarity index 100%
rename from deck_hal/src/deck_hal.cpp
rename to hal/deck_hal/src/deck_hal.cpp

diff --git a/input_hal/LICENSE b/hal/input_hal/LICENSE
similarity index 100%
rename from input_hal/LICENSE
rename to hal/input_hal/LICENSE

diff --git a/input_hal/Makefile b/hal/input_hal/Makefile
similarity index 100%
rename from input_hal/Makefile
rename to hal/input_hal/Makefile

diff --git a/input_hal/README.md b/hal/input_hal/README.md
similarity index 100%
rename from input_hal/README.md
rename to hal/input_hal/README.md

diff --git a/input_hal/hal_api/input_hal.h b/hal/input_hal/hal_api/input_hal.h
similarity index 100%
rename from input_hal/hal_api/input_hal.h
rename to hal/input_hal/hal_api/input_hal.h

diff --git a/input_hal/hal_api/peripheral_service/aglinput.h b/hal/input_hal/hal_api/peripheral_service/aglinput.h
similarity index 100%
rename from input_hal/hal_api/peripheral_service/aglinput.h
rename to hal/input_hal/hal_api/peripheral_service/aglinput.h

diff --git a/input_hal/hal_api/peripheral_service/extinput.h b/hal/input_hal/hal_api/peripheral_service/extinput.h
similarity index 100%
rename from input_hal/hal_api/peripheral_service/extinput.h
rename to hal/input_hal/hal_api/peripheral_service/extinput.h

diff --git a/input_hal/inc/input_drm.h b/hal/input_hal/inc/input_drm.h
similarity index 100%
rename from input_hal/inc/input_drm.h
rename to hal/input_hal/inc/input_drm.h

diff --git a/input_hal/inc/input_hal_debug.h b/hal/input_hal/inc/input_hal_debug.h
similarity index 100%
rename from input_hal/inc/input_hal_debug.h
rename to hal/input_hal/inc/input_hal_debug.h

diff --git a/input_hal/inc/input_hal_frameworkunifiedlog.h b/hal/input_hal/inc/input_hal_frameworkunifiedlog.h
similarity index 100%
rename from input_hal/inc/input_hal_frameworkunifiedlog.h
rename to hal/input_hal/inc/input_hal_frameworkunifiedlog.h

diff --git a/input_hal/inc/input_hal_internal.h b/hal/input_hal/inc/input_hal_internal.h
similarity index 100%
rename from input_hal/inc/input_hal_internal.h
rename to hal/input_hal/inc/input_hal_internal.h

diff --git a/input_hal/inc/input_touch_ilitek.h b/hal/input_hal/inc/input_touch_ilitek.h
similarity index 100%
rename from input_hal/inc/input_touch_ilitek.h
rename to hal/input_hal/inc/input_touch_ilitek.h

diff --git a/input_hal/inc/input_udev_monitor.h b/hal/input_hal/inc/input_udev_monitor.h
similarity index 100%
rename from input_hal/inc/input_udev_monitor.h
rename to hal/input_hal/inc/input_udev_monitor.h

diff --git a/input_hal/inc/input_util.h b/hal/input_hal/inc/input_util.h
similarity index 100%
rename from input_hal/inc/input_util.h
rename to hal/input_hal/inc/input_util.h

diff --git a/input_hal/src/input_drm.cpp b/hal/input_hal/src/input_drm.cpp
similarity index 100%
rename from input_hal/src/input_drm.cpp
rename to hal/input_hal/src/input_drm.cpp

diff --git a/input_hal/src/input_hal.cpp b/hal/input_hal/src/input_hal.cpp
similarity index 100%
rename from input_hal/src/input_hal.cpp
rename to hal/input_hal/src/input_hal.cpp

diff --git a/input_hal/src/input_touch_ilitek.cpp b/hal/input_hal/src/input_touch_ilitek.cpp
similarity index 100%
rename from input_hal/src/input_touch_ilitek.cpp
rename to hal/input_hal/src/input_touch_ilitek.cpp

diff --git a/input_hal/src/input_udev_monitor.cpp b/hal/input_hal/src/input_udev_monitor.cpp
similarity index 100%
rename from input_hal/src/input_udev_monitor.cpp
rename to hal/input_hal/src/input_udev_monitor.cpp

diff --git a/input_hal/src/input_util.cpp b/hal/input_hal/src/input_util.cpp
similarity index 100%
rename from input_hal/src/input_util.cpp
rename to hal/input_hal/src/input_util.cpp

diff --git a/nsframework/backup_manager/LICENSE b/hal/nv_hal/LICENSE
similarity index 100%
rename from nsframework/backup_manager/LICENSE
rename to hal/nv_hal/LICENSE

diff --git a/nv_hal/Makefile b/hal/nv_hal/Makefile
similarity index 100%
rename from nv_hal/Makefile
rename to hal/nv_hal/Makefile

diff --git a/nv_hal/hal_api/nv_hal.h b/hal/nv_hal/hal_api/nv_hal.h
similarity index 100%
rename from nv_hal/hal_api/nv_hal.h
rename to hal/nv_hal/hal_api/nv_hal.h

diff --git a/nv_hal/inc/nv_hal_nvhallog.h b/hal/nv_hal/inc/nv_hal_nvhallog.h
similarity index 100%
rename from nv_hal/inc/nv_hal_nvhallog.h
rename to hal/nv_hal/inc/nv_hal_nvhallog.h

diff --git a/nv_hal/src/nv_hal.cpp b/hal/nv_hal/src/nv_hal.cpp
similarity index 100%
rename from nv_hal/src/nv_hal.cpp
rename to hal/nv_hal/src/nv_hal.cpp

diff --git a/nsframework/common_library/LICENSE b/hal/positioning_hal/LICENSE
similarity index 100%
rename from nsframework/common_library/LICENSE
rename to hal/positioning_hal/LICENSE

diff --git a/positioning_hal/Makefile b/hal/positioning_hal/Makefile
similarity index 100%
rename from positioning_hal/Makefile
rename to hal/positioning_hal/Makefile

diff --git a/positioning_hal/README.md b/hal/positioning_hal/README.md
similarity index 100%
rename from positioning_hal/README.md
rename to hal/positioning_hal/README.md

diff --git a/positioning_hal/hal_api/gps_hal.h b/hal/positioning_hal/hal_api/gps_hal.h
similarity index 100%
rename from positioning_hal/hal_api/gps_hal.h
rename to hal/positioning_hal/hal_api/gps_hal.h

diff --git a/positioning_hal/hal_api/positioning_hal.h b/hal/positioning_hal/hal_api/positioning_hal.h
similarity index 100%
rename from positioning_hal/hal_api/positioning_hal.h
rename to hal/positioning_hal/hal_api/positioning_hal.h

diff --git a/positioning_hal/inc/Common/LineSensDrv_Api.h b/hal/positioning_hal/inc/Common/LineSensDrv_Api.h
similarity index 100%
rename from positioning_hal/inc/Common/LineSensDrv_Api.h
rename to hal/positioning_hal/inc/Common/LineSensDrv_Api.h

diff --git a/positioning_hal/inc/Common/MDev_Gps_API.h b/hal/positioning_hal/inc/Common/MDev_Gps_API.h
similarity index 100%
rename from positioning_hal/inc/Common/MDev_Gps_API.h
rename to hal/positioning_hal/inc/Common/MDev_Gps_API.h

diff --git a/positioning_hal/inc/Common/positioning_common.h b/hal/positioning_hal/inc/Common/positioning_common.h
similarity index 100%
rename from positioning_hal/inc/Common/positioning_common.h
rename to hal/positioning_hal/inc/Common/positioning_common.h

diff --git a/positioning_hal/inc/Common/positioning_def.h b/hal/positioning_hal/inc/Common/positioning_def.h
similarity index 100%
rename from positioning_hal/inc/Common/positioning_def.h
rename to hal/positioning_hal/inc/Common/positioning_def.h

diff --git a/positioning_hal/inc/Common/positioning_log.h b/hal/positioning_hal/inc/Common/positioning_log.h
similarity index 100%
rename from positioning_hal/inc/Common/positioning_log.h
rename to hal/positioning_hal/inc/Common/positioning_log.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_GpsRecv.h b/hal/positioning_hal/inc/GpsCommon/MDev_GpsRecv.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_GpsRecv.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_GpsRecv.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_GpsRollOver.h b/hal/positioning_hal/inc/GpsCommon/MDev_GpsRollOver.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_GpsRollOver.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_GpsRollOver.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_Gps_Common.h b/hal/positioning_hal/inc/GpsCommon/MDev_Gps_Common.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_Gps_Common.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_Gps_Common.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_Gps_Main.h b/hal/positioning_hal/inc/GpsCommon/MDev_Gps_Main.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_Gps_Main.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_Gps_Main.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_Gps_Mtrx.h b/hal/positioning_hal/inc/GpsCommon/MDev_Gps_Mtrx.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_Gps_Mtrx.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_Gps_Mtrx.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_Gps_Nmea.h b/hal/positioning_hal/inc/GpsCommon/MDev_Gps_Nmea.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_Gps_Nmea.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_Gps_Nmea.h

diff --git a/positioning_hal/inc/GpsCommon/MDev_Gps_TimerCtrl.h b/hal/positioning_hal/inc/GpsCommon/MDev_Gps_TimerCtrl.h
similarity index 100%
rename from positioning_hal/inc/GpsCommon/MDev_Gps_TimerCtrl.h
rename to hal/positioning_hal/inc/GpsCommon/MDev_Gps_TimerCtrl.h

diff --git a/positioning_hal/inc/LineSensDrv/LineSensDrv_Sensor.h b/hal/positioning_hal/inc/LineSensDrv/LineSensDrv_Sensor.h
similarity index 100%
rename from positioning_hal/inc/LineSensDrv/LineSensDrv_Sensor.h
rename to hal/positioning_hal/inc/LineSensDrv/LineSensDrv_Sensor.h

diff --git a/positioning_hal/inc/LineSensDrv/LineSensDrv_Thread.h b/hal/positioning_hal/inc/LineSensDrv/LineSensDrv_Thread.h
similarity index 100%
rename from positioning_hal/inc/LineSensDrv/LineSensDrv_Thread.h
rename to hal/positioning_hal/inc/LineSensDrv/LineSensDrv_Thread.h

diff --git a/positioning_hal/src/Common/positioning_common.cpp b/hal/positioning_hal/src/Common/positioning_common.cpp
similarity index 100%
rename from positioning_hal/src/Common/positioning_common.cpp
rename to hal/positioning_hal/src/Common/positioning_common.cpp

diff --git a/positioning_hal/src/Common/positioning_hal.cpp b/hal/positioning_hal/src/Common/positioning_hal.cpp
similarity index 100%
rename from positioning_hal/src/Common/positioning_hal.cpp
rename to hal/positioning_hal/src/Common/positioning_hal.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_GpsRecv.cpp b/hal/positioning_hal/src/GpsCommon/MDev_GpsRecv.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_GpsRecv.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_GpsRecv.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_GpsRollOver.cpp b/hal/positioning_hal/src/GpsCommon/MDev_GpsRollOver.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_GpsRollOver.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_GpsRollOver.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_Gps_API.cpp b/hal/positioning_hal/src/GpsCommon/MDev_Gps_API.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_Gps_API.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_Gps_API.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_Gps_Common.cpp b/hal/positioning_hal/src/GpsCommon/MDev_Gps_Common.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_Gps_Common.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_Gps_Common.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_Gps_Main.cpp b/hal/positioning_hal/src/GpsCommon/MDev_Gps_Main.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_Gps_Main.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_Gps_Main.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_Gps_Mtrx.cpp b/hal/positioning_hal/src/GpsCommon/MDev_Gps_Mtrx.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_Gps_Mtrx.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_Gps_Mtrx.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_Gps_Nmea.cpp b/hal/positioning_hal/src/GpsCommon/MDev_Gps_Nmea.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_Gps_Nmea.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_Gps_Nmea.cpp

diff --git a/positioning_hal/src/GpsCommon/MDev_Gps_TimerCtrl.cpp b/hal/positioning_hal/src/GpsCommon/MDev_Gps_TimerCtrl.cpp
similarity index 100%
rename from positioning_hal/src/GpsCommon/MDev_Gps_TimerCtrl.cpp
rename to hal/positioning_hal/src/GpsCommon/MDev_Gps_TimerCtrl.cpp

diff --git a/positioning_hal/src/LineSensDrv/LineSensDrv_Api.cpp b/hal/positioning_hal/src/LineSensDrv/LineSensDrv_Api.cpp
similarity index 100%
rename from positioning_hal/src/LineSensDrv/LineSensDrv_Api.cpp
rename to hal/positioning_hal/src/LineSensDrv/LineSensDrv_Api.cpp

diff --git a/positioning_hal/src/LineSensDrv/LineSensDrv_Sensor.cpp b/hal/positioning_hal/src/LineSensDrv/LineSensDrv_Sensor.cpp
similarity index 100%
rename from positioning_hal/src/LineSensDrv/LineSensDrv_Sensor.cpp
rename to hal/positioning_hal/src/LineSensDrv/LineSensDrv_Sensor.cpp

diff --git a/positioning_hal/src/LineSensDrv/LineSensDrv_Thread.cpp b/hal/positioning_hal/src/LineSensDrv/LineSensDrv_Thread.cpp
similarity index 100%
rename from positioning_hal/src/LineSensDrv/LineSensDrv_Thread.cpp
rename to hal/positioning_hal/src/LineSensDrv/LineSensDrv_Thread.cpp

diff --git a/nsframework/framework_unified/LICENSE b/hal/power_hal/LICENSE
similarity index 100%
rename from nsframework/framework_unified/LICENSE
rename to hal/power_hal/LICENSE

diff --git a/power_hal/Makefile b/hal/power_hal/Makefile
similarity index 100%
rename from power_hal/Makefile
rename to hal/power_hal/Makefile

diff --git a/power_hal/README.md b/hal/power_hal/README.md
similarity index 100%
rename from power_hal/README.md
rename to hal/power_hal/README.md

diff --git a/power_hal/hal_api/power_hal.h b/hal/power_hal/hal_api/power_hal.h
similarity index 100%
rename from power_hal/hal_api/power_hal.h
rename to hal/power_hal/hal_api/power_hal.h

diff --git a/power_hal/src/power_hal.cpp b/hal/power_hal/src/power_hal.cpp
similarity index 100%
rename from power_hal/src/power_hal.cpp
rename to hal/power_hal/src/power_hal.cpp

diff --git a/nsframework/log_library/LICENSE b/hal/security_hal/LICENSE
similarity index 100%
rename from nsframework/log_library/LICENSE
rename to hal/security_hal/LICENSE

diff --git a/security_hal/Makefile b/hal/security_hal/Makefile
similarity index 100%
rename from security_hal/Makefile
rename to hal/security_hal/Makefile

diff --git a/security_hal/hal_api/security_hal.h b/hal/security_hal/hal_api/security_hal.h
similarity index 100%
rename from security_hal/hal_api/security_hal.h
rename to hal/security_hal/hal_api/security_hal.h

diff --git a/security_hal/inc/security_hal_securityhallog.h b/hal/security_hal/inc/security_hal_securityhallog.h
similarity index 100%
rename from security_hal/inc/security_hal_securityhallog.h
rename to hal/security_hal/inc/security_hal_securityhallog.h

diff --git a/security_hal/src/security_hal.cpp b/hal/security_hal/src/security_hal.cpp
similarity index 100%
rename from security_hal/src/security_hal.cpp
rename to hal/security_hal/src/security_hal.cpp

diff --git a/nsframework/notification_persistent_service/LICENSE b/hal/soc_temperature_hal/LICENSE
similarity index 100%
rename from nsframework/notification_persistent_service/LICENSE
rename to hal/soc_temperature_hal/LICENSE

diff --git a/soc_temperature_hal/Makefile b/hal/soc_temperature_hal/Makefile
similarity index 100%
rename from soc_temperature_hal/Makefile
rename to hal/soc_temperature_hal/Makefile

diff --git a/soc_temperature_hal/hal_api/soc_temperature_hal.h b/hal/soc_temperature_hal/hal_api/soc_temperature_hal.h
similarity index 100%
rename from soc_temperature_hal/hal_api/soc_temperature_hal.h
rename to hal/soc_temperature_hal/hal_api/soc_temperature_hal.h

diff --git a/soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h b/hal/soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h
similarity index 100%
rename from soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h
rename to hal/soc_temperature_hal/inc/soc_temperature_hal_soctemperaturehallog.h

diff --git a/soc_temperature_hal/src/soc_temperature_hal.cpp b/hal/soc_temperature_hal/src/soc_temperature_hal.cpp
similarity index 100%
rename from soc_temperature_hal/src/soc_temperature_hal.cpp
rename to hal/soc_temperature_hal/src/soc_temperature_hal.cpp

diff --git a/nv_hal/LICENSE b/hal/update_hal/LICENSE
similarity index 100%
rename from nv_hal/LICENSE
rename to hal/update_hal/LICENSE

diff --git a/update_hal/Makefile b/hal/update_hal/Makefile
similarity index 100%
rename from update_hal/Makefile
rename to hal/update_hal/Makefile

diff --git a/update_hal/hal_api/update_hal.h b/hal/update_hal/hal_api/update_hal.h
similarity index 100%
rename from update_hal/hal_api/update_hal.h
rename to hal/update_hal/hal_api/update_hal.h

diff --git a/update_hal/include/update_hal.h b/hal/update_hal/include/update_hal.h
similarity index 100%
rename from update_hal/include/update_hal.h
rename to hal/update_hal/include/update_hal.h

diff --git a/otherservice/event_library/LICENSE b/hal/usb_hal/LICENSE
similarity index 100%
rename from otherservice/event_library/LICENSE
rename to hal/usb_hal/LICENSE

diff --git a/usb_hal/Makefile b/hal/usb_hal/Makefile
similarity index 100%
rename from usb_hal/Makefile
rename to hal/usb_hal/Makefile

diff --git a/usb_hal/hal_api/usb_hal.h b/hal/usb_hal/hal_api/usb_hal.h
similarity index 100%
rename from usb_hal/hal_api/usb_hal.h
rename to hal/usb_hal/hal_api/usb_hal.h

diff --git a/usb_hal/inc/usb_hal_debug.h b/hal/usb_hal/inc/usb_hal_debug.h
similarity index 100%
rename from usb_hal/inc/usb_hal_debug.h
rename to hal/usb_hal/inc/usb_hal_debug.h

diff --git a/usb_hal/inc/usb_hal_internal.h b/hal/usb_hal/inc/usb_hal_internal.h
similarity index 100%
rename from usb_hal/inc/usb_hal_internal.h
rename to hal/usb_hal/inc/usb_hal_internal.h

diff --git a/usb_hal/inc/usb_hal_usbhallog.h b/hal/usb_hal/inc/usb_hal_usbhallog.h
similarity index 100%
rename from usb_hal/inc/usb_hal_usbhallog.h
rename to hal/usb_hal/inc/usb_hal_usbhallog.h

diff --git a/usb_hal/src/usb_hal.cpp b/hal/usb_hal/src/usb_hal.cpp
similarity index 100%
rename from usb_hal/src/usb_hal.cpp
rename to hal/usb_hal/src/usb_hal.cpp

diff --git a/otherservice/posix_based_os001_legacy_library/LICENSE b/hal/vehicle_hal/LICENSE
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/LICENSE
rename to hal/vehicle_hal/LICENSE

diff --git a/vehicle_hal/Makefile b/hal/vehicle_hal/Makefile
similarity index 100%
rename from vehicle_hal/Makefile
rename to hal/vehicle_hal/Makefile

diff --git a/vehicle_hal/README.md b/hal/vehicle_hal/README.md
similarity index 100%
rename from vehicle_hal/README.md
rename to hal/vehicle_hal/README.md

diff --git a/vehicle_hal/hal_api/vehicle_hal.h b/hal/vehicle_hal/hal_api/vehicle_hal.h
similarity index 100%
rename from vehicle_hal/hal_api/vehicle_hal.h
rename to hal/vehicle_hal/hal_api/vehicle_hal.h

diff --git a/vehicle_hal/inc/vehicle_hal_frameworkunifiedlog.h b/hal/vehicle_hal/inc/vehicle_hal_frameworkunifiedlog.h
similarity index 100%
rename from vehicle_hal/inc/vehicle_hal_frameworkunifiedlog.h
rename to hal/vehicle_hal/inc/vehicle_hal_frameworkunifiedlog.h

diff --git a/vehicle_hal/src/vehicle_hal.cpp b/hal/vehicle_hal/src/vehicle_hal.cpp
similarity index 100%
rename from vehicle_hal/src/vehicle_hal.cpp
rename to hal/vehicle_hal/src/vehicle_hal.cpp

diff --git a/otherservice/rpc_library/LICENSE b/hal/video_in_hal/LICENSE
similarity index 100%
rename from otherservice/rpc_library/LICENSE
rename to hal/video_in_hal/LICENSE

diff --git a/video_in_hal/Makefile b/hal/video_in_hal/Makefile
similarity index 100%
rename from video_in_hal/Makefile
rename to hal/video_in_hal/Makefile

diff --git a/video_in_hal/README.md b/hal/video_in_hal/README.md
similarity index 100%
rename from video_in_hal/README.md
rename to hal/video_in_hal/README.md

diff --git a/video_in_hal/hal_api/video_in_hal.h b/hal/video_in_hal/hal_api/video_in_hal.h
similarity index 100%
rename from video_in_hal/hal_api/video_in_hal.h
rename to hal/video_in_hal/hal_api/video_in_hal.h

diff --git a/video_in_hal/src/video_in_hal.c b/hal/video_in_hal/src/video_in_hal.c
similarity index 100%
rename from video_in_hal/src/video_in_hal.c
rename to hal/video_in_hal/src/video_in_hal.c

diff --git a/kernel-module-evklib/Makefile b/module/kernel-module-evklib/Makefile
similarity index 100%
rename from kernel-module-evklib/Makefile
rename to module/kernel-module-evklib/Makefile

diff --git a/kernel-module-evklib/agldd/agldd.h b/module/kernel-module-evklib/agldd/agldd.h
similarity index 100%
rename from kernel-module-evklib/agldd/agldd.h
rename to module/kernel-module-evklib/agldd/agldd.h

diff --git a/kernel-module-evklib/agldd/ev_common.h b/module/kernel-module-evklib/agldd/ev_common.h
similarity index 100%
rename from kernel-module-evklib/agldd/ev_common.h
rename to module/kernel-module-evklib/agldd/ev_common.h

diff --git a/kernel-module-evklib/agldd/ev_id.h b/module/kernel-module-evklib/agldd/ev_id.h
similarity index 100%
rename from kernel-module-evklib/agldd/ev_id.h
rename to module/kernel-module-evklib/agldd/ev_id.h

diff --git a/kernel-module-evklib/agldd/evk_lib.h b/module/kernel-module-evklib/agldd/evk_lib.h
similarity index 100%
rename from kernel-module-evklib/agldd/evk_lib.h
rename to module/kernel-module-evklib/agldd/evk_lib.h

diff --git a/kernel-module-evklib/agldd/moduleid.h b/module/kernel-module-evklib/agldd/moduleid.h
similarity index 100%
rename from kernel-module-evklib/agldd/moduleid.h
rename to module/kernel-module-evklib/agldd/moduleid.h

diff --git a/kernel-module-evklib/evk_lib.c b/module/kernel-module-evklib/evk_lib.c
similarity index 100%
rename from kernel-module-evklib/evk_lib.c
rename to module/kernel-module-evklib/evk_lib.c

diff --git a/otherservice/vehicle_parameter_library/LICENSE b/service/native/backup_manager/LICENSE
similarity index 100%
rename from otherservice/vehicle_parameter_library/LICENSE
rename to service/native/backup_manager/LICENSE

diff --git a/nsframework/backup_manager/Makefile.client b/service/native/backup_manager/Makefile.client
similarity index 100%
rename from nsframework/backup_manager/Makefile.client
rename to service/native/backup_manager/Makefile.client

diff --git a/nsframework/backup_manager/Makefile.server b/service/native/backup_manager/Makefile.server
similarity index 100%
rename from nsframework/backup_manager/Makefile.server
rename to service/native/backup_manager/Makefile.server

diff --git a/nsframework/backup_manager/client/Makefile b/service/native/backup_manager/client/Makefile
similarity index 100%
rename from nsframework/backup_manager/client/Makefile
rename to service/native/backup_manager/client/Makefile

diff --git a/nsframework/backup_manager/client/include/bkup_api.h b/service/native/backup_manager/client/include/bkup_api.h
similarity index 100%
rename from nsframework/backup_manager/client/include/bkup_api.h
rename to service/native/backup_manager/client/include/bkup_api.h

diff --git a/nsframework/backup_manager/client/include/native_service/backup_manager.h b/service/native/backup_manager/client/include/native_service/backup_manager.h
similarity index 100%
rename from nsframework/backup_manager/client/include/native_service/backup_manager.h
rename to service/native/backup_manager/client/include/native_service/backup_manager.h

diff --git a/nsframework/backup_manager/client/include/native_service/ns_backup.h b/service/native/backup_manager/client/include/native_service/ns_backup.h
similarity index 100%
rename from nsframework/backup_manager/client/include/native_service/ns_backup.h
rename to service/native/backup_manager/client/include/native_service/ns_backup.h

diff --git a/nsframework/backup_manager/client/libns_backup.ver b/service/native/backup_manager/client/libns_backup.ver
similarity index 100%
rename from nsframework/backup_manager/client/libns_backup.ver
rename to service/native/backup_manager/client/libns_backup.ver

diff --git a/nsframework/backup_manager/client/src/bkup_api.cpp b/service/native/backup_manager/client/src/bkup_api.cpp
similarity index 100%
rename from nsframework/backup_manager/client/src/bkup_api.cpp
rename to service/native/backup_manager/client/src/bkup_api.cpp

diff --git a/nsframework/backup_manager/config/Makefile b/service/native/backup_manager/config/Makefile
similarity index 100%
rename from nsframework/backup_manager/config/Makefile
rename to service/native/backup_manager/config/Makefile

diff --git a/nsframework/backup_manager/config/backup.rng b/service/native/backup_manager/config/backup.rng
similarity index 100%
rename from nsframework/backup_manager/config/backup.rng
rename to service/native/backup_manager/config/backup.rng

diff --git a/nsframework/backup_manager/config/conf/backup/ALL_.xml b/service/native/backup_manager/config/conf/backup/ALL_.xml
similarity index 100%
rename from nsframework/backup_manager/config/conf/backup/ALL_.xml
rename to service/native/backup_manager/config/conf/backup/ALL_.xml

diff --git a/nsframework/backup_manager/config/conf/backup/backup_AREA1_L.xml b/service/native/backup_manager/config/conf/backup/backup_AREA1_L.xml
similarity index 100%
rename from nsframework/backup_manager/config/conf/backup/backup_AREA1_L.xml
rename to service/native/backup_manager/config/conf/backup/backup_AREA1_L.xml

diff --git a/nsframework/backup_manager/config/conf/backup/backup_AREA1_TE.xml b/service/native/backup_manager/config/conf/backup/backup_AREA1_TE.xml
similarity index 100%
rename from nsframework/backup_manager/config/conf/backup/backup_AREA1_TE.xml
rename to service/native/backup_manager/config/conf/backup/backup_AREA1_TE.xml

diff --git a/nsframework/backup_manager/config/conf/backup/backup_AREA2_T.xml b/service/native/backup_manager/config/conf/backup/backup_AREA2_T.xml
similarity index 100%
rename from nsframework/backup_manager/config/conf/backup/backup_AREA2_T.xml
rename to service/native/backup_manager/config/conf/backup/backup_AREA2_T.xml

diff --git a/nsframework/backup_manager/config/conf/backup/backup_AREA2_TE.xml b/service/native/backup_manager/config/conf/backup/backup_AREA2_TE.xml
similarity index 100%
rename from nsframework/backup_manager/config/conf/backup/backup_AREA2_TE.xml
rename to service/native/backup_manager/config/conf/backup/backup_AREA2_TE.xml

diff --git a/nsframework/backup_manager/config/createhdr.pl b/service/native/backup_manager/config/createhdr.pl
similarity index 100%
rename from nsframework/backup_manager/config/createhdr.pl
rename to service/native/backup_manager/config/createhdr.pl

diff --git a/nsframework/backup_manager/config/sample.xml b/service/native/backup_manager/config/sample.xml
similarity index 100%
rename from nsframework/backup_manager/config/sample.xml
rename to service/native/backup_manager/config/sample.xml

diff --git a/nsframework/backup_manager/config/uniqcheck.pl b/service/native/backup_manager/config/uniqcheck.pl
similarity index 100%
rename from nsframework/backup_manager/config/uniqcheck.pl
rename to service/native/backup_manager/config/uniqcheck.pl

diff --git a/nsframework/backup_manager/server/Makefile b/service/native/backup_manager/server/Makefile
similarity index 100%
rename from nsframework/backup_manager/server/Makefile
rename to service/native/backup_manager/server/Makefile

diff --git a/nsframework/backup_manager/server/include/bkup_backupmanagerlog.h b/service/native/backup_manager/server/include/bkup_backupmanagerlog.h
similarity index 100%
rename from nsframework/backup_manager/server/include/bkup_backupmanagerlog.h
rename to service/native/backup_manager/server/include/bkup_backupmanagerlog.h

diff --git a/nsframework/backup_manager/server/include/bkup_crc32.h b/service/native/backup_manager/server/include/bkup_crc32.h
similarity index 100%
rename from nsframework/backup_manager/server/include/bkup_crc32.h
rename to service/native/backup_manager/server/include/bkup_crc32.h

diff --git a/nsframework/backup_manager/server/include/bkup_param.h b/service/native/backup_manager/server/include/bkup_param.h
similarity index 100%
rename from nsframework/backup_manager/server/include/bkup_param.h
rename to service/native/backup_manager/server/include/bkup_param.h

diff --git a/nsframework/backup_manager/server/include/bkup_process.h b/service/native/backup_manager/server/include/bkup_process.h
similarity index 100%
rename from nsframework/backup_manager/server/include/bkup_process.h
rename to service/native/backup_manager/server/include/bkup_process.h

diff --git a/nsframework/backup_manager/server/include/bkup_util.h b/service/native/backup_manager/server/include/bkup_util.h
similarity index 100%
rename from nsframework/backup_manager/server/include/bkup_util.h
rename to service/native/backup_manager/server/include/bkup_util.h

diff --git a/nsframework/backup_manager/server/src/backupmanager_application.cpp b/service/native/backup_manager/server/src/backupmanager_application.cpp
similarity index 100%
rename from nsframework/backup_manager/server/src/backupmanager_application.cpp
rename to service/native/backup_manager/server/src/backupmanager_application.cpp

diff --git a/nsframework/backup_manager/server/src/backupmanager_main.cpp b/service/native/backup_manager/server/src/backupmanager_main.cpp
similarity index 100%
rename from nsframework/backup_manager/server/src/backupmanager_main.cpp
rename to service/native/backup_manager/server/src/backupmanager_main.cpp

diff --git a/nsframework/backup_manager/server/src/bkup_crc32.cpp b/service/native/backup_manager/server/src/bkup_crc32.cpp
similarity index 100%
rename from nsframework/backup_manager/server/src/bkup_crc32.cpp
rename to service/native/backup_manager/server/src/bkup_crc32.cpp

diff --git a/nsframework/backup_manager/server/src/bkup_param.cpp b/service/native/backup_manager/server/src/bkup_param.cpp
similarity index 100%
rename from nsframework/backup_manager/server/src/bkup_param.cpp
rename to service/native/backup_manager/server/src/bkup_param.cpp

diff --git a/nsframework/backup_manager/server/src/bkup_process.cpp b/service/native/backup_manager/server/src/bkup_process.cpp
similarity index 100%
rename from nsframework/backup_manager/server/src/bkup_process.cpp
rename to service/native/backup_manager/server/src/bkup_process.cpp

diff --git a/peripheralservice/communication/LICENSE b/service/native/common_library/LICENSE
similarity index 100%
rename from peripheralservice/communication/LICENSE
rename to service/native/common_library/LICENSE

diff --git a/nsframework/common_library/Makefile.client b/service/native/common_library/Makefile.client
similarity index 100%
rename from nsframework/common_library/Makefile.client
rename to service/native/common_library/Makefile.client

diff --git a/nsframework/common_library/client/Makefile b/service/native/common_library/client/Makefile
similarity index 100%
rename from nsframework/common_library/client/Makefile
rename to service/native/common_library/client/Makefile

diff --git a/nsframework/common_library/client/include/cl_cgroup.h b/service/native/common_library/client/include/cl_cgroup.h
similarity index 100%
rename from nsframework/common_library/client/include/cl_cgroup.h
rename to service/native/common_library/client/include/cl_cgroup.h

diff --git a/nsframework/common_library/client/include/cl_error.h b/service/native/common_library/client/include/cl_error.h
similarity index 100%
rename from nsframework/common_library/client/include/cl_error.h
rename to service/native/common_library/client/include/cl_error.h

diff --git a/nsframework/common_library/client/include/cl_lock_internal.h b/service/native/common_library/client/include/cl_lock_internal.h
similarity index 100%
rename from nsframework/common_library/client/include/cl_lock_internal.h
rename to service/native/common_library/client/include/cl_lock_internal.h

diff --git a/nsframework/common_library/client/include/cl_monitor_internal.h b/service/native/common_library/client/include/cl_monitor_internal.h
similarity index 100%
rename from nsframework/common_library/client/include/cl_monitor_internal.h
rename to service/native/common_library/client/include/cl_monitor_internal.h

diff --git a/nsframework/common_library/client/include/cl_process_internal.h b/service/native/common_library/client/include/cl_process_internal.h
similarity index 100%
rename from nsframework/common_library/client/include/cl_process_internal.h
rename to service/native/common_library/client/include/cl_process_internal.h

diff --git a/nsframework/common_library/client/include/native_service/cl_lock.h b/service/native/common_library/client/include/native_service/cl_lock.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/cl_lock.h
rename to service/native/common_library/client/include/native_service/cl_lock.h

diff --git a/nsframework/common_library/client/include/native_service/cl_lockid.h b/service/native/common_library/client/include/native_service/cl_lockid.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/cl_lockid.h
rename to service/native/common_library/client/include/native_service/cl_lockid.h

diff --git a/nsframework/common_library/client/include/native_service/cl_monitor.h b/service/native/common_library/client/include/native_service/cl_monitor.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/cl_monitor.h
rename to service/native/common_library/client/include/native_service/cl_monitor.h

diff --git a/nsframework/common_library/client/include/native_service/cl_process.h b/service/native/common_library/client/include/native_service/cl_process.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/cl_process.h
rename to service/native/common_library/client/include/native_service/cl_process.h

diff --git a/nsframework/common_library/client/include/native_service/cl_region.h b/service/native/common_library/client/include/native_service/cl_region.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/cl_region.h
rename to service/native/common_library/client/include/native_service/cl_region.h

diff --git a/nsframework/common_library/client/include/native_service/cl_sem.h b/service/native/common_library/client/include/native_service/cl_sem.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/cl_sem.h
rename to service/native/common_library/client/include/native_service/cl_sem.h

diff --git a/nsframework/common_library/client/include/native_service/common_library.h b/service/native/common_library/client/include/native_service/common_library.h
similarity index 100%
rename from nsframework/common_library/client/include/native_service/common_library.h
rename to service/native/common_library/client/include/native_service/common_library.h

diff --git a/nsframework/common_library/client/libcommon.ver b/service/native/common_library/client/libcommon.ver
similarity index 100%
rename from nsframework/common_library/client/libcommon.ver
rename to service/native/common_library/client/libcommon.ver

diff --git a/nsframework/common_library/client/src/cl_cgroup.c b/service/native/common_library/client/src/cl_cgroup.c
similarity index 100%
rename from nsframework/common_library/client/src/cl_cgroup.c
rename to service/native/common_library/client/src/cl_cgroup.c

diff --git a/nsframework/common_library/client/src/cl_lock.c b/service/native/common_library/client/src/cl_lock.c
similarity index 100%
rename from nsframework/common_library/client/src/cl_lock.c
rename to service/native/common_library/client/src/cl_lock.c

diff --git a/nsframework/common_library/client/src/cl_monitor.c b/service/native/common_library/client/src/cl_monitor.c
similarity index 100%
rename from nsframework/common_library/client/src/cl_monitor.c
rename to service/native/common_library/client/src/cl_monitor.c

diff --git a/nsframework/common_library/client/src/cl_process.c b/service/native/common_library/client/src/cl_process.c
similarity index 100%
rename from nsframework/common_library/client/src/cl_process.c
rename to service/native/common_library/client/src/cl_process.c

diff --git a/nsframework/common_library/client/src/cl_region.c b/service/native/common_library/client/src/cl_region.c
similarity index 100%
rename from nsframework/common_library/client/src/cl_region.c
rename to service/native/common_library/client/src/cl_region.c

diff --git a/nsframework/common_library/client/src/cl_sem.c b/service/native/common_library/client/src/cl_sem.c
similarity index 100%
rename from nsframework/common_library/client/src/cl_sem.c
rename to service/native/common_library/client/src/cl_sem.c

diff --git a/positioning_hal/LICENSE b/service/native/framework_unified/LICENSE
similarity index 100%
rename from positioning_hal/LICENSE
rename to service/native/framework_unified/LICENSE

diff --git a/nsframework/framework_unified/Makefile.client b/service/native/framework_unified/Makefile.client
similarity index 100%
rename from nsframework/framework_unified/Makefile.client
rename to service/native/framework_unified/Makefile.client

diff --git a/nsframework/framework_unified/client/Makefile b/service/native/framework_unified/client/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/Makefile
rename to service/native/framework_unified/client/Makefile

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/cfg/depends.mk b/service/native/framework_unified/client/NS_ConfigParser/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/cfg/depends.mk
rename to service/native/framework_unified/client/NS_ConfigParser/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h b/service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h
rename to service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_internal.h

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h b/service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h
rename to service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_parser.h

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h b/service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h
rename to service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_reader.h

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h b/service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h
rename to service/native/framework_unified/client/NS_ConfigParser/include/ns_cfg_writer.h

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h b/service/native/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h
rename to service/native/framework_unified/client/NS_ConfigParser/include/ns_config_parser_frameworkunifiedlog.h

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_ConfigParser/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_cfg_parser.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_cfg_reader.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_cfg_writer.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_config_reader.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_config_reader_writer.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_config_writer.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_reader.cpp

diff --git a/nsframework/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp b/service/native/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp
rename to service/native/framework_unified/client/NS_ConfigParser/src/ns_writer.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/cfg/depends.mk b/service/native/framework_unified/client/NS_FrameworkCore/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/cfg/depends.mk
rename to service/native/framework_unified/client/NS_FrameworkCore/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h b/service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_core.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp b/service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp
rename to service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_error_internal.hpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h b/service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_internal.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h b/service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_framework_utility.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h b/service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/frameworkunified_msgprofiler.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h b/service/native/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_finalstate.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h b/service/native/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_framework_core.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h b/service/native/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h
rename to service/native/framework_unified/client/NS_FrameworkCore/include/statemachine/frameworkunified_sm_multithreading_internal.h

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_dispatcher.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_dispatch.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_error.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_logger.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_message_center.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_npservice.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_session.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_sync.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_framework_system.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_msgprofiler.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_multithreading.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_service_if.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_thread_priority.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/frameworkunified_timer.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_FrameworkCore/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_action.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_compositestate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_conditionconnector.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_deephistorystate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_dispatcher.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_externaltransition.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_finalstate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_framework_dispatch.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_guard.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_historystate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsm.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_hsmframework.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_leafstate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_localtransition.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_multithreading.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_orthogonalstate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_shallowhistorystate.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_state.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/frameworkunified_sm_transition.cpp

diff --git a/nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile b/service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile
rename to service/native/framework_unified/client/NS_FrameworkCore/src/statemachine/makefile

diff --git a/nsframework/framework_unified/client/NS_Logger/cfg/depends.mk b/service/native/framework_unified/client/NS_Logger/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_Logger/cfg/depends.mk
rename to service/native/framework_unified/client/NS_Logger/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_Logger/include/frameworkunified_stub.h b/service/native/framework_unified/client/NS_Logger/include/frameworkunified_stub.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_Logger/include/frameworkunified_stub.h
rename to service/native/framework_unified/client/NS_Logger/include/frameworkunified_stub.h

diff --git a/nsframework/framework_unified/client/NS_Logger/include/ns_logger_internal.h b/service/native/framework_unified/client/NS_Logger/include/ns_logger_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_Logger/include/ns_logger_internal.h
rename to service/native/framework_unified/client/NS_Logger/include/ns_logger_internal.h

diff --git a/nsframework/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_Logger/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp b/service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_Logger/src/ns_logger.cpp
rename to service/native/framework_unified/client/NS_Logger/src/ns_logger.cpp

diff --git a/nsframework/framework_unified/client/NS_Logger/tool/nslogsw.cpp b/service/native/framework_unified/client/NS_Logger/tool/nslogsw.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_Logger/tool/nslogsw.cpp
rename to service/native/framework_unified/client/NS_Logger/tool/nslogsw.cpp

diff --git a/nsframework/framework_unified/client/NS_MessageCenter/cfg/depends.mk b/service/native/framework_unified/client/NS_MessageCenter/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageCenter/cfg/depends.mk
rename to service/native/framework_unified/client/NS_MessageCenter/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h b/service/native/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h
rename to service/native/framework_unified/client/NS_MessageCenter/include/ns_mc_internal.h

diff --git a/nsframework/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h b/service/native/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h
rename to service/native/framework_unified/client/NS_MessageCenter/include/ns_message_center_internal.h

diff --git a/nsframework/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_MessageCenter/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_MessageCenter/src/ns_message_center.c b/service/native/framework_unified/client/NS_MessageCenter/src/ns_message_center.c
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageCenter/src/ns_message_center.c
rename to service/native/framework_unified/client/NS_MessageCenter/src/ns_message_center.c

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/cfg/depends.mk b/service/native/framework_unified/client/NS_MessageQueue/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/cfg/depends.mk
rename to service/native/framework_unified/client/NS_MessageQueue/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h b/service/native/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h
rename to service/native/framework_unified/client/NS_MessageQueue/include/ns_mq_anomaly.h

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h b/service/native/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h
rename to service/native/framework_unified/client/NS_MessageQueue/include/ns_mq_internal.h

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h b/service/native/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h
rename to service/native/framework_unified/client/NS_MessageQueue/include/ns_msg_queue.h

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_MessageQueue/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c b/service/native/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c
rename to service/native/framework_unified/client/NS_MessageQueue/src/ns_mq_string.c

diff --git a/nsframework/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c b/service/native/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c
similarity index 100%
rename from nsframework/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c
rename to service/native/framework_unified/client/NS_MessageQueue/src/ns_msg_queue.c

diff --git a/nsframework/framework_unified/client/NS_NPServiceIf/cfg/depends.mk b/service/native/framework_unified/client/NS_NPServiceIf/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_NPServiceIf/cfg/depends.mk
rename to service/native/framework_unified/client/NS_NPServiceIf/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h b/service/native/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h
rename to service/native/framework_unified/client/NS_NPServiceIf/include/ns_np_service_internal.h

diff --git a/nsframework/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_NPServiceIf/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c b/service/native/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c
similarity index 100%
rename from nsframework/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c
rename to service/native/framework_unified/client/NS_NPServiceIf/src/ns_np_service_api.c

diff --git a/nsframework/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp b/service/native/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp
rename to service/native/framework_unified/client/NS_NPServiceIf/src/ns_np_service_nor_persistence.cpp

diff --git a/nsframework/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp b/service/native/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp
rename to service/native/framework_unified/client/NS_ResourceControler/src/ns_resource_controler.cpp

diff --git a/nsframework/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp b/service/native/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp
rename to service/native/framework_unified/client/NS_RingBuffer/src/ns_ringbuffer.cpp

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp b/service/native/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp
rename to service/native/framework_unified/client/NS_SharedMemIf/api/nsapi_sharedmem.cpp

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/cfg/depends.mk b/service/native/framework_unified/client/NS_SharedMemIf/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/cfg/depends.mk
rename to service/native/framework_unified/client/NS_SharedMemIf/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_SharedMemIf/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp b/service/native/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp
rename to service/native/framework_unified/client/NS_SharedMemIf/src/ns_shared_mem_if.cpp

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp b/service/native/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp
rename to service/native/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem.cpp

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp b/service/native/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp
rename to service/native/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_reader.cpp

diff --git a/nsframework/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp b/service/native/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp
rename to service/native/framework_unified/client/NS_SharedMemIf/src/ns_sharedmem_writer.cpp

diff --git a/nsframework/framework_unified/client/NS_Timer/cfg/depends.mk b/service/native/framework_unified/client/NS_Timer/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/cfg/depends.mk
rename to service/native/framework_unified/client/NS_Timer/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_Timer/include/ns_timer_handle.h b/service/native/framework_unified/client/NS_Timer/include/ns_timer_handle.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/include/ns_timer_handle.h
rename to service/native/framework_unified/client/NS_Timer/include/ns_timer_handle.h

diff --git a/nsframework/framework_unified/client/NS_Timer/include/ns_timer_internal.h b/service/native/framework_unified/client/NS_Timer/include/ns_timer_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/include/ns_timer_internal.h
rename to service/native/framework_unified/client/NS_Timer/include/ns_timer_internal.h

diff --git a/nsframework/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_Timer/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_Timer/src/mod_version.c b/service/native/framework_unified/client/NS_Timer/src/mod_version.c
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/src/mod_version.c
rename to service/native/framework_unified/client/NS_Timer/src/mod_version.c

diff --git a/nsframework/framework_unified/client/NS_Timer/src/ns_timer.c b/service/native/framework_unified/client/NS_Timer/src/ns_timer.c
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/src/ns_timer.c
rename to service/native/framework_unified/client/NS_Timer/src/ns_timer.c

diff --git a/nsframework/framework_unified/client/NS_Timer/src/ns_timer_class.cpp b/service/native/framework_unified/client/NS_Timer/src/ns_timer_class.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_Timer/src/ns_timer_class.cpp
rename to service/native/framework_unified/client/NS_Timer/src/ns_timer_class.cpp

diff --git a/nsframework/framework_unified/client/NS_Utility/Makefile b/service/native/framework_unified/client/NS_Utility/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_Utility/Makefile
rename to service/native/framework_unified/client/NS_Utility/Makefile

diff --git a/nsframework/framework_unified/client/NS_Utility/buildversioncheck/Makefile b/service/native/framework_unified/client/NS_Utility/buildversioncheck/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_Utility/buildversioncheck/Makefile
rename to service/native/framework_unified/client/NS_Utility/buildversioncheck/Makefile

diff --git a/nsframework/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile b/service/native/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile
rename to service/native/framework_unified/client/NS_Utility/buildversioncheck/library/Makefile

diff --git a/nsframework/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp b/service/native/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp
rename to service/native/framework_unified/client/NS_Utility/buildversioncheck/library/src/NS_BuildVersionCheck.cpp

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/cfg/depends.mk b/service/native/framework_unified/client/NS_UtilityCenter/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/cfg/depends.mk
rename to service/native/framework_unified/client/NS_UtilityCenter/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h b/service/native/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h
rename to service/native/framework_unified/client/NS_UtilityCenter/include/ns_utility_if_internal.h

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp b/service/native/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp
rename to service/native/framework_unified/client/NS_UtilityCenter/include/ns_utility_sys_internal.hpp

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp b/service/native/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp
rename to service/native/framework_unified/client/NS_UtilityCenter/src/frameworkunified_version.cpp

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_UtilityCenter/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp b/service/native/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp
rename to service/native/framework_unified/client/NS_UtilityCenter/src/ns_endianess.cpp

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp b/service/native/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp
rename to service/native/framework_unified/client/NS_UtilityCenter/src/ns_util_crc.cpp

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp b/service/native/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp
rename to service/native/framework_unified/client/NS_UtilityCenter/src/ns_util_directory.cpp

diff --git a/nsframework/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp b/service/native/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp
rename to service/native/framework_unified/client/NS_UtilityCenter/src/ns_utility.cpp

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/Makefile b/service/native/framework_unified/client/NS_XMLConfigeParser/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/Makefile
rename to service/native/framework_unified/client/NS_XMLConfigeParser/Makefile

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/Makefile b/service/native/framework_unified/client/NS_XMLConfigeParser/library/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/Makefile
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/Makefile

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk b/service/native/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h b/service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_XML.h

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h b/service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_cfg.h

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h b/service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_config_parser_internal.h

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h b/service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/include/ns_xmlconfig_parser_frameworkunifiedlog.h

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/Makefile

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_reader.cpp

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xml_writer.cpp

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser.cpp

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_attributes.cpp

diff --git a/nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp b/service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp
rename to service/native/framework_unified/client/NS_XMLConfigeParser/library/src/ns_xmlparser_node.cpp

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__service_if.cpp

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified__CWORD77__session_if.cpp

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/frameworkunified_stub.h

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__common_internal.h

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_internal.h

diff --git a/nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp b/service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp
similarity index 100%
rename from nsframework/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp
rename to service/native/framework_unified/client/NS__CWORD77__ServiceIf/src/ns__CWORD77__data_pool_table.cpp

diff --git a/nsframework/framework_unified/client/NativeServices/Makefile b/service/native/framework_unified/client/NativeServices/Makefile
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/Makefile
rename to service/native/framework_unified/client/NativeServices/Makefile

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk b/service/native/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk
rename to service/native/framework_unified/client/NativeServices/cfg/PosixBasedOS001_arm.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk b/service/native/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk
rename to service/native/framework_unified/client/NativeServices/cfg/PosixBasedOS001_armv7.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk b/service/native/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk
rename to service/native/framework_unified/client/NativeServices/cfg/PosixBasedOS001_x86.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/analysis.mk b/service/native/framework_unified/client/NativeServices/cfg/analysis.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/analysis.mk
rename to service/native/framework_unified/client/NativeServices/cfg/analysis.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/common.mk b/service/native/framework_unified/client/NativeServices/cfg/common.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/common.mk
rename to service/native/framework_unified/client/NativeServices/cfg/common.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/config.mk b/service/native/framework_unified/client/NativeServices/cfg/config.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/config.mk
rename to service/native/framework_unified/client/NativeServices/cfg/config.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/depends.mk b/service/native/framework_unified/client/NativeServices/cfg/depends.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/depends.mk
rename to service/native/framework_unified/client/NativeServices/cfg/depends.mk

diff --git a/nsframework/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk b/service/native/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk
rename to service/native/framework_unified/client/NativeServices/cfg/nativeserviceslibraries.mk

diff --git a/nsframework/framework_unified/client/NativeServices/makefile_PosixBasedOS001 b/service/native/framework_unified/client/NativeServices/makefile_PosixBasedOS001
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/makefile_PosixBasedOS001
rename to service/native/framework_unified/client/NativeServices/makefile_PosixBasedOS001

diff --git a/nsframework/framework_unified/client/NativeServices/scfg/ns_filestorage.sql b/service/native/framework_unified/client/NativeServices/scfg/ns_filestorage.sql
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/scfg/ns_filestorage.sql
rename to service/native/framework_unified/client/NativeServices/scfg/ns_filestorage.sql

diff --git a/nsframework/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog.cfg b/service/native/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog.cfg
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog.cfg
rename to service/native/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog.cfg

diff --git a/nsframework/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg b/service/native/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg
similarity index 100%
rename from nsframework/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg
rename to service/native/framework_unified/client/NativeServices/scfg/ns_logger_frameworkunifiedlog__CWORD84_.cfg

diff --git a/nsframework/framework_unified/client/include/native_service/XMLParser.h b/service/native/framework_unified/client/include/native_service/XMLParser.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/XMLParser.h
rename to service/native/framework_unified/client/include/native_service/XMLParser.h

diff --git a/nsframework/framework_unified/client/include/native_service/framework_unified.h b/service/native/framework_unified/client/include/native_service/framework_unified.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/framework_unified.h
rename to service/native/framework_unified/client/include/native_service/framework_unified.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h b/service/native/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified__CWORD77__service_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h b/service/native/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified__CWORD77__session_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_application.h b/service/native/framework_unified/client/include/native_service/frameworkunified_application.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_application.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_application.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_dispatcher.h b/service/native/framework_unified/client/include/native_service/frameworkunified_dispatcher.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_dispatcher.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_dispatcher.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp b/service/native/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp
rename to service/native/framework_unified/client/include/native_service/frameworkunified_framework_error.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_framework_if.h b/service/native/framework_unified/client/include/native_service/frameworkunified_framework_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_framework_if.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_framework_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_framework_sync.h b/service/native/framework_unified/client/include/native_service/frameworkunified_framework_sync.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_framework_sync.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_framework_sync.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h b/service/native/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_framework_system_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_framework_types.h b/service/native/framework_unified/client/include/native_service/frameworkunified_framework_types.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_framework_types.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_framework_types.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_multithreading.h b/service/native/framework_unified/client/include/native_service/frameworkunified_multithreading.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_multithreading.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_multithreading.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_service_if.h b/service/native/framework_unified/client/include/native_service/frameworkunified_service_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_service_if.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_service_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_service_protocol.h b/service/native/framework_unified/client/include/native_service/frameworkunified_service_protocol.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_service_protocol.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_service_protocol.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_action.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_action.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_action.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_action.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_compositestate.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_conditionconnector.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_deephistorystate.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_dispatcher.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_eventdata.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_eventfactory.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_externaltransition.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_framework_dispatch.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_framework_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_framework_types.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_guard.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_guard.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_guard.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_guard.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_historystate.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_hsm.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_hsmframework.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_internaltransition.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_leafstate.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_localtransition.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_multithreading.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_orthogonalstate.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_reaction.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_shallowhistorystate.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_state.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_state.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_state.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_state.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_sm_transition.h b/service/native/framework_unified/client/include/native_service/frameworkunified_sm_transition.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_sm_transition.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_sm_transition.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_thread_priority.h b/service/native/framework_unified/client/include/native_service/frameworkunified_thread_priority.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_thread_priority.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_thread_priority.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_timer.h b/service/native/framework_unified/client/include/native_service/frameworkunified_timer.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_timer.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_timer.h

diff --git a/nsframework/framework_unified/client/include/native_service/frameworkunified_types.h b/service/native/framework_unified/client/include/native_service/frameworkunified_types.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/frameworkunified_types.h
rename to service/native/framework_unified/client/include/native_service/frameworkunified_types.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns__CWORD77__common.h b/service/native/framework_unified/client/include/native_service/ns__CWORD77__common.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns__CWORD77__common.h
rename to service/native/framework_unified/client/include/native_service/ns__CWORD77__common.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h b/service/native/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h
rename to service/native/framework_unified/client/include/native_service/ns__CWORD77__data_pool_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h b/service/native/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h
rename to service/native/framework_unified/client/include/native_service/ns__CWORD77__data_pool_key.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h b/service/native/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h
rename to service/native/framework_unified/client/include/native_service/ns__CWORD77__data_pool_table.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns__CWORD77__notifications.h b/service/native/framework_unified/client/include/native_service/ns__CWORD77__notifications.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns__CWORD77__notifications.h
rename to service/native/framework_unified/client/include/native_service/ns__CWORD77__notifications.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns__CWORD77__types.h b/service/native/framework_unified/client/include/native_service/ns__CWORD77__types.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns__CWORD77__types.h
rename to service/native/framework_unified/client/include/native_service/ns__CWORD77__types.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_buildversioncheck.hpp b/service/native/framework_unified/client/include/native_service/ns_buildversioncheck.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_buildversioncheck.hpp
rename to service/native/framework_unified/client/include/native_service/ns_buildversioncheck.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/ns_config_parser_if.h b/service/native/framework_unified/client/include/native_service/ns_config_parser_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_config_parser_if.h
rename to service/native/framework_unified/client/include/native_service/ns_config_parser_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_endianess.h b/service/native/framework_unified/client/include/native_service/ns_endianess.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_endianess.h
rename to service/native/framework_unified/client/include/native_service/ns_endianess.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_eventlogger.h b/service/native/framework_unified/client/include/native_service/ns_eventlogger.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_eventlogger.h
rename to service/native/framework_unified/client/include/native_service/ns_eventlogger.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_logger_if.h b/service/native/framework_unified/client/include/native_service/ns_logger_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_logger_if.h
rename to service/native/framework_unified/client/include/native_service/ns_logger_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_mc_system_info.h b/service/native/framework_unified/client/include/native_service/ns_mc_system_info.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_mc_system_info.h
rename to service/native/framework_unified/client/include/native_service/ns_mc_system_info.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_message_center_if.h b/service/native/framework_unified/client/include/native_service/ns_message_center_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_message_center_if.h
rename to service/native/framework_unified/client/include/native_service/ns_message_center_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_msgs.h b/service/native/framework_unified/client/include/native_service/ns_msgs.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_msgs.h
rename to service/native/framework_unified/client/include/native_service/ns_msgs.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_service.h b/service/native/framework_unified/client/include/native_service/ns_np_service.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_service.h
rename to service/native/framework_unified/client/include/native_service/ns_np_service.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_service_if.h b/service/native/framework_unified/client/include/native_service/ns_np_service_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_service_if.h
rename to service/native/framework_unified/client/include/native_service/ns_np_service_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h b/service/native/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h
rename to service/native/framework_unified/client/include/native_service/ns_np_service_nor_persistence.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h b/service/native/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h
rename to service/native/framework_unified/client/include/native_service/ns_np_service_nor_persistence_internal.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_service_notification.h b/service/native/framework_unified/client/include/native_service/ns_np_service_notification.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_service_notification.h
rename to service/native/framework_unified/client/include/native_service/ns_np_service_notification.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_service_protocol.h b/service/native/framework_unified/client/include/native_service/ns_np_service_protocol.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_service_protocol.h
rename to service/native/framework_unified/client/include/native_service/ns_np_service_protocol.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_np_types.h b/service/native/framework_unified/client/include/native_service/ns_np_types.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_np_types.h
rename to service/native/framework_unified/client/include/native_service/ns_np_types.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_plogger_if.h b/service/native/framework_unified/client/include/native_service/ns_plogger_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_plogger_if.h
rename to service/native/framework_unified/client/include/native_service/ns_plogger_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp b/service/native/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp
rename to service/native/framework_unified/client/include/native_service/ns_rcs_data_handler.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/ns_rcs_logger_types.h b/service/native/framework_unified/client/include/native_service/ns_rcs_logger_types.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_rcs_logger_types.h
rename to service/native/framework_unified/client/include/native_service/ns_rcs_logger_types.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_rcs_plugin.hpp b/service/native/framework_unified/client/include/native_service/ns_rcs_plugin.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_rcs_plugin.hpp
rename to service/native/framework_unified/client/include/native_service/ns_rcs_plugin.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/ns_reader.h b/service/native/framework_unified/client/include/native_service/ns_reader.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_reader.h
rename to service/native/framework_unified/client/include/native_service/ns_reader.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_resource_controler.h b/service/native/framework_unified/client/include/native_service/ns_resource_controler.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_resource_controler.h
rename to service/native/framework_unified/client/include/native_service/ns_resource_controler.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_ringbuffer.h b/service/native/framework_unified/client/include/native_service/ns_ringbuffer.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_ringbuffer.h
rename to service/native/framework_unified/client/include/native_service/ns_ringbuffer.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_shared_mem.h b/service/native/framework_unified/client/include/native_service/ns_shared_mem.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_shared_mem.h
rename to service/native/framework_unified/client/include/native_service/ns_shared_mem.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_shared_mem_if.h b/service/native/framework_unified/client/include/native_service/ns_shared_mem_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_shared_mem_if.h
rename to service/native/framework_unified/client/include/native_service/ns_shared_mem_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_sharedmem.h b/service/native/framework_unified/client/include/native_service/ns_sharedmem.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_sharedmem.h
rename to service/native/framework_unified/client/include/native_service/ns_sharedmem.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_sharedmem_reader.h b/service/native/framework_unified/client/include/native_service/ns_sharedmem_reader.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_sharedmem_reader.h
rename to service/native/framework_unified/client/include/native_service/ns_sharedmem_reader.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_sharedmem_writer.h b/service/native/framework_unified/client/include/native_service/ns_sharedmem_writer.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_sharedmem_writer.h
rename to service/native/framework_unified/client/include/native_service/ns_sharedmem_writer.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_system_mode.h b/service/native/framework_unified/client/include/native_service/ns_system_mode.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_system_mode.h
rename to service/native/framework_unified/client/include/native_service/ns_system_mode.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_timer_if.h b/service/native/framework_unified/client/include/native_service/ns_timer_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_timer_if.h
rename to service/native/framework_unified/client/include/native_service/ns_timer_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_timer_if.hpp b/service/native/framework_unified/client/include/native_service/ns_timer_if.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_timer_if.hpp
rename to service/native/framework_unified/client/include/native_service/ns_timer_if.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/ns_transmit_log.h b/service/native/framework_unified/client/include/native_service/ns_transmit_log.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_transmit_log.h
rename to service/native/framework_unified/client/include/native_service/ns_transmit_log.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_util_crc.h b/service/native/framework_unified/client/include/native_service/ns_util_crc.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_util_crc.h
rename to service/native/framework_unified/client/include/native_service/ns_util_crc.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_util_directory.h b/service/native/framework_unified/client/include/native_service/ns_util_directory.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_util_directory.h
rename to service/native/framework_unified/client/include/native_service/ns_util_directory.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_utility.hpp b/service/native/framework_unified/client/include/native_service/ns_utility.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_utility.hpp
rename to service/native/framework_unified/client/include/native_service/ns_utility.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/ns_utility_if.h b/service/native/framework_unified/client/include/native_service/ns_utility_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_utility_if.h
rename to service/native/framework_unified/client/include/native_service/ns_utility_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_utility_sys.hpp b/service/native/framework_unified/client/include/native_service/ns_utility_sys.hpp
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_utility_sys.hpp
rename to service/native/framework_unified/client/include/native_service/ns_utility_sys.hpp

diff --git a/nsframework/framework_unified/client/include/native_service/ns_version.h b/service/native/framework_unified/client/include/native_service/ns_version.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_version.h
rename to service/native/framework_unified/client/include/native_service/ns_version.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_version_if.h b/service/native/framework_unified/client/include/native_service/ns_version_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_version_if.h
rename to service/native/framework_unified/client/include/native_service/ns_version_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_writer.h b/service/native/framework_unified/client/include/native_service/ns_writer.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_writer.h
rename to service/native/framework_unified/client/include/native_service/ns_writer.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_xml_reader.h b/service/native/framework_unified/client/include/native_service/ns_xml_reader.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_xml_reader.h
rename to service/native/framework_unified/client/include/native_service/ns_xml_reader.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_xml_writer.h b/service/native/framework_unified/client/include/native_service/ns_xml_writer.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_xml_writer.h
rename to service/native/framework_unified/client/include/native_service/ns_xml_writer.h

diff --git a/nsframework/framework_unified/client/include/native_service/ns_xmlparser_if.h b/service/native/framework_unified/client/include/native_service/ns_xmlparser_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/ns_xmlparser_if.h
rename to service/native/framework_unified/client/include/native_service/ns_xmlparser_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/nsfw_message.h b/service/native/framework_unified/client/include/native_service/nsfw_message.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/nsfw_message.h
rename to service/native/framework_unified/client/include/native_service/nsfw_message.h

diff --git a/nsframework/framework_unified/client/include/native_service/nslogutil_cmd_if.h b/service/native/framework_unified/client/include/native_service/nslogutil_cmd_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/nslogutil_cmd_if.h
rename to service/native/framework_unified/client/include/native_service/nslogutil_cmd_if.h

diff --git a/nsframework/framework_unified/client/include/native_service/wpf_legacy.h b/service/native/framework_unified/client/include/native_service/wpf_legacy.h
similarity index 100%
rename from nsframework/framework_unified/client/include/native_service/wpf_legacy.h
rename to service/native/framework_unified/client/include/native_service/wpf_legacy.h

diff --git a/nsframework/framework_unified/client/include/ns__CWORD77__template.h b/service/native/framework_unified/client/include/ns__CWORD77__template.h
similarity index 100%
rename from nsframework/framework_unified/client/include/ns__CWORD77__template.h
rename to service/native/framework_unified/client/include/ns__CWORD77__template.h

diff --git a/nsframework/framework_unified/client/include/ns_logger_additional_if.h b/service/native/framework_unified/client/include/ns_logger_additional_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/ns_logger_additional_if.h
rename to service/native/framework_unified/client/include/ns_logger_additional_if.h

diff --git a/nsframework/framework_unified/client/include/nsverutil_cmd_if.h b/service/native/framework_unified/client/include/nsverutil_cmd_if.h
similarity index 100%
rename from nsframework/framework_unified/client/include/nsverutil_cmd_if.h
rename to service/native/framework_unified/client/include/nsverutil_cmd_if.h

diff --git a/nsframework/framework_unified/client/libNS_FrameworkUnified.ver b/service/native/framework_unified/client/libNS_FrameworkUnified.ver
similarity index 100%
rename from nsframework/framework_unified/client/libNS_FrameworkUnified.ver
rename to service/native/framework_unified/client/libNS_FrameworkUnified.ver

diff --git a/power_hal/LICENSE b/service/native/log_library/LICENSE
similarity index 100%
rename from power_hal/LICENSE
rename to service/native/log_library/LICENSE

diff --git a/nsframework/log_library/Makefile.client b/service/native/log_library/Makefile.client
similarity index 100%
rename from nsframework/log_library/Makefile.client
rename to service/native/log_library/Makefile.client

diff --git a/nsframework/log_library/client/Makefile b/service/native/log_library/client/Makefile
similarity index 100%
rename from nsframework/log_library/client/Makefile
rename to service/native/log_library/client/Makefile

diff --git a/nsframework/log_library/client/include/loglibrarylog_internal.h b/service/native/log_library/client/include/loglibrarylog_internal.h
similarity index 100%
rename from nsframework/log_library/client/include/loglibrarylog_internal.h
rename to service/native/log_library/client/include/loglibrarylog_internal.h

diff --git a/nsframework/log_library/client/include/native_service/loglibrarylog_if.h b/service/native/log_library/client/include/native_service/loglibrarylog_if.h
similarity index 100%
rename from nsframework/log_library/client/include/native_service/loglibrarylog_if.h
rename to service/native/log_library/client/include/native_service/loglibrarylog_if.h

diff --git a/nsframework/log_library/client/include/native_service/loglibrarylog_library.h b/service/native/log_library/client/include/native_service/loglibrarylog_library.h
similarity index 100%
rename from nsframework/log_library/client/include/native_service/loglibrarylog_library.h
rename to service/native/log_library/client/include/native_service/loglibrarylog_library.h

diff --git a/nsframework/log_library/client/src/loglibrarylog.c b/service/native/log_library/client/src/loglibrarylog.c
similarity index 100%
rename from nsframework/log_library/client/src/loglibrarylog.c
rename to service/native/log_library/client/src/loglibrarylog.c

diff --git a/nsframework/native_service.mk b/service/native/native_service.mk
similarity index 100%
rename from nsframework/native_service.mk
rename to service/native/native_service.mk

diff --git a/security_hal/LICENSE b/service/native/notification_persistent_service/LICENSE
similarity index 100%
rename from security_hal/LICENSE
rename to service/native/notification_persistent_service/LICENSE

diff --git a/nsframework/notification_persistent_service/Makefile.server b/service/native/notification_persistent_service/Makefile.server
similarity index 100%
rename from nsframework/notification_persistent_service/Makefile.server
rename to service/native/notification_persistent_service/Makefile.server

diff --git a/nsframework/notification_persistent_service/server/Makefile b/service/native/notification_persistent_service/server/Makefile
similarity index 100%
rename from nsframework/notification_persistent_service/server/Makefile
rename to service/native/notification_persistent_service/server/Makefile

diff --git a/nsframework/notification_persistent_service/server/include/app_states.h b/service/native/notification_persistent_service/server/include/app_states.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/app_states.h
rename to service/native/notification_persistent_service/server/include/app_states.h

diff --git a/nsframework/notification_persistent_service/server/include/native_service/notification_persistent_service.h b/service/native/notification_persistent_service/server/include/native_service/notification_persistent_service.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/native_service/notification_persistent_service.h
rename to service/native/notification_persistent_service/server/include/native_service/notification_persistent_service.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp.h b/service/native/notification_persistent_service/server/include/ns_npp.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp.h
rename to service/native/notification_persistent_service/server/include/ns_npp.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_binary_accesser.h b/service/native/notification_persistent_service/server/include/ns_npp_binary_accesser.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_binary_accesser.h
rename to service/native/notification_persistent_service/server/include/ns_npp_binary_accesser.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_copy_worker.h b/service/native/notification_persistent_service/server/include/ns_npp_copy_worker.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_copy_worker.h
rename to service/native/notification_persistent_service/server/include/ns_npp_copy_worker.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_fs_directory.h b/service/native/notification_persistent_service/server/include/ns_npp_fs_directory.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_fs_directory.h
rename to service/native/notification_persistent_service/server/include/ns_npp_fs_directory.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_handlelist.h b/service/native/notification_persistent_service/server/include/ns_npp_handlelist.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_handlelist.h
rename to service/native/notification_persistent_service/server/include/ns_npp_handlelist.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h b/service/native/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h
rename to service/native/notification_persistent_service/server/include/ns_npp_nor_persistence_worker_thread.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_notification.h b/service/native/notification_persistent_service/server/include/ns_npp_notification.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_notification.h
rename to service/native/notification_persistent_service/server/include/ns_npp_notification.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_notification_manager.h b/service/native/notification_persistent_service/server/include/ns_npp_notification_manager.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_notification_manager.h
rename to service/native/notification_persistent_service/server/include/ns_npp_notification_manager.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_notification_receiver.h b/service/native/notification_persistent_service/server/include/ns_npp_notification_receiver.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_notification_receiver.h
rename to service/native/notification_persistent_service/server/include/ns_npp_notification_receiver.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h b/service/native/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h
rename to service/native/notification_persistent_service/server/include/ns_npp_notificationpersistentservicelog.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_persist_file.h b/service/native/notification_persistent_service/server/include/ns_npp_persist_file.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_persist_file.h
rename to service/native/notification_persistent_service/server/include/ns_npp_persist_file.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_persist_folder.h b/service/native/notification_persistent_service/server/include/ns_npp_persist_folder.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_persist_folder.h
rename to service/native/notification_persistent_service/server/include/ns_npp_persist_folder.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_persistence.h b/service/native/notification_persistent_service/server/include/ns_npp_persistence.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_persistence.h
rename to service/native/notification_persistent_service/server/include/ns_npp_persistence.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_persistence_manager.h b/service/native/notification_persistent_service/server/include/ns_npp_persistence_manager.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_persistence_manager.h
rename to service/native/notification_persistent_service/server/include/ns_npp_persistence_manager.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_persistent_accesser.h b/service/native/notification_persistent_service/server/include/ns_npp_persistent_accesser.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_persistent_accesser.h
rename to service/native/notification_persistent_service/server/include/ns_npp_persistent_accesser.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_persistent_data.h b/service/native/notification_persistent_service/server/include/ns_npp_persistent_data.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_persistent_data.h
rename to service/native/notification_persistent_service/server/include/ns_npp_persistent_data.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_personality.h b/service/native/notification_persistent_service/server/include/ns_npp_personality.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_personality.h
rename to service/native/notification_persistent_service/server/include/ns_npp_personality.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_personalization_manager.h b/service/native/notification_persistent_service/server/include/ns_npp_personalization_manager.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_personalization_manager.h
rename to service/native/notification_persistent_service/server/include/ns_npp_personalization_manager.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h b/service/native/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h
rename to service/native/notification_persistent_service/server/include/ns_npp_profiling_protocols_internal.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_registry_entry.h b/service/native/notification_persistent_service/server/include/ns_npp_registry_entry.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_registry_entry.h
rename to service/native/notification_persistent_service/server/include/ns_npp_registry_entry.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_regular_notification.h b/service/native/notification_persistent_service/server/include/ns_npp_regular_notification.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_regular_notification.h
rename to service/native/notification_persistent_service/server/include/ns_npp_regular_notification.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h b/service/native/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h
rename to service/native/notification_persistent_service/server/include/ns_npp_state_nor_persistence_notification.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_state_notification.h b/service/native/notification_persistent_service/server/include/ns_npp_state_notification.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_state_notification.h
rename to service/native/notification_persistent_service/server/include/ns_npp_state_notification.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h b/service/native/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h
rename to service/native/notification_persistent_service/server/include/ns_npp_state_persistence_notification.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h b/service/native/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h
rename to service/native/notification_persistent_service/server/include/ns_npp_state_persistence_user_notification.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_threads.h b/service/native/notification_persistent_service/server/include/ns_npp_threads.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_threads.h
rename to service/native/notification_persistent_service/server/include/ns_npp_threads.h

diff --git a/nsframework/notification_persistent_service/server/include/ns_npp_types.h b/service/native/notification_persistent_service/server/include/ns_npp_types.h
similarity index 100%
rename from nsframework/notification_persistent_service/server/include/ns_npp_types.h
rename to service/native/notification_persistent_service/server/include/ns_npp_types.h

diff --git a/nsframework/notification_persistent_service/server/src/app_states.cpp b/service/native/notification_persistent_service/server/src/app_states.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/app_states.cpp
rename to service/native/notification_persistent_service/server/src/app_states.cpp

diff --git a/nsframework/notification_persistent_service/server/src/notificationpersistentservice_application.cpp b/service/native/notification_persistent_service/server/src/notificationpersistentservice_application.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/notificationpersistentservice_application.cpp
rename to service/native/notification_persistent_service/server/src/notificationpersistentservice_application.cpp

diff --git a/nsframework/notification_persistent_service/server/src/notificationpersistentservice_main.cpp b/service/native/notification_persistent_service/server/src/notificationpersistentservice_main.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/notificationpersistentservice_main.cpp
rename to service/native/notification_persistent_service/server/src/notificationpersistentservice_main.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp.cpp b/service/native/notification_persistent_service/server/src/ns_npp.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_archive.cpp b/service/native/notification_persistent_service/server/src/ns_npp_archive.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_archive.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_archive.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp b/service/native/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_binary_accesser.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_copy_worker.cpp b/service/native/notification_persistent_service/server/src/ns_npp_copy_worker.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_copy_worker.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_copy_worker.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_fs_directory.cpp b/service/native/notification_persistent_service/server/src/ns_npp_fs_directory.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_fs_directory.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_fs_directory.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_handlelist.cpp b/service/native/notification_persistent_service/server/src/ns_npp_handlelist.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_handlelist.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_handlelist.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp b/service/native/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_nor_persistence_worker_thread.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_notification.cpp b/service/native/notification_persistent_service/server/src/ns_npp_notification.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_notification.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_notification.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_notification_manager.cpp b/service/native/notification_persistent_service/server/src/ns_npp_notification_manager.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_notification_manager.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_notification_manager.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp b/service/native/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_notification_receiver.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_persist_file.cpp b/service/native/notification_persistent_service/server/src/ns_npp_persist_file.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_persist_file.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_persist_file.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_persist_folder.cpp b/service/native/notification_persistent_service/server/src/ns_npp_persist_folder.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_persist_folder.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_persist_folder.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_persistence.cpp b/service/native/notification_persistent_service/server/src/ns_npp_persistence.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_persistence.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_persistence.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp b/service/native/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_persistence_manager.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_persistent_data.cpp b/service/native/notification_persistent_service/server/src/ns_npp_persistent_data.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_persistent_data.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_persistent_data.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp b/service/native/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_personalization_manager.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_registry_entry.cpp b/service/native/notification_persistent_service/server/src/ns_npp_registry_entry.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_registry_entry.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_registry_entry.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_regular_notification.cpp b/service/native/notification_persistent_service/server/src/ns_npp_regular_notification.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_regular_notification.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_regular_notification.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp b/service/native/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_state_nor_persistence_notification.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_state_notification.cpp b/service/native/notification_persistent_service/server/src/ns_npp_state_notification.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_state_notification.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_state_notification.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp b/service/native/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_state_persistence_notification.cpp

diff --git a/nsframework/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp b/service/native/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp
similarity index 100%
rename from nsframework/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp
rename to service/native/notification_persistent_service/server/src/ns_npp_state_persistence_user_notification.cpp

diff --git a/soc_temperature_hal/LICENSE b/service/other/event_library/LICENSE
similarity index 100%
rename from soc_temperature_hal/LICENSE
rename to service/other/event_library/LICENSE

diff --git a/otherservice/event_library/Makefile.client b/service/other/event_library/Makefile.client
similarity index 100%
rename from otherservice/event_library/Makefile.client
rename to service/other/event_library/Makefile.client

diff --git a/otherservice/event_library/library/Makefile b/service/other/event_library/library/Makefile
similarity index 100%
rename from otherservice/event_library/library/Makefile
rename to service/other/event_library/library/Makefile

diff --git a/otherservice/event_library/library/include/other_service/ev_lib.h b/service/other/event_library/library/include/other_service/ev_lib.h
similarity index 100%
rename from otherservice/event_library/library/include/other_service/ev_lib.h
rename to service/other/event_library/library/include/other_service/ev_lib.h

diff --git a/otherservice/event_library/library/include/other_service/event_library.h b/service/other/event_library/library/include/other_service/event_library.h
similarity index 100%
rename from otherservice/event_library/library/include/other_service/event_library.h
rename to service/other/event_library/library/include/other_service/event_library.h

diff --git a/otherservice/event_library/library/libev.ver b/service/other/event_library/library/libev.ver
similarity index 100%
rename from otherservice/event_library/library/libev.ver
rename to service/other/event_library/library/libev.ver

diff --git a/otherservice/event_library/library/src/ev_lib.c b/service/other/event_library/library/src/ev_lib.c
similarity index 100%
rename from otherservice/event_library/library/src/ev_lib.c
rename to service/other/event_library/library/src/ev_lib.c

diff --git a/otherservice/other_service.mk b/service/other/other_service.mk
similarity index 100%
rename from otherservice/other_service.mk
rename to service/other/other_service.mk

diff --git a/systemservice/config/LICENSE b/service/other/posix_based_os001_legacy_library/LICENSE
similarity index 100%
rename from systemservice/config/LICENSE
rename to service/other/posix_based_os001_legacy_library/LICENSE

diff --git a/otherservice/posix_based_os001_legacy_library/Makefile.client b/service/other/posix_based_os001_legacy_library/Makefile.client
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/Makefile.client
rename to service/other/posix_based_os001_legacy_library/Makefile.client

diff --git a/otherservice/posix_based_os001_legacy_library/library/Makefile b/service/other/posix_based_os001_legacy_library/library/Makefile
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/Makefile
rename to service/other/posix_based_os001_legacy_library/library/Makefile

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001ClockCycleApi.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001ClockCycleApi.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001ClockCycleApi.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001ClockCycleApi.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001TimeApi.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001TimeApi.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001TimeApi.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/PosixBasedOS001TimeApi.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/itoa.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/itoa.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/itoa.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/itoa.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/posix_based_os001_legacy_library.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/posix_based_os001_legacy_library.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/posix_based_os001_legacy_library.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/posix_based_os001_legacy_library.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/strlcat.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/strlcat.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/strlcat.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/strlcat.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/strlcpy.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/strlcpy.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/strlcpy.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/strlcpy.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/include/other_service/ultoa.h b/service/other/posix_based_os001_legacy_library/library/include/other_service/ultoa.h
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/include/other_service/ultoa.h
rename to service/other/posix_based_os001_legacy_library/library/include/other_service/ultoa.h

diff --git a/otherservice/posix_based_os001_legacy_library/library/src/PosixBasedOS001ClockCycleApi.c b/service/other/posix_based_os001_legacy_library/library/src/PosixBasedOS001ClockCycleApi.c
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/src/PosixBasedOS001ClockCycleApi.c
rename to service/other/posix_based_os001_legacy_library/library/src/PosixBasedOS001ClockCycleApi.c

diff --git a/otherservice/posix_based_os001_legacy_library/library/src/PosixBasedOS001TimeApi.c b/service/other/posix_based_os001_legacy_library/library/src/PosixBasedOS001TimeApi.c
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/src/PosixBasedOS001TimeApi.c
rename to service/other/posix_based_os001_legacy_library/library/src/PosixBasedOS001TimeApi.c

diff --git a/otherservice/posix_based_os001_legacy_library/library/src/itoa.c b/service/other/posix_based_os001_legacy_library/library/src/itoa.c
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/src/itoa.c
rename to service/other/posix_based_os001_legacy_library/library/src/itoa.c

diff --git a/otherservice/posix_based_os001_legacy_library/library/src/strlcat.c b/service/other/posix_based_os001_legacy_library/library/src/strlcat.c
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/src/strlcat.c
rename to service/other/posix_based_os001_legacy_library/library/src/strlcat.c

diff --git a/otherservice/posix_based_os001_legacy_library/library/src/strlcpy.c b/service/other/posix_based_os001_legacy_library/library/src/strlcpy.c
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/src/strlcpy.c
rename to service/other/posix_based_os001_legacy_library/library/src/strlcpy.c

diff --git a/otherservice/posix_based_os001_legacy_library/library/src/ultoa.c b/service/other/posix_based_os001_legacy_library/library/src/ultoa.c
similarity index 100%
rename from otherservice/posix_based_os001_legacy_library/library/src/ultoa.c
rename to service/other/posix_based_os001_legacy_library/library/src/ultoa.c

diff --git a/systemservice/interface_unified/LICENSE b/service/other/rpc_library/LICENSE
similarity index 100%
rename from systemservice/interface_unified/LICENSE
rename to service/other/rpc_library/LICENSE

diff --git a/otherservice/rpc_library/Makefile.client b/service/other/rpc_library/Makefile.client
similarity index 100%
rename from otherservice/rpc_library/Makefile.client
rename to service/other/rpc_library/Makefile.client

diff --git a/otherservice/rpc_library/library/Makefile b/service/other/rpc_library/library/Makefile
similarity index 100%
rename from otherservice/rpc_library/library/Makefile
rename to service/other/rpc_library/library/Makefile

diff --git a/otherservice/rpc_library/library/include/other_service/rpc.h b/service/other/rpc_library/library/include/other_service/rpc.h
similarity index 100%
rename from otherservice/rpc_library/library/include/other_service/rpc.h
rename to service/other/rpc_library/library/include/other_service/rpc.h

diff --git a/otherservice/rpc_library/library/include/other_service/rpc_id.h b/service/other/rpc_library/library/include/other_service/rpc_id.h
similarity index 100%
rename from otherservice/rpc_library/library/include/other_service/rpc_id.h
rename to service/other/rpc_library/library/include/other_service/rpc_id.h

diff --git a/otherservice/rpc_library/library/include/other_service/rpc_library.h b/service/other/rpc_library/library/include/other_service/rpc_library.h
similarity index 100%
rename from otherservice/rpc_library/library/include/other_service/rpc_library.h
rename to service/other/rpc_library/library/include/other_service/rpc_library.h

diff --git a/otherservice/rpc_library/library/include/rpc_internal.h b/service/other/rpc_library/library/include/rpc_internal.h
similarity index 100%
rename from otherservice/rpc_library/library/include/rpc_internal.h
rename to service/other/rpc_library/library/include/rpc_internal.h

diff --git a/otherservice/rpc_library/library/include/rpc_thread.h b/service/other/rpc_library/library/include/rpc_thread.h
similarity index 100%
rename from otherservice/rpc_library/library/include/rpc_thread.h
rename to service/other/rpc_library/library/include/rpc_thread.h

diff --git a/otherservice/rpc_library/library/include/rpc_udp.h b/service/other/rpc_library/library/include/rpc_udp.h
similarity index 100%
rename from otherservice/rpc_library/library/include/rpc_udp.h
rename to service/other/rpc_library/library/include/rpc_udp.h

diff --git a/otherservice/rpc_library/library/librpc.ver b/service/other/rpc_library/library/librpc.ver
similarity index 100%
rename from otherservice/rpc_library/library/librpc.ver
rename to service/other/rpc_library/library/librpc.ver

diff --git a/otherservice/rpc_library/library/src/rpc_event.c b/service/other/rpc_library/library/src/rpc_event.c
similarity index 100%
rename from otherservice/rpc_library/library/src/rpc_event.c
rename to service/other/rpc_library/library/src/rpc_event.c

diff --git a/otherservice/rpc_library/library/src/rpc_lib.c b/service/other/rpc_library/library/src/rpc_lib.c
similarity index 100%
rename from otherservice/rpc_library/library/src/rpc_lib.c
rename to service/other/rpc_library/library/src/rpc_lib.c

diff --git a/otherservice/rpc_library/library/src/rpc_marshall.c b/service/other/rpc_library/library/src/rpc_marshall.c
similarity index 100%
rename from otherservice/rpc_library/library/src/rpc_marshall.c
rename to service/other/rpc_library/library/src/rpc_marshall.c

diff --git a/otherservice/rpc_library/library/src/rpc_thread.c b/service/other/rpc_library/library/src/rpc_thread.c
similarity index 100%
rename from otherservice/rpc_library/library/src/rpc_thread.c
rename to service/other/rpc_library/library/src/rpc_thread.c

diff --git a/otherservice/rpc_library/library/src/rpc_udp.c b/service/other/rpc_library/library/src/rpc_udp.c
similarity index 100%
rename from otherservice/rpc_library/library/src/rpc_udp.c
rename to service/other/rpc_library/library/src/rpc_udp.c

diff --git a/otherservice/rpc_library/tool/Makefile b/service/other/rpc_library/tool/Makefile
similarity index 100%
rename from otherservice/rpc_library/tool/Makefile
rename to service/other/rpc_library/tool/Makefile

diff --git a/otherservice/rpc_library/tool/apidef.cc b/service/other/rpc_library/tool/apidef.cc
similarity index 100%
rename from otherservice/rpc_library/tool/apidef.cc
rename to service/other/rpc_library/tool/apidef.cc

diff --git a/otherservice/rpc_library/tool/apidef.h b/service/other/rpc_library/tool/apidef.h
similarity index 100%
rename from otherservice/rpc_library/tool/apidef.h
rename to service/other/rpc_library/tool/apidef.h

diff --git a/otherservice/rpc_library/tool/apidef.l b/service/other/rpc_library/tool/apidef.l
similarity index 100%
rename from otherservice/rpc_library/tool/apidef.l
rename to service/other/rpc_library/tool/apidef.l

diff --git a/otherservice/rpc_library/tool/apidef.y b/service/other/rpc_library/tool/apidef.y
similarity index 100%
rename from otherservice/rpc_library/tool/apidef.y
rename to service/other/rpc_library/tool/apidef.y

diff --git a/otherservice/rpc_library/tool_for_arm/Makefile b/service/other/rpc_library/tool_for_arm/Makefile
similarity index 100%
rename from otherservice/rpc_library/tool_for_arm/Makefile
rename to service/other/rpc_library/tool_for_arm/Makefile

diff --git a/systemservice/logger_service/LICENSE b/service/other/vehicle_parameter_library/LICENSE
similarity index 100%
rename from systemservice/logger_service/LICENSE
rename to service/other/vehicle_parameter_library/LICENSE

diff --git a/otherservice/vehicle_parameter_library/Makefile.client b/service/other/vehicle_parameter_library/Makefile.client
similarity index 100%
rename from otherservice/vehicle_parameter_library/Makefile.client
rename to service/other/vehicle_parameter_library/Makefile.client

diff --git a/otherservice/vehicle_parameter_library/library/Makefile b/service/other/vehicle_parameter_library/library/Makefile
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/Makefile
rename to service/other/vehicle_parameter_library/library/Makefile

diff --git a/otherservice/vehicle_parameter_library/library/include/VP_FuncCheck_CanRcv_private.h b/service/other/vehicle_parameter_library/library/include/VP_FuncCheck_CanRcv_private.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/VP_FuncCheck_CanRcv_private.h
rename to service/other/vehicle_parameter_library/library/include/VP_FuncCheck_CanRcv_private.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/VP_FuncCheck_CanRcv.h b/service/other/vehicle_parameter_library/library/include/other_service/VP_FuncCheck_CanRcv.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/VP_FuncCheck_CanRcv.h
rename to service/other/vehicle_parameter_library/library/include/other_service/VP_FuncCheck_CanRcv.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/VP_GetEnv.h b/service/other/vehicle_parameter_library/library/include/other_service/VP_GetEnv.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/VP_GetEnv.h
rename to service/other/vehicle_parameter_library/library/include/other_service/VP_GetEnv.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/env_ext.h b/service/other/vehicle_parameter_library/library/include/other_service/env_ext.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/env_ext.h
rename to service/other/vehicle_parameter_library/library/include/other_service/env_ext.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/env_vehicle.h b/service/other/vehicle_parameter_library/library/include/other_service/env_vehicle.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/env_vehicle.h
rename to service/other/vehicle_parameter_library/library/include/other_service/env_vehicle.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary.h b/service/other/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary.h
rename to service/other/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary_serial.h b/service/other/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary_serial.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary_serial.h
rename to service/other/vehicle_parameter_library/library/include/other_service/env_vehicleparameterlibrary_serial.h

diff --git a/otherservice/vehicle_parameter_library/library/include/other_service/vehicle_parameter_library.h b/service/other/vehicle_parameter_library/library/include/other_service/vehicle_parameter_library.h
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/include/other_service/vehicle_parameter_library.h
rename to service/other/vehicle_parameter_library/library/include/other_service/vehicle_parameter_library.h

diff --git a/otherservice/vehicle_parameter_library/library/src/VP_FuncCheck_CanRcv.c b/service/other/vehicle_parameter_library/library/src/VP_FuncCheck_CanRcv.c
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/src/VP_FuncCheck_CanRcv.c
rename to service/other/vehicle_parameter_library/library/src/VP_FuncCheck_CanRcv.c

diff --git a/otherservice/vehicle_parameter_library/library/src/VP_GetEnv.c b/service/other/vehicle_parameter_library/library/src/VP_GetEnv.c
similarity index 100%
rename from otherservice/vehicle_parameter_library/library/src/VP_GetEnv.c
rename to service/other/vehicle_parameter_library/library/src/VP_GetEnv.c

diff --git a/peripheralservice/.gitattributes b/service/peripheral/.gitattributes
similarity index 100%
rename from peripheralservice/.gitattributes
rename to service/peripheral/.gitattributes

diff --git a/systemservice/power_service/LICENSE b/service/peripheral/communication/LICENSE
similarity index 100%
rename from systemservice/power_service/LICENSE
rename to service/peripheral/communication/LICENSE

diff --git a/peripheralservice/communication/Makefile.client b/service/peripheral/communication/Makefile.client
similarity index 100%
rename from peripheralservice/communication/Makefile.client
rename to service/peripheral/communication/Makefile.client

diff --git a/peripheralservice/communication/Makefile.server b/service/peripheral/communication/Makefile.server
similarity index 100%
rename from peripheralservice/communication/Makefile.server
rename to service/peripheral/communication/Makefile.server

diff --git a/peripheralservice/communication/client_can/Makefile b/service/peripheral/communication/client_can/Makefile
similarity index 100%
rename from peripheralservice/communication/client_can/Makefile
rename to service/peripheral/communication/client_can/Makefile

diff --git a/peripheralservice/communication/client_can/include/API_Local_Common.h b/service/peripheral/communication/client_can/include/API_Local_Common.h
similarity index 100%
rename from peripheralservice/communication/client_can/include/API_Local_Common.h
rename to service/peripheral/communication/client_can/include/API_Local_Common.h

diff --git a/peripheralservice/communication/client_can/include/Canif_API_Local.h b/service/peripheral/communication/client_can/include/Canif_API_Local.h
similarity index 100%
rename from peripheralservice/communication/client_can/include/Canif_API_Local.h
rename to service/peripheral/communication/client_can/include/Canif_API_Local.h

diff --git a/peripheralservice/communication/client_can/include/Canif_TransmissionData.h b/service/peripheral/communication/client_can/include/Canif_TransmissionData.h
similarity index 100%
rename from peripheralservice/communication/client_can/include/Canif_TransmissionData.h
rename to service/peripheral/communication/client_can/include/Canif_TransmissionData.h

diff --git a/peripheralservice/communication/client_can/include/Canif_TransmissionData21PF.h b/service/peripheral/communication/client_can/include/Canif_TransmissionData21PF.h
similarity index 100%
rename from peripheralservice/communication/client_can/include/Canif_TransmissionData21PF.h
rename to service/peripheral/communication/client_can/include/Canif_TransmissionData21PF.h

diff --git a/peripheralservice/communication/client_can/include/peripheral_service/Canif_API.h b/service/peripheral/communication/client_can/include/peripheral_service/Canif_API.h
similarity index 100%
rename from peripheralservice/communication/client_can/include/peripheral_service/Canif_API.h
rename to service/peripheral/communication/client_can/include/peripheral_service/Canif_API.h

diff --git a/peripheralservice/communication/client_can/include/peripheral_service/communication_can.h b/service/peripheral/communication/client_can/include/peripheral_service/communication_can.h
similarity index 100%
rename from peripheralservice/communication/client_can/include/peripheral_service/communication_can.h
rename to service/peripheral/communication/client_can/include/peripheral_service/communication_can.h

diff --git a/peripheralservice/communication/client_can/libCAN_API.ver b/service/peripheral/communication/client_can/libCAN_API.ver
similarity index 100%
rename from peripheralservice/communication/client_can/libCAN_API.ver
rename to service/peripheral/communication/client_can/libCAN_API.ver

diff --git a/peripheralservice/communication/client_can/src/Canif_API.cpp b/service/peripheral/communication/client_can/src/Canif_API.cpp
similarity index 100%
rename from peripheralservice/communication/client_can/src/Canif_API.cpp
rename to service/peripheral/communication/client_can/src/Canif_API.cpp

diff --git a/peripheralservice/communication/server/Makefile b/service/peripheral/communication/server/Makefile
similarity index 100%
rename from peripheralservice/communication/server/Makefile
rename to service/peripheral/communication/server/Makefile

diff --git a/peripheralservice/communication/server/include/CAN/CommWatch/CAN_CommWatch.h b/service/peripheral/communication/server/include/CAN/CommWatch/CAN_CommWatch.h
similarity index 100%
rename from peripheralservice/communication/server/include/CAN/CommWatch/CAN_CommWatch.h
rename to service/peripheral/communication/server/include/CAN/CommWatch/CAN_CommWatch.h

diff --git a/peripheralservice/communication/server/include/CAN/CommWatch/CommWatchCommon.h b/service/peripheral/communication/server/include/CAN/CommWatch/CommWatchCommon.h
similarity index 100%
rename from peripheralservice/communication/server/include/CAN/CommWatch/CommWatchCommon.h
rename to service/peripheral/communication/server/include/CAN/CommWatch/CommWatchCommon.h

diff --git a/peripheralservice/communication/server/include/CAN/Command/CAN_Command.h b/service/peripheral/communication/server/include/CAN/Command/CAN_Command.h
similarity index 100%
rename from peripheralservice/communication/server/include/CAN/Command/CAN_Command.h
rename to service/peripheral/communication/server/include/CAN/Command/CAN_Command.h

diff --git a/peripheralservice/communication/server/include/CAN/Delivery/CAN_Delivery.h b/service/peripheral/communication/server/include/CAN/Delivery/CAN_Delivery.h
similarity index 100%
rename from peripheralservice/communication/server/include/CAN/Delivery/CAN_Delivery.h
rename to service/peripheral/communication/server/include/CAN/Delivery/CAN_Delivery.h

diff --git a/peripheralservice/communication/server/include/CAN/Delivery/CAN_DeliveryData.h b/service/peripheral/communication/server/include/CAN/Delivery/CAN_DeliveryData.h
similarity index 100%
rename from peripheralservice/communication/server/include/CAN/Delivery/CAN_DeliveryData.h
rename to service/peripheral/communication/server/include/CAN/Delivery/CAN_DeliveryData.h

diff --git a/peripheralservice/communication/server/include/CAN/TxMsg/CAN_TxMsg.h b/service/peripheral/communication/server/include/CAN/TxMsg/CAN_TxMsg.h
similarity index 100%
rename from peripheralservice/communication/server/include/CAN/TxMsg/CAN_TxMsg.h
rename to service/peripheral/communication/server/include/CAN/TxMsg/CAN_TxMsg.h

diff --git a/peripheralservice/communication/server/include/com_error_type.h b/service/peripheral/communication/server/include/com_error_type.h
similarity index 100%
rename from peripheralservice/communication/server/include/com_error_type.h
rename to service/peripheral/communication/server/include/com_error_type.h

diff --git a/peripheralservice/communication/server/include/main/communication_cid.h b/service/peripheral/communication/server/include/main/communication_cid.h
similarity index 100%
rename from peripheralservice/communication/server/include/main/communication_cid.h
rename to service/peripheral/communication/server/include/main/communication_cid.h

diff --git a/peripheralservice/communication/server/include/main/communication_communicationlog.h b/service/peripheral/communication/server/include/main/communication_communicationlog.h
similarity index 100%
rename from peripheralservice/communication/server/include/main/communication_communicationlog.h
rename to service/peripheral/communication/server/include/main/communication_communicationlog.h

diff --git a/peripheralservice/communication/server/include/main/communication_version.h b/service/peripheral/communication/server/include/main/communication_version.h
similarity index 100%
rename from peripheralservice/communication/server/include/main/communication_version.h
rename to service/peripheral/communication/server/include/main/communication_version.h

diff --git a/peripheralservice/communication/server/include/peripheral_service/communication.h b/service/peripheral/communication/server/include/peripheral_service/communication.h
similarity index 100%
rename from peripheralservice/communication/server/include/peripheral_service/communication.h
rename to service/peripheral/communication/server/include/peripheral_service/communication.h

diff --git a/peripheralservice/communication/server/include/peripheral_service/communication_notifications.h b/service/peripheral/communication/server/include/peripheral_service/communication_notifications.h
similarity index 100%
rename from peripheralservice/communication/server/include/peripheral_service/communication_notifications.h
rename to service/peripheral/communication/server/include/peripheral_service/communication_notifications.h

diff --git a/peripheralservice/communication/server/include/peripheral_service/ps_services.h b/service/peripheral/communication/server/include/peripheral_service/ps_services.h
similarity index 100%
rename from peripheralservice/communication/server/include/peripheral_service/ps_services.h
rename to service/peripheral/communication/server/include/peripheral_service/ps_services.h

diff --git a/peripheralservice/communication/server/include/threads/CAN_Thread.h b/service/peripheral/communication/server/include/threads/CAN_Thread.h
similarity index 100%
rename from peripheralservice/communication/server/include/threads/CAN_Thread.h
rename to service/peripheral/communication/server/include/threads/CAN_Thread.h

diff --git a/peripheralservice/communication/server/include/threads/Thread_Common.h b/service/peripheral/communication/server/include/threads/Thread_Common.h
similarity index 100%
rename from peripheralservice/communication/server/include/threads/Thread_Common.h
rename to service/peripheral/communication/server/include/threads/Thread_Common.h

diff --git a/peripheralservice/communication/server/src/CAN/CommWatch/CAN_CommWatch.cpp b/service/peripheral/communication/server/src/CAN/CommWatch/CAN_CommWatch.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/CAN/CommWatch/CAN_CommWatch.cpp
rename to service/peripheral/communication/server/src/CAN/CommWatch/CAN_CommWatch.cpp

diff --git a/peripheralservice/communication/server/src/CAN/Delivery/CAN_Delivery.cpp b/service/peripheral/communication/server/src/CAN/Delivery/CAN_Delivery.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/CAN/Delivery/CAN_Delivery.cpp
rename to service/peripheral/communication/server/src/CAN/Delivery/CAN_Delivery.cpp

diff --git a/peripheralservice/communication/server/src/CAN/TxMsg/CAN_TxMsg.cpp b/service/peripheral/communication/server/src/CAN/TxMsg/CAN_TxMsg.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/CAN/TxMsg/CAN_TxMsg.cpp
rename to service/peripheral/communication/server/src/CAN/TxMsg/CAN_TxMsg.cpp

diff --git a/peripheralservice/communication/server/src/main/communication_application.cpp b/service/peripheral/communication/server/src/main/communication_application.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/main/communication_application.cpp
rename to service/peripheral/communication/server/src/main/communication_application.cpp

diff --git a/peripheralservice/communication/server/src/main/communication_main.cpp b/service/peripheral/communication/server/src/main/communication_main.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/main/communication_main.cpp
rename to service/peripheral/communication/server/src/main/communication_main.cpp

diff --git a/peripheralservice/communication/server/src/threads/CAN_Thread.cpp b/service/peripheral/communication/server/src/threads/CAN_Thread.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/threads/CAN_Thread.cpp
rename to service/peripheral/communication/server/src/threads/CAN_Thread.cpp

diff --git a/peripheralservice/communication/server/src/threads/Thread_Common.cpp b/service/peripheral/communication/server/src/threads/Thread_Common.cpp
similarity index 100%
rename from peripheralservice/communication/server/src/threads/Thread_Common.cpp
rename to service/peripheral/communication/server/src/threads/Thread_Common.cpp

diff --git a/peripheralservice/peripheral_service.mk b/service/peripheral/peripheral_service.mk
similarity index 100%
rename from peripheralservice/peripheral_service.mk
rename to service/peripheral/peripheral_service.mk

diff --git a/systemservice/resource_manager/LICENSE b/service/system/config/LICENSE
similarity index 100%
rename from systemservice/resource_manager/LICENSE
rename to service/system/config/LICENSE

diff --git a/systemservice/config/Makefile.client b/service/system/config/Makefile.client
similarity index 100%
rename from systemservice/config/Makefile.client
rename to service/system/config/Makefile.client

diff --git a/systemservice/config/library/Makefile b/service/system/config/library/Makefile
similarity index 100%
rename from systemservice/config/library/Makefile
rename to service/system/config/library/Makefile

diff --git a/systemservice/config/library/system_manager_config/Makefile b/service/system/config/library/system_manager_config/Makefile
similarity index 100%
rename from systemservice/config/library/system_manager_config/Makefile
rename to service/system/config/library/system_manager_config/Makefile

diff --git a/systemservice/config/library/system_manager_config/include/system_service/ss_access_if_private.h b/service/system/config/library/system_manager_config/include/system_service/ss_access_if_private.h
similarity index 100%
rename from systemservice/config/library/system_manager_config/include/system_service/ss_access_if_private.h
rename to service/system/config/library/system_manager_config/include/system_service/ss_access_if_private.h

diff --git a/systemservice/config/library/system_manager_config/include/system_service/ss_package.h b/service/system/config/library/system_manager_config/include/system_service/ss_package.h
similarity index 100%
rename from systemservice/config/library/system_manager_config/include/system_service/ss_package.h
rename to service/system/config/library/system_manager_config/include/system_service/ss_package.h

diff --git a/systemservice/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h b/service/system/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h
similarity index 100%
rename from systemservice/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h
rename to service/system/config/library/system_manager_config/include/system_service/ss_system_manager_conf.h

diff --git a/systemservice/config/library/system_manager_config/include/system_service/system_manager_config.h b/service/system/config/library/system_manager_config/include/system_service/system_manager_config.h
similarity index 100%
rename from systemservice/config/library/system_manager_config/include/system_service/system_manager_config.h
rename to service/system/config/library/system_manager_config/include/system_service/system_manager_config.h

diff --git a/systemservice/config/library/system_manager_config/last2order/Makefile b/service/system/config/library/system_manager_config/last2order/Makefile
similarity index 100%
rename from systemservice/config/library/system_manager_config/last2order/Makefile
rename to service/system/config/library/system_manager_config/last2order/Makefile

diff --git a/systemservice/config/library/system_manager_config/last2order/sm_last2order.cfo b/service/system/config/library/system_manager_config/last2order/sm_last2order.cfo
similarity index 100%
rename from systemservice/config/library/system_manager_config/last2order/sm_last2order.cfo
rename to service/system/config/library/system_manager_config/last2order/sm_last2order.cfo

diff --git a/systemservice/config/library/system_manager_config/last2order/tool/mklast2ordertbl.pl b/service/system/config/library/system_manager_config/last2order/tool/mklast2ordertbl.pl
similarity index 100%
rename from systemservice/config/library/system_manager_config/last2order/tool/mklast2ordertbl.pl
rename to service/system/config/library/system_manager_config/last2order/tool/mklast2ordertbl.pl

diff --git a/systemservice/config/library/system_manager_config/order/Makefile b/service/system/config/library/system_manager_config/order/Makefile
similarity index 100%
rename from systemservice/config/library/system_manager_config/order/Makefile
rename to service/system/config/library/system_manager_config/order/Makefile

diff --git a/systemservice/config/library/system_manager_config/order/launch_order_body.xml b/service/system/config/library/system_manager_config/order/launch_order_body.xml
similarity index 100%
rename from systemservice/config/library/system_manager_config/order/launch_order_body.xml
rename to service/system/config/library/system_manager_config/order/launch_order_body.xml

diff --git a/systemservice/config/library/system_manager_config/order/launch_order_main.xml b/service/system/config/library/system_manager_config/order/launch_order_main.xml
similarity index 100%
rename from systemservice/config/library/system_manager_config/order/launch_order_main.xml
rename to service/system/config/library/system_manager_config/order/launch_order_main.xml

diff --git a/systemservice/config/library/system_manager_config/order/launch_order_xml2cfg.pl b/service/system/config/library/system_manager_config/order/launch_order_xml2cfg.pl
similarity index 100%
rename from systemservice/config/library/system_manager_config/order/launch_order_xml2cfg.pl
rename to service/system/config/library/system_manager_config/order/launch_order_xml2cfg.pl

diff --git a/systemservice/config/library/system_manager_config/order/system_launcher_main.order.cfg b/service/system/config/library/system_manager_config/order/system_launcher_main.order.cfg
similarity index 100%
rename from systemservice/config/library/system_manager_config/order/system_launcher_main.order.cfg
rename to service/system/config/library/system_manager_config/order/system_launcher_main.order.cfg

diff --git a/systemservice/config/library/system_manager_config/order/system_launcher_main.xml b/service/system/config/library/system_manager_config/order/system_launcher_main.xml
similarity index 100%
rename from systemservice/config/library/system_manager_config/order/system_launcher_main.xml
rename to service/system/config/library/system_manager_config/order/system_launcher_main.xml

diff --git a/systemservice/config/library/system_manager_config/src/Makefile b/service/system/config/library/system_manager_config/src/Makefile
similarity index 100%
rename from systemservice/config/library/system_manager_config/src/Makefile
rename to service/system/config/library/system_manager_config/src/Makefile

diff --git a/systemservice/config/library/system_manager_config/src/libsssmcfg.ver b/service/system/config/library/system_manager_config/src/libsssmcfg.ver
similarity index 100%
rename from systemservice/config/library/system_manager_config/src/libsssmcfg.ver
rename to service/system/config/library/system_manager_config/src/libsssmcfg.ver

diff --git a/systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
similarity index 100%
rename from systemservice/config/library/system_manager_config/src/ss_system_manager_conf.cpp
rename to service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp

diff --git a/systemservice/config/library/system_manager_config/xml/Makefile b/service/system/config/library/system_manager_config/xml/Makefile
similarity index 100%
rename from systemservice/config/library/system_manager_config/xml/Makefile
rename to service/system/config/library/system_manager_config/xml/Makefile

diff --git a/systemservice/config/library/system_manager_config/xml/launch_cfg2xml.sh b/service/system/config/library/system_manager_config/xml/launch_cfg2xml.sh
similarity index 100%
rename from systemservice/config/library/system_manager_config/xml/launch_cfg2xml.sh
rename to service/system/config/library/system_manager_config/xml/launch_cfg2xml.sh

diff --git a/systemservice/config/library/system_manager_config/xml/launch_xml2cfg.sh b/service/system/config/library/system_manager_config/xml/launch_xml2cfg.sh
similarity index 100%
rename from systemservice/config/library/system_manager_config/xml/launch_xml2cfg.sh
rename to service/system/config/library/system_manager_config/xml/launch_xml2cfg.sh

diff --git a/systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg b/service/system/config/library/system_manager_config/xml/sm_launch_agl.cfg
similarity index 100%
rename from systemservice/config/library/system_manager_config/xml/sm_launch_agl.cfg
rename to service/system/config/library/system_manager_config/xml/sm_launch_agl.cfg

diff --git a/systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml b/service/system/config/library/system_manager_config/xml/sm_launch_agl.xml
similarity index 100%
rename from systemservice/config/library/system_manager_config/xml/sm_launch_agl.xml
rename to service/system/config/library/system_manager_config/xml/sm_launch_agl.xml

diff --git a/systemservice/rom_access_library/LICENSE b/service/system/interface_unified/LICENSE
similarity index 100%
rename from systemservice/rom_access_library/LICENSE
rename to service/system/interface_unified/LICENSE

diff --git a/systemservice/interface_unified/Makefile.client b/service/system/interface_unified/Makefile.client
similarity index 100%
rename from systemservice/interface_unified/Makefile.client
rename to service/system/interface_unified/Makefile.client

diff --git a/systemservice/interface_unified/library/Makefile b/service/system/interface_unified/library/Makefile
similarity index 100%
rename from systemservice/interface_unified/library/Makefile
rename to service/system/interface_unified/library/Makefile

diff --git a/systemservice/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h b/service/system/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h
similarity index 100%
rename from systemservice/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h
rename to service/system/interface_unified/library/include/ss_devicedetection_service_if_interfaceunifiedlog.h

diff --git a/systemservice/interface_unified/library/include/ss_last_to_order_local.h b/service/system/interface_unified/library/include/ss_last_to_order_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/ss_last_to_order_local.h
rename to service/system/interface_unified/library/include/ss_last_to_order_local.h

diff --git a/systemservice/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h b/service/system/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h
similarity index 100%
rename from systemservice/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h
rename to service/system/interface_unified/library/include/ss_logger_service_if_interfaceunifiedlog.h

diff --git a/systemservice/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h b/service/system/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h
similarity index 100%
rename from systemservice/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h
rename to service/system/interface_unified/library/include/ss_power_if_interfaceunifiedlog.h

diff --git a/systemservice/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h b/service/system/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h
similarity index 100%
rename from systemservice/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h
rename to service/system/interface_unified/library/include/ss_system_if_interfaceunifiedlog.h

diff --git a/systemservice/interface_unified/library/include/ss_system_timer_local.h b/service/system/interface_unified/library/include/ss_system_timer_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/ss_system_timer_local.h
rename to service/system/interface_unified/library/include/ss_system_timer_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/interface_unified.h b/service/system/interface_unified/library/include/system_service/interface_unified.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/interface_unified.h
rename to service/system/interface_unified/library/include/system_service/interface_unified.h

diff --git a/systemservice/interface_unified/library/include/system_service/interfaceunified_system_application.h b/service/system/interface_unified/library/include/system_service/interfaceunified_system_application.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/interfaceunified_system_application.h
rename to service/system/interface_unified/library/include/system_service/interfaceunified_system_application.h

diff --git a/systemservice/interface_unified/library/include/system_service/interfaceunified_system_types.h b/service/system/interface_unified/library/include/system_service/interfaceunified_system_types.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/interfaceunified_system_types.h
rename to service/system/interface_unified/library/include/system_service/interfaceunified_system_types.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_boot_map.h b/service/system/interface_unified/library/include/system_service/ss_boot_map.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_boot_map.h
rename to service/system/interface_unified/library/include/system_service/ss_boot_map.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_client_names.h b/service/system/interface_unified/library/include/system_service/ss_client_names.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_client_names.h
rename to service/system/interface_unified/library/include/system_service/ss_client_names.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_ifc.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_local.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_local.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_notifications.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_protocol.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_protocol_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_types.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_types.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_types.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_types.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h b/service/system/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h
rename to service/system/interface_unified/library/include/system_service/ss_devicedetection_service_types_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_error_event_common.h b/service/system/interface_unified/library/include/system_service/ss_error_event_common.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_error_event_common.h
rename to service/system/interface_unified/library/include/system_service/ss_error_event_common.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_error_event_common_local.h b/service/system/interface_unified/library/include/system_service/ss_error_event_common_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_error_event_common_local.h
rename to service/system/interface_unified/library/include/system_service/ss_error_event_common_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_error_message.h b/service/system/interface_unified/library/include/system_service/ss_error_message.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_error_message.h
rename to service/system/interface_unified/library/include/system_service/ss_error_message.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_heartbeat_if.h b/service/system/interface_unified/library/include/system_service/ss_heartbeat_if.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_heartbeat_if.h
rename to service/system/interface_unified/library/include/system_service/ss_heartbeat_if.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_heartbeat_notifications.h b/service/system/interface_unified/library/include/system_service/ss_heartbeat_notifications.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_heartbeat_notifications.h
rename to service/system/interface_unified/library/include/system_service/ss_heartbeat_notifications.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h b/service/system/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h
rename to service/system/interface_unified/library/include/system_service/ss_heartbeat_service_protocol.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_last_to_order.h b/service/system/interface_unified/library/include/system_service/ss_last_to_order.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_last_to_order.h
rename to service/system/interface_unified/library/include/system_service/ss_last_to_order.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_logger_service.h b/service/system/interface_unified/library/include/system_service/ss_logger_service.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_logger_service.h
rename to service/system/interface_unified/library/include/system_service/ss_logger_service.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_logger_service_ifc.h b/service/system/interface_unified/library/include/system_service/ss_logger_service_ifc.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_logger_service_ifc.h
rename to service/system/interface_unified/library/include/system_service/ss_logger_service_ifc.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_logger_service_local.h b/service/system/interface_unified/library/include/system_service/ss_logger_service_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_logger_service_local.h
rename to service/system/interface_unified/library/include/system_service/ss_logger_service_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_logger_service_notifications.h b/service/system/interface_unified/library/include/system_service/ss_logger_service_notifications.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_logger_service_notifications.h
rename to service/system/interface_unified/library/include/system_service/ss_logger_service_notifications.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_logger_service_protocol.h b/service/system/interface_unified/library/include/system_service/ss_logger_service_protocol.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_logger_service_protocol.h
rename to service/system/interface_unified/library/include/system_service/ss_logger_service_protocol.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_logger_store_logs.h b/service/system/interface_unified/library/include/system_service/ss_logger_store_logs.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_logger_store_logs.h
rename to service/system/interface_unified/library/include/system_service/ss_logger_store_logs.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_power_service.h b/service/system/interface_unified/library/include/system_service/ss_power_service.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_power_service.h
rename to service/system/interface_unified/library/include/system_service/ss_power_service.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_power_service_if.h b/service/system/interface_unified/library/include/system_service/ss_power_service_if.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_power_service_if.h
rename to service/system/interface_unified/library/include/system_service/ss_power_service_if.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_power_service_local.h b/service/system/interface_unified/library/include/system_service/ss_power_service_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_power_service_local.h
rename to service/system/interface_unified/library/include/system_service/ss_power_service_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_power_service_notifications.h b/service/system/interface_unified/library/include/system_service/ss_power_service_notifications.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_power_service_notifications.h
rename to service/system/interface_unified/library/include/system_service/ss_power_service_notifications.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_power_service_notifications_local.h b/service/system/interface_unified/library/include/system_service/ss_power_service_notifications_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_power_service_notifications_local.h
rename to service/system/interface_unified/library/include/system_service/ss_power_service_notifications_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_power_service_protocol.h b/service/system/interface_unified/library/include/system_service/ss_power_service_protocol.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_power_service_protocol.h
rename to service/system/interface_unified/library/include/system_service/ss_power_service_protocol.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_services.h b/service/system/interface_unified/library/include/system_service/ss_services.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_services.h
rename to service/system/interface_unified/library/include/system_service/ss_services.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_sm_client_if.h b/service/system/interface_unified/library/include/system_service/ss_sm_client_if.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_sm_client_if.h
rename to service/system/interface_unified/library/include/system_service/ss_sm_client_if.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_sm_client_if_local.h b/service/system/interface_unified/library/include/system_service/ss_sm_client_if_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_sm_client_if_local.h
rename to service/system/interface_unified/library/include/system_service/ss_sm_client_if_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_sm_thread_names.h b/service/system/interface_unified/library/include/system_service/ss_sm_thread_names.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_sm_thread_names.h
rename to service/system/interface_unified/library/include/system_service/ss_sm_thread_names.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_sm_thread_names_local.h b/service/system/interface_unified/library/include/system_service/ss_sm_thread_names_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_sm_thread_names_local.h
rename to service/system/interface_unified/library/include/system_service/ss_sm_thread_names_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_string_maps.h b/service/system/interface_unified/library/include/system_service/ss_string_maps.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_string_maps.h
rename to service/system/interface_unified/library/include/system_service/ss_string_maps.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_sys_boot_area_map.h b/service/system/interface_unified/library/include/system_service/ss_sys_boot_area_map.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_sys_boot_area_map.h
rename to service/system/interface_unified/library/include/system_service/ss_sys_boot_area_map.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_if.h b/service/system/interface_unified/library/include/system_service/ss_system_if.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_if.h
rename to service/system/interface_unified/library/include/system_service/ss_system_if.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_manager_if.h b/service/system/interface_unified/library/include/system_service/ss_system_manager_if.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_manager_if.h
rename to service/system/interface_unified/library/include/system_service/ss_system_manager_if.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_manager_if_local.h b/service/system/interface_unified/library/include/system_service/ss_system_manager_if_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_manager_if_local.h
rename to service/system/interface_unified/library/include/system_service/ss_system_manager_if_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_manager_notifications.h b/service/system/interface_unified/library/include/system_service/ss_system_manager_notifications.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_manager_notifications.h
rename to service/system/interface_unified/library/include/system_service/ss_system_manager_notifications.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h b/service/system/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h
rename to service/system/interface_unified/library/include/system_service/ss_system_manager_notifications_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_manager_protocol.h b/service/system/interface_unified/library/include/system_service/ss_system_manager_protocol.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_manager_protocol.h
rename to service/system/interface_unified/library/include/system_service/ss_system_manager_protocol.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h b/service/system/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h
rename to service/system/interface_unified/library/include/system_service/ss_system_manager_protocol_local.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_process.h b/service/system/interface_unified/library/include/system_service/ss_system_process.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_process.h
rename to service/system/interface_unified/library/include/system_service/ss_system_process.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_timer.h b/service/system/interface_unified/library/include/system_service/ss_system_timer.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_timer.h
rename to service/system/interface_unified/library/include/system_service/ss_system_timer.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_system_types.h b/service/system/interface_unified/library/include/system_service/ss_system_types.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_system_types.h
rename to service/system/interface_unified/library/include/system_service/ss_system_types.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_templates.h b/service/system/interface_unified/library/include/system_service/ss_templates.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_templates.h
rename to service/system/interface_unified/library/include/system_service/ss_templates.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_test_clients.h b/service/system/interface_unified/library/include/system_service/ss_test_clients.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_test_clients.h
rename to service/system/interface_unified/library/include/system_service/ss_test_clients.h

diff --git a/systemservice/interface_unified/library/include/system_service/ss_version.h b/service/system/interface_unified/library/include/system_service/ss_version.h
similarity index 100%
rename from systemservice/interface_unified/library/include/system_service/ss_version.h
rename to service/system/interface_unified/library/include/system_service/ss_version.h

diff --git a/systemservice/interface_unified/library/src/libSS_SystemIfUnified.ver b/service/system/interface_unified/library/src/libSS_SystemIfUnified.ver
similarity index 100%
rename from systemservice/interface_unified/library/src/libSS_SystemIfUnified.ver
rename to service/system/interface_unified/library/src/libSS_SystemIfUnified.ver

diff --git a/systemservice/interface_unified/library/src/makefile_PosixBasedOS001 b/service/system/interface_unified/library/src/makefile_PosixBasedOS001
similarity index 100%
rename from systemservice/interface_unified/library/src/makefile_PosixBasedOS001
rename to service/system/interface_unified/library/src/makefile_PosixBasedOS001

diff --git a/systemservice/interface_unified/library/src/ss_devicedetection_service_ifc.cpp b/service/system/interface_unified/library/src/ss_devicedetection_service_ifc.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_devicedetection_service_ifc.cpp
rename to service/system/interface_unified/library/src/ss_devicedetection_service_ifc.cpp

diff --git a/systemservice/interface_unified/library/src/ss_framework_if.cpp b/service/system/interface_unified/library/src/ss_framework_if.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_framework_if.cpp
rename to service/system/interface_unified/library/src/ss_framework_if.cpp

diff --git a/systemservice/interface_unified/library/src/ss_heartbeat_client.cpp b/service/system/interface_unified/library/src/ss_heartbeat_client.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_heartbeat_client.cpp
rename to service/system/interface_unified/library/src/ss_heartbeat_client.cpp

diff --git a/systemservice/interface_unified/library/src/ss_last_to_order.cpp b/service/system/interface_unified/library/src/ss_last_to_order.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_last_to_order.cpp
rename to service/system/interface_unified/library/src/ss_last_to_order.cpp

diff --git a/systemservice/interface_unified/library/src/ss_logger_service_ifc.cpp b/service/system/interface_unified/library/src/ss_logger_service_ifc.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_logger_service_ifc.cpp
rename to service/system/interface_unified/library/src/ss_logger_service_ifc.cpp

diff --git a/systemservice/interface_unified/library/src/ss_power_client.cpp b/service/system/interface_unified/library/src/ss_power_client.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_power_client.cpp
rename to service/system/interface_unified/library/src/ss_power_client.cpp

diff --git a/systemservice/interface_unified/library/src/ss_pwrsvc_if.cpp b/service/system/interface_unified/library/src/ss_pwrsvc_if.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_pwrsvc_if.cpp
rename to service/system/interface_unified/library/src/ss_pwrsvc_if.cpp

diff --git a/systemservice/interface_unified/library/src/ss_sm_client.cpp b/service/system/interface_unified/library/src/ss_sm_client.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_sm_client.cpp
rename to service/system/interface_unified/library/src/ss_sm_client.cpp

diff --git a/systemservice/interface_unified/library/src/ss_string_maps.cpp b/service/system/interface_unified/library/src/ss_string_maps.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_string_maps.cpp
rename to service/system/interface_unified/library/src/ss_string_maps.cpp

diff --git a/systemservice/interface_unified/library/src/ss_system_process.cpp b/service/system/interface_unified/library/src/ss_system_process.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_system_process.cpp
rename to service/system/interface_unified/library/src/ss_system_process.cpp

diff --git a/systemservice/interface_unified/library/src/ss_system_timer.cpp b/service/system/interface_unified/library/src/ss_system_timer.cpp
similarity index 100%
rename from systemservice/interface_unified/library/src/ss_system_timer.cpp
rename to service/system/interface_unified/library/src/ss_system_timer.cpp

diff --git a/systemservice/interface_unified/scfg/gpf_ss_cpu_mon_config.cfg b/service/system/interface_unified/scfg/gpf_ss_cpu_mon_config.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg/gpf_ss_cpu_mon_config.cfg
rename to service/system/interface_unified/scfg/gpf_ss_cpu_mon_config.cfg

diff --git a/systemservice/interface_unified/scfg/gpf_ss_ps_config.cfg b/service/system/interface_unified/scfg/gpf_ss_ps_config.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg/gpf_ss_ps_config.cfg
rename to service/system/interface_unified/scfg/gpf_ss_ps_config.cfg

diff --git a/systemservice/interface_unified/scfg/gpf_ss_showmem.cfg b/service/system/interface_unified/scfg/gpf_ss_showmem.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg/gpf_ss_showmem.cfg
rename to service/system/interface_unified/scfg/gpf_ss_showmem.cfg

diff --git a/systemservice/interface_unified/scfg/ss_cpu_high_load_monitor.cfg b/service/system/interface_unified/scfg/ss_cpu_high_load_monitor.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg/ss_cpu_high_load_monitor.cfg
rename to service/system/interface_unified/scfg/ss_cpu_high_load_monitor.cfg

diff --git a/systemservice/interface_unified/scfg/ss_logger.cfg b/service/system/interface_unified/scfg/ss_logger.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg/ss_logger.cfg
rename to service/system/interface_unified/scfg/ss_logger.cfg

diff --git a/systemservice/interface_unified/scfg/system_launch_flashloader.cfg b/service/system/interface_unified/scfg/system_launch_flashloader.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg/system_launch_flashloader.cfg
rename to service/system/interface_unified/scfg/system_launch_flashloader.cfg

diff --git a/systemservice/interface_unified/scfg_pram/gpf_ss_sm_config_data.cfg b/service/system/interface_unified/scfg_pram/gpf_ss_sm_config_data.cfg
similarity index 100%
rename from systemservice/interface_unified/scfg_pram/gpf_ss_sm_config_data.cfg
rename to service/system/interface_unified/scfg_pram/gpf_ss_sm_config_data.cfg

diff --git a/systemservice/system_manager/LICENSE b/service/system/logger_service/LICENSE
similarity index 100%
rename from systemservice/system_manager/LICENSE
rename to service/system/logger_service/LICENSE

diff --git a/systemservice/logger_service/Makefile.server b/service/system/logger_service/Makefile.server
similarity index 100%
rename from systemservice/logger_service/Makefile.server
rename to service/system/logger_service/Makefile.server

diff --git a/systemservice/logger_service/server/Makefile b/service/system/logger_service/server/Makefile
similarity index 100%
rename from systemservice/logger_service/server/Makefile
rename to service/system/logger_service/server/Makefile

diff --git a/systemservice/logger_service/server/SS_LoggerService.conf_bin b/service/system/logger_service/server/SS_LoggerService.conf_bin
similarity index 100%
rename from systemservice/logger_service/server/SS_LoggerService.conf_bin
rename to service/system/logger_service/server/SS_LoggerService.conf_bin

diff --git a/systemservice/logger_service/server/include/loggerservicedebug_loggerservicelog.h b/service/system/logger_service/server/include/loggerservicedebug_loggerservicelog.h
similarity index 100%
rename from systemservice/logger_service/server/include/loggerservicedebug_loggerservicelog.h
rename to service/system/logger_service/server/include/loggerservicedebug_loggerservicelog.h

diff --git a/systemservice/logger_service/server/include/loggerservicedebug_thread_if.h b/service/system/logger_service/server/include/loggerservicedebug_thread_if.h
similarity index 100%
rename from systemservice/logger_service/server/include/loggerservicedebug_thread_if.h
rename to service/system/logger_service/server/include/loggerservicedebug_thread_if.h

diff --git a/systemservice/logger_service/server/include/loggerservicedebug_writer_Evntworker.h b/service/system/logger_service/server/include/loggerservicedebug_writer_Evntworker.h
similarity index 100%
rename from systemservice/logger_service/server/include/loggerservicedebug_writer_Evntworker.h
rename to service/system/logger_service/server/include/loggerservicedebug_writer_Evntworker.h

diff --git a/systemservice/logger_service/server/include/readerWriter/reader/mem_reader.h b/service/system/logger_service/server/include/readerWriter/reader/mem_reader.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/reader/mem_reader.h
rename to service/system/logger_service/server/include/readerWriter/reader/mem_reader.h

diff --git a/systemservice/logger_service/server/include/readerWriter/reader/queue_reader.h b/service/system/logger_service/server/include/readerWriter/reader/queue_reader.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/reader/queue_reader.h
rename to service/system/logger_service/server/include/readerWriter/reader/queue_reader.h

diff --git a/systemservice/logger_service/server/include/readerWriter/reader/reader.h b/service/system/logger_service/server/include/readerWriter/reader/reader.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/reader/reader.h
rename to service/system/logger_service/server/include/readerWriter/reader/reader.h

diff --git a/systemservice/logger_service/server/include/readerWriter/reader_writer.h b/service/system/logger_service/server/include/readerWriter/reader_writer.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/reader_writer.h
rename to service/system/logger_service/server/include/readerWriter/reader_writer.h

diff --git a/systemservice/logger_service/server/include/readerWriter/reader_writer_cfg.h b/service/system/logger_service/server/include/readerWriter/reader_writer_cfg.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/reader_writer_cfg.h
rename to service/system/logger_service/server/include/readerWriter/reader_writer_cfg.h

diff --git a/systemservice/logger_service/server/include/readerWriter/writer/cached_file_writer.h b/service/system/logger_service/server/include/readerWriter/writer/cached_file_writer.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/writer/cached_file_writer.h
rename to service/system/logger_service/server/include/readerWriter/writer/cached_file_writer.h

diff --git a/systemservice/logger_service/server/include/readerWriter/writer/file_writer.h b/service/system/logger_service/server/include/readerWriter/writer/file_writer.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/writer/file_writer.h
rename to service/system/logger_service/server/include/readerWriter/writer/file_writer.h

diff --git a/systemservice/logger_service/server/include/readerWriter/writer/udp_file_writer.h b/service/system/logger_service/server/include/readerWriter/writer/udp_file_writer.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/writer/udp_file_writer.h
rename to service/system/logger_service/server/include/readerWriter/writer/udp_file_writer.h

diff --git a/systemservice/logger_service/server/include/readerWriter/writer/udp_writer.h b/service/system/logger_service/server/include/readerWriter/writer/udp_writer.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/writer/udp_writer.h
rename to service/system/logger_service/server/include/readerWriter/writer/udp_writer.h

diff --git a/systemservice/logger_service/server/include/readerWriter/writer/writer.h b/service/system/logger_service/server/include/readerWriter/writer/writer.h
similarity index 100%
rename from systemservice/logger_service/server/include/readerWriter/writer/writer.h
rename to service/system/logger_service/server/include/readerWriter/writer/writer.h

diff --git a/systemservice/logger_service/server/include/ss_logger_cfg.h b/service/system/logger_service/server/include/ss_logger_cfg.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_cfg.h
rename to service/system/logger_service/server/include/ss_logger_cfg.h

diff --git a/systemservice/logger_service/server/include/ss_logger_common.h b/service/system/logger_service/server/include/ss_logger_common.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_common.h
rename to service/system/logger_service/server/include/ss_logger_common.h

diff --git a/systemservice/logger_service/server/include/ss_logger_device_detection.h b/service/system/logger_service/server/include/ss_logger_device_detection.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_device_detection.h
rename to service/system/logger_service/server/include/ss_logger_device_detection.h

diff --git a/systemservice/logger_service/server/include/ss_logger_error_event.h b/service/system/logger_service/server/include/ss_logger_error_event.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_error_event.h
rename to service/system/logger_service/server/include/ss_logger_error_event.h

diff --git a/systemservice/logger_service/server/include/ss_logger_error_event_archive.h b/service/system/logger_service/server/include/ss_logger_error_event_archive.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_error_event_archive.h
rename to service/system/logger_service/server/include/ss_logger_error_event_archive.h

diff --git a/systemservice/logger_service/server/include/ss_logger_error_event_can_evt_reply.h b/service/system/logger_service/server/include/ss_logger_error_event_can_evt_reply.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_error_event_can_evt_reply.h
rename to service/system/logger_service/server/include/ss_logger_error_event_can_evt_reply.h

diff --git a/systemservice/logger_service/server/include/ss_logger_error_event_cfg.h b/service/system/logger_service/server/include/ss_logger_error_event_cfg.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_error_event_cfg.h
rename to service/system/logger_service/server/include/ss_logger_error_event_cfg.h

diff --git a/systemservice/logger_service/server/include/ss_logger_error_event_storage.h b/service/system/logger_service/server/include/ss_logger_error_event_storage.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_error_event_storage.h
rename to service/system/logger_service/server/include/ss_logger_error_event_storage.h

diff --git a/systemservice/logger_service/server/include/ss_logger_fs_directory.h b/service/system/logger_service/server/include/ss_logger_fs_directory.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_fs_directory.h
rename to service/system/logger_service/server/include/ss_logger_fs_directory.h

diff --git a/systemservice/logger_service/server/include/ss_logger_popups.h b/service/system/logger_service/server/include/ss_logger_popups.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_popups.h
rename to service/system/logger_service/server/include/ss_logger_popups.h

diff --git a/systemservice/logger_service/server/include/ss_logger_reader_writer_control.h b/service/system/logger_service/server/include/ss_logger_reader_writer_control.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_reader_writer_control.h
rename to service/system/logger_service/server/include/ss_logger_reader_writer_control.h

diff --git a/systemservice/logger_service/server/include/ss_logger_scrshot.h b/service/system/logger_service/server/include/ss_logger_scrshot.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_scrshot.h
rename to service/system/logger_service/server/include/ss_logger_scrshot.h

diff --git a/systemservice/logger_service/server/include/ss_logger_service_callbacks.h b/service/system/logger_service/server/include/ss_logger_service_callbacks.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_service_callbacks.h
rename to service/system/logger_service/server/include/ss_logger_service_callbacks.h

diff --git a/systemservice/logger_service/server/include/ss_logger_types.h b/service/system/logger_service/server/include/ss_logger_types.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_types.h
rename to service/system/logger_service/server/include/ss_logger_types.h

diff --git a/systemservice/logger_service/server/include/ss_logger_util.h b/service/system/logger_service/server/include/ss_logger_util.h
similarity index 100%
rename from systemservice/logger_service/server/include/ss_logger_util.h
rename to service/system/logger_service/server/include/ss_logger_util.h

diff --git a/systemservice/logger_service/server/lib/Makefile b/service/system/logger_service/server/lib/Makefile
similarity index 100%
rename from systemservice/logger_service/server/lib/Makefile
rename to service/system/logger_service/server/lib/Makefile

diff --git a/systemservice/logger_service/server/lib/ss_logger_store_logs.cpp b/service/system/logger_service/server/lib/ss_logger_store_logs.cpp
similarity index 100%
rename from systemservice/logger_service/server/lib/ss_logger_store_logs.cpp
rename to service/system/logger_service/server/lib/ss_logger_store_logs.cpp

diff --git a/systemservice/logger_service/server/lib/ss_logger_store_logs_loggerservicelog.h b/service/system/logger_service/server/lib/ss_logger_store_logs_loggerservicelog.h
similarity index 100%
rename from systemservice/logger_service/server/lib/ss_logger_store_logs_loggerservicelog.h
rename to service/system/logger_service/server/lib/ss_logger_store_logs_loggerservicelog.h

diff --git a/systemservice/logger_service/server/realtimeUsbLog/Makefile b/service/system/logger_service/server/realtimeUsbLog/Makefile
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/Makefile
rename to service/system/logger_service/server/realtimeUsbLog/Makefile

diff --git a/systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin b/service/system/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin
rename to service/system/logger_service/server/realtimeUsbLog/realtimeUsbLog.conf_bin

diff --git a/systemservice/logger_service/server/realtimeUsbLog/src/Makefile b/service/system/logger_service/server/realtimeUsbLog/src/Makefile
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/src/Makefile
rename to service/system/logger_service/server/realtimeUsbLog/src/Makefile

diff --git a/systemservice/logger_service/server/realtimeUsbLog/src/loggerservice_main.cpp b/service/system/logger_service/server/realtimeUsbLog/src/loggerservice_main.cpp
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/src/loggerservice_main.cpp
rename to service/system/logger_service/server/realtimeUsbLog/src/loggerservice_main.cpp

diff --git a/systemservice/logger_service/server/realtimeUsbLog/src/ss_logger_realtime_usb.cpp b/service/system/logger_service/server/realtimeUsbLog/src/ss_logger_realtime_usb.cpp
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/src/ss_logger_realtime_usb.cpp
rename to service/system/logger_service/server/realtimeUsbLog/src/ss_logger_realtime_usb.cpp

diff --git a/systemservice/logger_service/server/realtimeUsbLog/work/Makefile b/service/system/logger_service/server/realtimeUsbLog/work/Makefile
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/work/Makefile
rename to service/system/logger_service/server/realtimeUsbLog/work/Makefile

diff --git a/systemservice/logger_service/server/realtimeUsbLog/work_debug/Makefile b/service/system/logger_service/server/realtimeUsbLog/work_debug/Makefile
similarity index 100%
rename from systemservice/logger_service/server/realtimeUsbLog/work_debug/Makefile
rename to service/system/logger_service/server/realtimeUsbLog/work_debug/Makefile

diff --git a/systemservice/logger_service/server/screenShot/Makefile b/service/system/logger_service/server/screenShot/Makefile
similarity index 100%
rename from systemservice/logger_service/server/screenShot/Makefile
rename to service/system/logger_service/server/screenShot/Makefile

diff --git a/systemservice/logger_service/server/screenShot/ss_logger_scrshot.cpp b/service/system/logger_service/server/screenShot/ss_logger_scrshot.cpp
similarity index 100%
rename from systemservice/logger_service/server/screenShot/ss_logger_scrshot.cpp
rename to service/system/logger_service/server/screenShot/ss_logger_scrshot.cpp

diff --git a/systemservice/logger_service/server/src/cached_file_writer.cpp b/service/system/logger_service/server/src/cached_file_writer.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/cached_file_writer.cpp
rename to service/system/logger_service/server/src/cached_file_writer.cpp

diff --git a/systemservice/logger_service/server/src/file_writer.cpp b/service/system/logger_service/server/src/file_writer.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/file_writer.cpp
rename to service/system/logger_service/server/src/file_writer.cpp

diff --git a/systemservice/logger_service/server/src/loggerservice_application.cpp b/service/system/logger_service/server/src/loggerservice_application.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/loggerservice_application.cpp
rename to service/system/logger_service/server/src/loggerservice_application.cpp

diff --git a/systemservice/logger_service/server/src/loggerservice_main.cpp b/service/system/logger_service/server/src/loggerservice_main.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/loggerservice_main.cpp
rename to service/system/logger_service/server/src/loggerservice_main.cpp

diff --git a/systemservice/logger_service/server/src/loggerservicedebug_child_thread.cpp b/service/system/logger_service/server/src/loggerservicedebug_child_thread.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/loggerservicedebug_child_thread.cpp
rename to service/system/logger_service/server/src/loggerservicedebug_child_thread.cpp

diff --git a/systemservice/logger_service/server/src/loggerservicedebug_writer_Evntworker.cpp b/service/system/logger_service/server/src/loggerservicedebug_writer_Evntworker.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/loggerservicedebug_writer_Evntworker.cpp
rename to service/system/logger_service/server/src/loggerservicedebug_writer_Evntworker.cpp

diff --git a/systemservice/logger_service/server/src/mem_reader.cpp b/service/system/logger_service/server/src/mem_reader.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/mem_reader.cpp
rename to service/system/logger_service/server/src/mem_reader.cpp

diff --git a/systemservice/logger_service/server/src/mod_version.c b/service/system/logger_service/server/src/mod_version.c
similarity index 100%
rename from systemservice/logger_service/server/src/mod_version.c
rename to service/system/logger_service/server/src/mod_version.c

diff --git a/systemservice/logger_service/server/src/queue_reader.cpp b/service/system/logger_service/server/src/queue_reader.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/queue_reader.cpp
rename to service/system/logger_service/server/src/queue_reader.cpp

diff --git a/systemservice/logger_service/server/src/reader.cpp b/service/system/logger_service/server/src/reader.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/reader.cpp
rename to service/system/logger_service/server/src/reader.cpp

diff --git a/systemservice/logger_service/server/src/reader_writer.cpp b/service/system/logger_service/server/src/reader_writer.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/reader_writer.cpp
rename to service/system/logger_service/server/src/reader_writer.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_cfg.cpp b/service/system/logger_service/server/src/ss_logger_cfg.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_cfg.cpp
rename to service/system/logger_service/server/src/ss_logger_cfg.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_device_detection.cpp b/service/system/logger_service/server/src/ss_logger_device_detection.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_device_detection.cpp
rename to service/system/logger_service/server/src/ss_logger_device_detection.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_error_event.cpp b/service/system/logger_service/server/src/ss_logger_error_event.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_error_event.cpp
rename to service/system/logger_service/server/src/ss_logger_error_event.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_error_event_archive.cpp b/service/system/logger_service/server/src/ss_logger_error_event_archive.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_error_event_archive.cpp
rename to service/system/logger_service/server/src/ss_logger_error_event_archive.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_error_event_can_evt_reply.cpp b/service/system/logger_service/server/src/ss_logger_error_event_can_evt_reply.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_error_event_can_evt_reply.cpp
rename to service/system/logger_service/server/src/ss_logger_error_event_can_evt_reply.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_error_event_cfg.cpp b/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_error_event_cfg.cpp
rename to service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_error_event_responses.cpp b/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_error_event_responses.cpp
rename to service/system/logger_service/server/src/ss_logger_error_event_responses.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_error_event_storage.cpp b/service/system/logger_service/server/src/ss_logger_error_event_storage.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_error_event_storage.cpp
rename to service/system/logger_service/server/src/ss_logger_error_event_storage.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_fs_directory.cpp b/service/system/logger_service/server/src/ss_logger_fs_directory.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_fs_directory.cpp
rename to service/system/logger_service/server/src/ss_logger_fs_directory.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_popups.cpp b/service/system/logger_service/server/src/ss_logger_popups.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_popups.cpp
rename to service/system/logger_service/server/src/ss_logger_popups.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_reader_writer_control.cpp b/service/system/logger_service/server/src/ss_logger_reader_writer_control.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_reader_writer_control.cpp
rename to service/system/logger_service/server/src/ss_logger_reader_writer_control.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_server_callbacks.cpp b/service/system/logger_service/server/src/ss_logger_server_callbacks.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_server_callbacks.cpp
rename to service/system/logger_service/server/src/ss_logger_server_callbacks.cpp

diff --git a/systemservice/logger_service/server/src/ss_logger_util.cpp b/service/system/logger_service/server/src/ss_logger_util.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/ss_logger_util.cpp
rename to service/system/logger_service/server/src/ss_logger_util.cpp

diff --git a/systemservice/logger_service/server/src/testapps/fopen b/service/system/logger_service/server/src/testapps/fopen
similarity index 100%
rename from systemservice/logger_service/server/src/testapps/fopen
rename to service/system/logger_service/server/src/testapps/fopen

diff --git a/systemservice/logger_service/server/src/testapps/testapps.log b/service/system/logger_service/server/src/testapps/testapps.log
similarity index 100%
rename from systemservice/logger_service/server/src/testapps/testapps.log
rename to service/system/logger_service/server/src/testapps/testapps.log

diff --git a/systemservice/logger_service/server/src/testapps/testapps.tar.gz b/service/system/logger_service/server/src/testapps/testapps.tar.gz
similarity index 100%
rename from systemservice/logger_service/server/src/testapps/testapps.tar.gz
rename to service/system/logger_service/server/src/testapps/testapps.tar.gz

diff --git a/systemservice/logger_service/server/src/udp_file_writer.cpp b/service/system/logger_service/server/src/udp_file_writer.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/udp_file_writer.cpp
rename to service/system/logger_service/server/src/udp_file_writer.cpp

diff --git a/systemservice/logger_service/server/src/udp_writer.cpp b/service/system/logger_service/server/src/udp_writer.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/udp_writer.cpp
rename to service/system/logger_service/server/src/udp_writer.cpp

diff --git a/systemservice/logger_service/server/src/writer.cpp b/service/system/logger_service/server/src/writer.cpp
similarity index 100%
rename from systemservice/logger_service/server/src/writer.cpp
rename to service/system/logger_service/server/src/writer.cpp

diff --git a/systemservice/logger_service/server/work/Makefile b/service/system/logger_service/server/work/Makefile
similarity index 100%
rename from systemservice/logger_service/server/work/Makefile
rename to service/system/logger_service/server/work/Makefile

diff --git a/systemservice/task_manager/LICENSE b/service/system/power_service/LICENSE
similarity index 100%
rename from systemservice/task_manager/LICENSE
rename to service/system/power_service/LICENSE

diff --git a/systemservice/power_service/Makefile.server b/service/system/power_service/Makefile.server
similarity index 100%
rename from systemservice/power_service/Makefile.server
rename to service/system/power_service/Makefile.server

diff --git a/systemservice/power_service/server/Makefile b/service/system/power_service/server/Makefile
similarity index 100%
rename from systemservice/power_service/server/Makefile
rename to service/system/power_service/server/Makefile

diff --git a/systemservice/power_service/server/include/ss_power.h b/service/system/power_service/server/include/ss_power.h
similarity index 100%
rename from systemservice/power_service/server/include/ss_power.h
rename to service/system/power_service/server/include/ss_power.h

diff --git a/systemservice/power_service/server/include/ss_power_config.h b/service/system/power_service/server/include/ss_power_config.h
similarity index 100%
rename from systemservice/power_service/server/include/ss_power_config.h
rename to service/system/power_service/server/include/ss_power_config.h

diff --git a/systemservice/power_service/server/include/ss_power_powerservicelog.h b/service/system/power_service/server/include/ss_power_powerservicelog.h
similarity index 100%
rename from systemservice/power_service/server/include/ss_power_powerservicelog.h
rename to service/system/power_service/server/include/ss_power_powerservicelog.h

diff --git a/systemservice/power_service/server/include/ss_power_session.h b/service/system/power_service/server/include/ss_power_session.h
similarity index 100%
rename from systemservice/power_service/server/include/ss_power_session.h
rename to service/system/power_service/server/include/ss_power_session.h

diff --git a/systemservice/power_service/server/include/ss_power_state_hysteresis.h b/service/system/power_service/server/include/ss_power_state_hysteresis.h
similarity index 100%
rename from systemservice/power_service/server/include/ss_power_state_hysteresis.h
rename to service/system/power_service/server/include/ss_power_state_hysteresis.h

diff --git a/systemservice/power_service/server/include/ss_power_state_machine.h b/service/system/power_service/server/include/ss_power_state_machine.h
similarity index 100%
rename from systemservice/power_service/server/include/ss_power_state_machine.h
rename to service/system/power_service/server/include/ss_power_state_machine.h

diff --git a/systemservice/power_service/server/src/powerservice_application.cpp b/service/system/power_service/server/src/powerservice_application.cpp
similarity index 100%
rename from systemservice/power_service/server/src/powerservice_application.cpp
rename to service/system/power_service/server/src/powerservice_application.cpp

diff --git a/systemservice/power_service/server/src/powerservice_main.cpp b/service/system/power_service/server/src/powerservice_main.cpp
similarity index 100%
rename from systemservice/power_service/server/src/powerservice_main.cpp
rename to service/system/power_service/server/src/powerservice_main.cpp

diff --git a/systemservice/power_service/server/src/ss_power.cpp b/service/system/power_service/server/src/ss_power.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_power.cpp
rename to service/system/power_service/server/src/ss_power.cpp

diff --git a/systemservice/power_service/server/src/ss_power_config.cpp b/service/system/power_service/server/src/ss_power_config.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_power_config.cpp
rename to service/system/power_service/server/src/ss_power_config.cpp

diff --git a/systemservice/power_service/server/src/ss_power_session.cpp b/service/system/power_service/server/src/ss_power_session.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_power_session.cpp
rename to service/system/power_service/server/src/ss_power_session.cpp

diff --git a/systemservice/power_service/server/src/ss_power_state_machine.cpp b/service/system/power_service/server/src/ss_power_state_machine.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_power_state_machine.cpp
rename to service/system/power_service/server/src/ss_power_state_machine.cpp

diff --git a/systemservice/power_service/server/src/ss_pwr_test_client_handlers.cpp b/service/system/power_service/server/src/ss_pwr_test_client_handlers.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_pwr_test_client_handlers.cpp
rename to service/system/power_service/server/src/ss_pwr_test_client_handlers.cpp

diff --git a/systemservice/power_service/server/src/ss_supervisor_handlers.cpp b/service/system/power_service/server/src/ss_supervisor_handlers.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_supervisor_handlers.cpp
rename to service/system/power_service/server/src/ss_supervisor_handlers.cpp

diff --git a/systemservice/power_service/server/src/ss_system_handlers.cpp b/service/system/power_service/server/src/ss_system_handlers.cpp
similarity index 100%
rename from systemservice/power_service/server/src/ss_system_handlers.cpp
rename to service/system/power_service/server/src/ss_system_handlers.cpp

diff --git a/systemservice/version_library/LICENSE b/service/system/resource_manager/LICENSE
similarity index 100%
rename from systemservice/version_library/LICENSE
rename to service/system/resource_manager/LICENSE

diff --git a/systemservice/resource_manager/Makefile.client b/service/system/resource_manager/Makefile.client
similarity index 100%
rename from systemservice/resource_manager/Makefile.client
rename to service/system/resource_manager/Makefile.client

diff --git a/systemservice/resource_manager/Makefile.server b/service/system/resource_manager/Makefile.server
similarity index 100%
rename from systemservice/resource_manager/Makefile.server
rename to service/system/resource_manager/Makefile.server

diff --git a/systemservice/resource_manager/client/Makefile b/service/system/resource_manager/client/Makefile
similarity index 100%
rename from systemservice/resource_manager/client/Makefile
rename to service/system/resource_manager/client/Makefile

diff --git a/systemservice/resource_manager/client/RESMGR.api b/service/system/resource_manager/client/RESMGR.api
similarity index 100%
rename from systemservice/resource_manager/client/RESMGR.api
rename to service/system/resource_manager/client/RESMGR.api

diff --git a/systemservice/resource_manager/client/include/resmgr_api_resourcemanagerlog.h b/service/system/resource_manager/client/include/resmgr_api_resourcemanagerlog.h
similarity index 100%
rename from systemservice/resource_manager/client/include/resmgr_api_resourcemanagerlog.h
rename to service/system/resource_manager/client/include/resmgr_api_resourcemanagerlog.h

diff --git a/systemservice/resource_manager/client/libresm.ver b/service/system/resource_manager/client/libresm.ver
similarity index 100%
rename from systemservice/resource_manager/client/libresm.ver
rename to service/system/resource_manager/client/libresm.ver

diff --git a/systemservice/resource_manager/client/src/#resmgr_api_lib.c# b/service/system/resource_manager/client/src/#resmgr_api_lib.c#
similarity index 100%
rename from systemservice/resource_manager/client/src/#resmgr_api_lib.c#
rename to service/system/resource_manager/client/src/#resmgr_api_lib.c#

diff --git a/systemservice/resource_manager/client/src/resmgr_api_lib.c b/service/system/resource_manager/client/src/resmgr_api_lib.c
similarity index 100%
rename from systemservice/resource_manager/client/src/resmgr_api_lib.c
rename to service/system/resource_manager/client/src/resmgr_api_lib.c

diff --git a/systemservice/resource_manager/drop_caches/Makefile b/service/system/resource_manager/drop_caches/Makefile
similarity index 100%
rename from systemservice/resource_manager/drop_caches/Makefile
rename to service/system/resource_manager/drop_caches/Makefile

diff --git a/systemservice/resource_manager/drop_caches/src/drop_caches.cpp b/service/system/resource_manager/drop_caches/src/drop_caches.cpp
similarity index 100%
rename from systemservice/resource_manager/drop_caches/src/drop_caches.cpp
rename to service/system/resource_manager/drop_caches/src/drop_caches.cpp

diff --git a/systemservice/resource_manager/server/Makefile b/service/system/resource_manager/server/Makefile
similarity index 100%
rename from systemservice/resource_manager/server/Makefile
rename to service/system/resource_manager/server/Makefile

diff --git a/systemservice/resource_manager/server/include/proc_watch.h b/service/system/resource_manager/server/include/proc_watch.h
similarity index 100%
rename from systemservice/resource_manager/server/include/proc_watch.h
rename to service/system/resource_manager/server/include/proc_watch.h

diff --git a/systemservice/resource_manager/server/include/resm_cfg.h b/service/system/resource_manager/server/include/resm_cfg.h
similarity index 100%
rename from systemservice/resource_manager/server/include/resm_cfg.h
rename to service/system/resource_manager/server/include/resm_cfg.h

diff --git a/systemservice/resource_manager/server/include/resm_internal.h b/service/system/resource_manager/server/include/resm_internal.h
similarity index 100%
rename from systemservice/resource_manager/server/include/resm_internal.h
rename to service/system/resource_manager/server/include/resm_internal.h

diff --git a/systemservice/resource_manager/server/include/ss_resm_resourcemanagerlog.h b/service/system/resource_manager/server/include/ss_resm_resourcemanagerlog.h
similarity index 100%
rename from systemservice/resource_manager/server/include/ss_resm_resourcemanagerlog.h
rename to service/system/resource_manager/server/include/ss_resm_resourcemanagerlog.h

diff --git a/systemservice/resource_manager/server/include/system_service/resm.h b/service/system/resource_manager/server/include/system_service/resm.h
similarity index 100%
rename from systemservice/resource_manager/server/include/system_service/resm.h
rename to service/system/resource_manager/server/include/system_service/resm.h

diff --git a/systemservice/resource_manager/server/include/system_service/resm_type.h b/service/system/resource_manager/server/include/system_service/resm_type.h
similarity index 100%
rename from systemservice/resource_manager/server/include/system_service/resm_type.h
rename to service/system/resource_manager/server/include/system_service/resm_type.h

diff --git a/systemservice/resource_manager/server/include/system_service/resource_manager.h b/service/system/resource_manager/server/include/system_service/resource_manager.h
similarity index 100%
rename from systemservice/resource_manager/server/include/system_service/resource_manager.h
rename to service/system/resource_manager/server/include/system_service/resource_manager.h

diff --git a/systemservice/resource_manager/server/src/cpuload_custom.cpp b/service/system/resource_manager/server/src/cpuload_custom.cpp
similarity index 100%
rename from systemservice/resource_manager/server/src/cpuload_custom.cpp
rename to service/system/resource_manager/server/src/cpuload_custom.cpp

diff --git a/systemservice/resource_manager/server/src/proc_watch.cpp b/service/system/resource_manager/server/src/proc_watch.cpp
similarity index 100%
rename from systemservice/resource_manager/server/src/proc_watch.cpp
rename to service/system/resource_manager/server/src/proc_watch.cpp

diff --git a/systemservice/resource_manager/server/src/resm.cpp b/service/system/resource_manager/server/src/resm.cpp
similarity index 100%
rename from systemservice/resource_manager/server/src/resm.cpp
rename to service/system/resource_manager/server/src/resm.cpp

diff --git a/systemservice/resource_manager/server/src/resourcemanager_application.cpp b/service/system/resource_manager/server/src/resourcemanager_application.cpp
similarity index 100%
rename from systemservice/resource_manager/server/src/resourcemanager_application.cpp
rename to service/system/resource_manager/server/src/resourcemanager_application.cpp

diff --git a/update_hal/LICENSE b/service/system/rom_access_library/LICENSE
similarity index 100%
rename from update_hal/LICENSE
rename to service/system/rom_access_library/LICENSE

diff --git a/systemservice/rom_access_library/Makefile.client b/service/system/rom_access_library/Makefile.client
similarity index 100%
rename from systemservice/rom_access_library/Makefile.client
rename to service/system/rom_access_library/Makefile.client

diff --git a/systemservice/rom_access_library/library/Makefile b/service/system/rom_access_library/library/Makefile
similarity index 100%
rename from systemservice/rom_access_library/library/Makefile
rename to service/system/rom_access_library/library/Makefile

diff --git a/systemservice/rom_access_library/library/include/rom_access_library_nor.h b/service/system/rom_access_library/library/include/rom_access_library_nor.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/rom_access_library_nor.h
rename to service/system/rom_access_library/library/include/rom_access_library_nor.h

diff --git a/systemservice/rom_access_library/library/include/rom_access_library_rom.h b/service/system/rom_access_library/library/include/rom_access_library_rom.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/rom_access_library_rom.h
rename to service/system/rom_access_library/library/include/rom_access_library_rom.h

diff --git a/systemservice/rom_access_library/library/include/ss_rom_access_define.h b/service/system/rom_access_library/library/include/ss_rom_access_define.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/ss_rom_access_define.h
rename to service/system/rom_access_library/library/include/ss_rom_access_define.h

diff --git a/systemservice/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h b/service/system/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h
rename to service/system/rom_access_library/library/include/ss_rom_access_if_romaccesslibrarylog.h

diff --git a/systemservice/rom_access_library/library/include/ss_sm_checksum.h b/service/system/rom_access_library/library/include/ss_sm_checksum.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/ss_sm_checksum.h
rename to service/system/rom_access_library/library/include/ss_sm_checksum.h

diff --git a/systemservice/rom_access_library/library/include/system_service/nor_backup.h b/service/system/rom_access_library/library/include/system_service/nor_backup.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/system_service/nor_backup.h
rename to service/system/rom_access_library/library/include/system_service/nor_backup.h

diff --git a/systemservice/rom_access_library/library/include/system_service/rom_access_library.h b/service/system/rom_access_library/library/include/system_service/rom_access_library.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/system_service/rom_access_library.h
rename to service/system/rom_access_library/library/include/system_service/rom_access_library.h

diff --git a/systemservice/rom_access_library/library/include/system_service/ss_sm_boot_access.h b/service/system/rom_access_library/library/include/system_service/ss_sm_boot_access.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/system_service/ss_sm_boot_access.h
rename to service/system/rom_access_library/library/include/system_service/ss_sm_boot_access.h

diff --git a/systemservice/rom_access_library/library/include/system_service/ss_sm_ram_access.h b/service/system/rom_access_library/library/include/system_service/ss_sm_ram_access.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/system_service/ss_sm_ram_access.h
rename to service/system/rom_access_library/library/include/system_service/ss_sm_ram_access.h

diff --git a/systemservice/rom_access_library/library/include/system_service/ss_sm_rom_access.h b/service/system/rom_access_library/library/include/system_service/ss_sm_rom_access.h
similarity index 100%
rename from systemservice/rom_access_library/library/include/system_service/ss_sm_rom_access.h
rename to service/system/rom_access_library/library/include/system_service/ss_sm_rom_access.h

diff --git a/systemservice/rom_access_library/library/nor/Makefile b/service/system/rom_access_library/library/nor/Makefile
similarity index 100%
rename from systemservice/rom_access_library/library/nor/Makefile
rename to service/system/rom_access_library/library/nor/Makefile

diff --git a/systemservice/rom_access_library/library/nor/libBlkDev_API.ver b/service/system/rom_access_library/library/nor/libBlkDev_API.ver
similarity index 100%
rename from systemservice/rom_access_library/library/nor/libBlkDev_API.ver
rename to service/system/rom_access_library/library/nor/libBlkDev_API.ver

diff --git a/systemservice/rom_access_library/library/nor/libssaccess.ver b/service/system/rom_access_library/library/nor/libssaccess.ver
similarity index 100%
rename from systemservice/rom_access_library/library/nor/libssaccess.ver
rename to service/system/rom_access_library/library/nor/libssaccess.ver

diff --git a/systemservice/rom_access_library/library/nor/src/nor_backup.c b/service/system/rom_access_library/library/nor/src/nor_backup.c
similarity index 100%
rename from systemservice/rom_access_library/library/nor/src/nor_backup.c
rename to service/system/rom_access_library/library/nor/src/nor_backup.c

diff --git a/systemservice/rom_access_library/library/rom/Makefile b/service/system/rom_access_library/library/rom/Makefile
similarity index 100%
rename from systemservice/rom_access_library/library/rom/Makefile
rename to service/system/rom_access_library/library/rom/Makefile

diff --git a/systemservice/rom_access_library/library/rom/src/ss_sm_boot_access.cpp b/service/system/rom_access_library/library/rom/src/ss_sm_boot_access.cpp
similarity index 100%
rename from systemservice/rom_access_library/library/rom/src/ss_sm_boot_access.cpp
rename to service/system/rom_access_library/library/rom/src/ss_sm_boot_access.cpp

diff --git a/systemservice/rom_access_library/library/rom/src/ss_sm_checksum.cpp b/service/system/rom_access_library/library/rom/src/ss_sm_checksum.cpp
similarity index 100%
rename from systemservice/rom_access_library/library/rom/src/ss_sm_checksum.cpp
rename to service/system/rom_access_library/library/rom/src/ss_sm_checksum.cpp

diff --git a/systemservice/rom_access_library/library/rom/src/ss_sm_ram_access.cpp b/service/system/rom_access_library/library/rom/src/ss_sm_ram_access.cpp
similarity index 100%
rename from systemservice/rom_access_library/library/rom/src/ss_sm_ram_access.cpp
rename to service/system/rom_access_library/library/rom/src/ss_sm_ram_access.cpp

diff --git a/systemservice/rom_access_library/library/rom/src/ss_sm_rom_access.cpp b/service/system/rom_access_library/library/rom/src/ss_sm_rom_access.cpp
similarity index 100%
rename from systemservice/rom_access_library/library/rom/src/ss_sm_rom_access.cpp
rename to service/system/rom_access_library/library/rom/src/ss_sm_rom_access.cpp

diff --git a/usb_hal/LICENSE b/service/system/system_manager/LICENSE
similarity index 100%
rename from usb_hal/LICENSE
rename to service/system/system_manager/LICENSE

diff --git a/systemservice/system_manager/Makefile.server b/service/system/system_manager/Makefile.server
similarity index 100%
rename from systemservice/system_manager/Makefile.server
rename to service/system/system_manager/Makefile.server

diff --git a/systemservice/system_manager/server/Makefile b/service/system/system_manager/server/Makefile
similarity index 100%
rename from systemservice/system_manager/server/Makefile
rename to service/system/system_manager/server/Makefile

diff --git a/systemservice/system_manager/server/PhaseInfo.txt b/service/system/system_manager/server/PhaseInfo.txt
similarity index 100%
rename from systemservice/system_manager/server/PhaseInfo.txt
rename to service/system/system_manager/server/PhaseInfo.txt

diff --git a/systemservice/system_manager/server/include/crashdetector/ss_crashdetector.h b/service/system/system_manager/server/include/crashdetector/ss_crashdetector.h
similarity index 100%
rename from systemservice/system_manager/server/include/crashdetector/ss_crashdetector.h
rename to service/system/system_manager/server/include/crashdetector/ss_crashdetector.h

diff --git a/systemservice/system_manager/server/include/heartbeat/ss_hb_if.h b/service/system/system_manager/server/include/heartbeat/ss_hb_if.h
similarity index 100%
rename from systemservice/system_manager/server/include/heartbeat/ss_hb_if.h
rename to service/system/system_manager/server/include/heartbeat/ss_hb_if.h

diff --git a/systemservice/system_manager/server/include/heartbeat/ss_hb_session.h b/service/system/system_manager/server/include/heartbeat/ss_hb_session.h
similarity index 100%
rename from systemservice/system_manager/server/include/heartbeat/ss_hb_session.h
rename to service/system/system_manager/server/include/heartbeat/ss_hb_session.h

diff --git a/systemservice/system_manager/server/include/heartbeat/ss_hb_thread.h b/service/system/system_manager/server/include/heartbeat/ss_hb_thread.h
similarity index 100%
rename from systemservice/system_manager/server/include/heartbeat/ss_hb_thread.h
rename to service/system/system_manager/server/include/heartbeat/ss_hb_thread.h

diff --git a/systemservice/system_manager/server/include/processlauncher/ProcessLauncher.h b/service/system/system_manager/server/include/processlauncher/ProcessLauncher.h
similarity index 100%
rename from systemservice/system_manager/server/include/processlauncher/ProcessLauncher.h
rename to service/system/system_manager/server/include/processlauncher/ProcessLauncher.h

diff --git a/systemservice/system_manager/server/include/processlauncher/ProcessLauncher_if.h b/service/system/system_manager/server/include/processlauncher/ProcessLauncher_if.h
similarity index 100%
rename from systemservice/system_manager/server/include/processlauncher/ProcessLauncher_if.h
rename to service/system/system_manager/server/include/processlauncher/ProcessLauncher_if.h

diff --git a/systemservice/system_manager/server/include/processlauncher/ss_sm_process_launcher.h b/service/system/system_manager/server/include/processlauncher/ss_sm_process_launcher.h
similarity index 100%
rename from systemservice/system_manager/server/include/processlauncher/ss_sm_process_launcher.h
rename to service/system/system_manager/server/include/processlauncher/ss_sm_process_launcher.h

diff --git a/systemservice/system_manager/server/include/processlauncher/ss_sm_process_launcher_protocol.h b/service/system/system_manager/server/include/processlauncher/ss_sm_process_launcher_protocol.h
similarity index 100%
rename from systemservice/system_manager/server/include/processlauncher/ss_sm_process_launcher_protocol.h
rename to service/system/system_manager/server/include/processlauncher/ss_sm_process_launcher_protocol.h

diff --git a/systemservice/system_manager/server/include/ss_sm_config.h b/service/system/system_manager/server/include/ss_sm_config.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_config.h
rename to service/system/system_manager/server/include/ss_sm_config.h

diff --git a/systemservice/system_manager/server/include/ss_sm_default_paths.h b/service/system/system_manager/server/include/ss_sm_default_paths.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_default_paths.h
rename to service/system/system_manager/server/include/ss_sm_default_paths.h

diff --git a/systemservice/system_manager/server/include/ss_sm_dynamic_launch_table.h b/service/system/system_manager/server/include/ss_sm_dynamic_launch_table.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_dynamic_launch_table.h
rename to service/system/system_manager/server/include/ss_sm_dynamic_launch_table.h

diff --git a/systemservice/system_manager/server/include/ss_sm_dynamic_launcher.h b/service/system/system_manager/server/include/ss_sm_dynamic_launcher.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_dynamic_launcher.h
rename to service/system/system_manager/server/include/ss_sm_dynamic_launcher.h

diff --git a/systemservice/system_manager/server/include/ss_sm_launch_configuration.h b/service/system/system_manager/server/include/ss_sm_launch_configuration.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_launch_configuration.h
rename to service/system/system_manager/server/include/ss_sm_launch_configuration.h

diff --git a/systemservice/system_manager/server/include/ss_sm_signals.h b/service/system/system_manager/server/include/ss_sm_signals.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_signals.h
rename to service/system/system_manager/server/include/ss_sm_signals.h

diff --git a/systemservice/system_manager/server/include/ss_sm_systemmanagerlog.h b/service/system/system_manager/server/include/ss_sm_systemmanagerlog.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_systemmanagerlog.h
rename to service/system/system_manager/server/include/ss_sm_systemmanagerlog.h

diff --git a/systemservice/system_manager/server/include/ss_sm_version.h b/service/system/system_manager/server/include/ss_sm_version.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_sm_version.h
rename to service/system/system_manager/server/include/ss_sm_version.h

diff --git a/systemservice/system_manager/server/include/ss_system_manager.h b/service/system/system_manager/server/include/ss_system_manager.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_system_manager.h
rename to service/system/system_manager/server/include/ss_system_manager.h

diff --git a/systemservice/system_manager/server/include/ss_system_manager_callbacks.h b/service/system/system_manager/server/include/ss_system_manager_callbacks.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_system_manager_callbacks.h
rename to service/system/system_manager/server/include/ss_system_manager_callbacks.h

diff --git a/systemservice/system_manager/server/include/ss_system_memory_monitor.h b/service/system/system_manager/server/include/ss_system_memory_monitor.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_system_memory_monitor.h
rename to service/system/system_manager/server/include/ss_system_memory_monitor.h

diff --git a/systemservice/system_manager/server/include/ss_system_thread_info.h b/service/system/system_manager/server/include/ss_system_thread_info.h
similarity index 100%
rename from systemservice/system_manager/server/include/ss_system_thread_info.h
rename to service/system/system_manager/server/include/ss_system_thread_info.h

diff --git a/systemservice/system_manager/server/include/system_launcher_cfg_format.h b/service/system/system_manager/server/include/system_launcher_cfg_format.h
similarity index 100%
rename from systemservice/system_manager/server/include/system_launcher_cfg_format.h
rename to service/system/system_manager/server/include/system_launcher_cfg_format.h

diff --git a/systemservice/system_manager/server/sm_launch__CWORD84_.xml b/service/system/system_manager/server/sm_launch__CWORD84_.xml
similarity index 100%
rename from systemservice/system_manager/server/sm_launch__CWORD84_.xml
rename to service/system/system_manager/server/sm_launch__CWORD84_.xml

diff --git a/systemservice/system_manager/server/src/heartbeat/ss_hb_if.cpp b/service/system/system_manager/server/src/heartbeat/ss_hb_if.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/heartbeat/ss_hb_if.cpp
rename to service/system/system_manager/server/src/heartbeat/ss_hb_if.cpp

diff --git a/systemservice/system_manager/server/src/heartbeat/ss_hb_service_protocol.cpp b/service/system/system_manager/server/src/heartbeat/ss_hb_service_protocol.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/heartbeat/ss_hb_service_protocol.cpp
rename to service/system/system_manager/server/src/heartbeat/ss_hb_service_protocol.cpp

diff --git a/systemservice/system_manager/server/src/heartbeat/ss_hb_session.cpp b/service/system/system_manager/server/src/heartbeat/ss_hb_session.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/heartbeat/ss_hb_session.cpp
rename to service/system/system_manager/server/src/heartbeat/ss_hb_session.cpp

diff --git a/systemservice/system_manager/server/src/heartbeat/ss_hb_thread.cpp b/service/system/system_manager/server/src/heartbeat/ss_hb_thread.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/heartbeat/ss_hb_thread.cpp
rename to service/system/system_manager/server/src/heartbeat/ss_hb_thread.cpp

diff --git a/systemservice/system_manager/server/src/processlauncher/ProcessLauncher.cpp b/service/system/system_manager/server/src/processlauncher/ProcessLauncher.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/processlauncher/ProcessLauncher.cpp
rename to service/system/system_manager/server/src/processlauncher/ProcessLauncher.cpp

diff --git a/systemservice/system_manager/server/src/processlauncher/ProcessLauncher_if.cpp b/service/system/system_manager/server/src/processlauncher/ProcessLauncher_if.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/processlauncher/ProcessLauncher_if.cpp
rename to service/system/system_manager/server/src/processlauncher/ProcessLauncher_if.cpp

diff --git a/systemservice/system_manager/server/src/ss_sm_config.cpp b/service/system/system_manager/server/src/ss_sm_config.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_sm_config.cpp
rename to service/system/system_manager/server/src/ss_sm_config.cpp

diff --git a/systemservice/system_manager/server/src/ss_sm_dynamic_launcher.cpp b/service/system/system_manager/server/src/ss_sm_dynamic_launcher.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_sm_dynamic_launcher.cpp
rename to service/system/system_manager/server/src/ss_sm_dynamic_launcher.cpp

diff --git a/systemservice/system_manager/server/src/ss_sm_version.cpp b/service/system/system_manager/server/src/ss_sm_version.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_sm_version.cpp
rename to service/system/system_manager/server/src/ss_sm_version.cpp

diff --git a/systemservice/system_manager/server/src/ss_system_manager.cpp b/service/system/system_manager/server/src/ss_system_manager.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_system_manager.cpp
rename to service/system/system_manager/server/src/ss_system_manager.cpp

diff --git a/systemservice/system_manager/server/src/ss_system_manager_callbacks.cpp b/service/system/system_manager/server/src/ss_system_manager_callbacks.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_system_manager_callbacks.cpp
rename to service/system/system_manager/server/src/ss_system_manager_callbacks.cpp

diff --git a/systemservice/system_manager/server/src/ss_system_manager_error_event.cpp b/service/system/system_manager/server/src/ss_system_manager_error_event.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_system_manager_error_event.cpp
rename to service/system/system_manager/server/src/ss_system_manager_error_event.cpp

diff --git a/systemservice/system_manager/server/src/ss_system_manager_error_event_responses.cpp b/service/system/system_manager/server/src/ss_system_manager_error_event_responses.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_system_manager_error_event_responses.cpp
rename to service/system/system_manager/server/src/ss_system_manager_error_event_responses.cpp

diff --git a/systemservice/system_manager/server/src/ss_system_manager_error_event_triggers.cpp b/service/system/system_manager/server/src/ss_system_manager_error_event_triggers.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_system_manager_error_event_triggers.cpp
rename to service/system/system_manager/server/src/ss_system_manager_error_event_triggers.cpp

diff --git a/systemservice/system_manager/server/src/ss_system_memory_monitor.cpp b/service/system/system_manager/server/src/ss_system_memory_monitor.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/ss_system_memory_monitor.cpp
rename to service/system/system_manager/server/src/ss_system_memory_monitor.cpp

diff --git a/systemservice/system_manager/server/src/systemmanager_application.cpp b/service/system/system_manager/server/src/systemmanager_application.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/systemmanager_application.cpp
rename to service/system/system_manager/server/src/systemmanager_application.cpp

diff --git a/systemservice/system_manager/server/src/systemmanager_main.cpp b/service/system/system_manager/server/src/systemmanager_main.cpp
similarity index 100%
rename from systemservice/system_manager/server/src/systemmanager_main.cpp
rename to service/system/system_manager/server/src/systemmanager_main.cpp

diff --git a/systemservice/system_manager/server/version.txt b/service/system/system_manager/server/version.txt
similarity index 100%
rename from systemservice/system_manager/server/version.txt
rename to service/system/system_manager/server/version.txt

diff --git a/systemservice/system_service.mk b/service/system/system_service.mk
similarity index 100%
rename from systemservice/system_service.mk
rename to service/system/system_service.mk

diff --git a/vehicle_hal/LICENSE b/service/system/task_manager/LICENSE
similarity index 100%
rename from vehicle_hal/LICENSE
rename to service/system/task_manager/LICENSE

diff --git a/systemservice/task_manager/Makefile.client b/service/system/task_manager/Makefile.client
similarity index 100%
rename from systemservice/task_manager/Makefile.client
rename to service/system/task_manager/Makefile.client

diff --git a/systemservice/task_manager/Makefile.server b/service/system/task_manager/Makefile.server
similarity index 100%
rename from systemservice/task_manager/Makefile.server
rename to service/system/task_manager/Makefile.server

diff --git a/systemservice/task_manager/client/Makefile b/service/system/task_manager/client/Makefile
similarity index 100%
rename from systemservice/task_manager/client/Makefile
rename to service/system/task_manager/client/Makefile

diff --git a/systemservice/task_manager/client/libprimary/Makefile b/service/system/task_manager/client/libprimary/Makefile
similarity index 100%
rename from systemservice/task_manager/client/libprimary/Makefile
rename to service/system/task_manager/client/libprimary/Makefile

diff --git a/systemservice/task_manager/client/libprimary/include/pri_main.h b/service/system/task_manager/client/libprimary/include/pri_main.h
similarity index 100%
rename from systemservice/task_manager/client/libprimary/include/pri_main.h
rename to service/system/task_manager/client/libprimary/include/pri_main.h

diff --git a/systemservice/task_manager/client/libprimary/libprimary.ver b/service/system/task_manager/client/libprimary/libprimary.ver
similarity index 100%
rename from systemservice/task_manager/client/libprimary/libprimary.ver
rename to service/system/task_manager/client/libprimary/libprimary.ver

diff --git a/systemservice/task_manager/client/libprimary/src/pri_api.cpp b/service/system/task_manager/client/libprimary/src/pri_api.cpp
similarity index 100%
rename from systemservice/task_manager/client/libprimary/src/pri_api.cpp
rename to service/system/task_manager/client/libprimary/src/pri_api.cpp

diff --git a/systemservice/task_manager/client/libprimary/src/pri_main.cpp b/service/system/task_manager/client/libprimary/src/pri_main.cpp
similarity index 100%
rename from systemservice/task_manager/client/libprimary/src/pri_main.cpp
rename to service/system/task_manager/client/libprimary/src/pri_main.cpp

diff --git a/systemservice/task_manager/client/libtskm/Makefile b/service/system/task_manager/client/libtskm/Makefile
similarity index 100%
rename from systemservice/task_manager/client/libtskm/Makefile
rename to service/system/task_manager/client/libtskm/Makefile

diff --git a/systemservice/task_manager/client/libtskm/TSKM.api b/service/system/task_manager/client/libtskm/TSKM.api
similarity index 100%
rename from systemservice/task_manager/client/libtskm/TSKM.api
rename to service/system/task_manager/client/libtskm/TSKM.api

diff --git a/systemservice/task_manager/client/libtskm/libtskm.ver b/service/system/task_manager/client/libtskm/libtskm.ver
similarity index 100%
rename from systemservice/task_manager/client/libtskm/libtskm.ver
rename to service/system/task_manager/client/libtskm/libtskm.ver

diff --git a/systemservice/task_manager/client/libtskm/src/tskm_api_lib.cpp b/service/system/task_manager/client/libtskm/src/tskm_api_lib.cpp
similarity index 100%
rename from systemservice/task_manager/client/libtskm/src/tskm_api_lib.cpp
rename to service/system/task_manager/client/libtskm/src/tskm_api_lib.cpp

diff --git a/systemservice/task_manager/client/libtskmcfg/Makefile b/service/system/task_manager/client/libtskmcfg/Makefile
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/Makefile
rename to service/system/task_manager/client/libtskmcfg/Makefile

diff --git a/systemservice/task_manager/client/libtskmcfg/conf/agl_thread.h b/service/system/task_manager/client/libtskmcfg/conf/agl_thread.h
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/conf/agl_thread.h
rename to service/system/task_manager/client/libtskmcfg/conf/agl_thread.h

diff --git a/systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml b/service/system/task_manager/client/libtskmcfg/conf/tskm_launch.xml
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/conf/tskm_launch.xml
rename to service/system/task_manager/client/libtskmcfg/conf/tskm_launch.xml

diff --git a/systemservice/task_manager/client/libtskmcfg/conf/tskm_shutdown.xml b/service/system/task_manager/client/libtskmcfg/conf/tskm_shutdown.xml
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/conf/tskm_shutdown.xml
rename to service/system/task_manager/client/libtskmcfg/conf/tskm_shutdown.xml

diff --git a/systemservice/task_manager/client/libtskmcfg/conf/tskm_shutdown_vup.xml b/service/system/task_manager/client/libtskmcfg/conf/tskm_shutdown_vup.xml
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/conf/tskm_shutdown_vup.xml
rename to service/system/task_manager/client/libtskmcfg/conf/tskm_shutdown_vup.xml

diff --git a/systemservice/task_manager/client/libtskmcfg/conf/tskm_wakeup.xml b/service/system/task_manager/client/libtskmcfg/conf/tskm_wakeup.xml
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/conf/tskm_wakeup.xml
rename to service/system/task_manager/client/libtskmcfg/conf/tskm_wakeup.xml

diff --git a/systemservice/task_manager/client/libtskmcfg/conf/tskm_wakeup_vup.xml b/service/system/task_manager/client/libtskmcfg/conf/tskm_wakeup_vup.xml
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/conf/tskm_wakeup_vup.xml
rename to service/system/task_manager/client/libtskmcfg/conf/tskm_wakeup_vup.xml

diff --git a/systemservice/task_manager/client/libtskmcfg/include/system_service/task_manager_libtskmcfg.h b/service/system/task_manager/client/libtskmcfg/include/system_service/task_manager_libtskmcfg.h
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/include/system_service/task_manager_libtskmcfg.h
rename to service/system/task_manager/client/libtskmcfg/include/system_service/task_manager_libtskmcfg.h

diff --git a/systemservice/task_manager/client/libtskmcfg/include/system_service/tskm_svcid.h b/service/system/task_manager/client/libtskmcfg/include/system_service/tskm_svcid.h
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/include/system_service/tskm_svcid.h
rename to service/system/task_manager/client/libtskmcfg/include/system_service/tskm_svcid.h

diff --git a/systemservice/task_manager/client/libtskmcfg/include/system_service/tskm_xml_data.h b/service/system/task_manager/client/libtskmcfg/include/system_service/tskm_xml_data.h
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/include/system_service/tskm_xml_data.h
rename to service/system/task_manager/client/libtskmcfg/include/system_service/tskm_xml_data.h

diff --git a/systemservice/task_manager/client/libtskmcfg/libtskmcfg.ver b/service/system/task_manager/client/libtskmcfg/libtskmcfg.ver
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/libtskmcfg.ver
rename to service/system/task_manager/client/libtskmcfg/libtskmcfg.ver

diff --git a/systemservice/task_manager/client/libtskmcfg/src/parsexml.c b/service/system/task_manager/client/libtskmcfg/src/parsexml.c
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/src/parsexml.c
rename to service/system/task_manager/client/libtskmcfg/src/parsexml.c

diff --git a/systemservice/task_manager/client/libtskmcfg/src/tskm_xml_data.cpp b/service/system/task_manager/client/libtskmcfg/src/tskm_xml_data.cpp
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/src/tskm_xml_data.cpp
rename to service/system/task_manager/client/libtskmcfg/src/tskm_xml_data.cpp

diff --git a/systemservice/task_manager/client/libtskmcfg/tskm_cfg.xml b/service/system/task_manager/client/libtskmcfg/tskm_cfg.xml
similarity index 100%
rename from systemservice/task_manager/client/libtskmcfg/tskm_cfg.xml
rename to service/system/task_manager/client/libtskmcfg/tskm_cfg.xml

diff --git a/systemservice/task_manager/client/ss_data_init/Makefile b/service/system/task_manager/client/ss_data_init/Makefile
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/Makefile
rename to service/system/task_manager/client/ss_data_init/Makefile

diff --git a/systemservice/task_manager/client/ss_data_init/include/libss_data_init_taskmanagerlog.h b/service/system/task_manager/client/ss_data_init/include/libss_data_init_taskmanagerlog.h
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/include/libss_data_init_taskmanagerlog.h
rename to service/system/task_manager/client/ss_data_init/include/libss_data_init_taskmanagerlog.h

diff --git a/systemservice/task_manager/client/ss_data_init/include/system_service/task_manager_libss_data_init.h b/service/system/task_manager/client/ss_data_init/include/system_service/task_manager_libss_data_init.h
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/include/system_service/task_manager_libss_data_init.h
rename to service/system/task_manager/client/ss_data_init/include/system_service/task_manager_libss_data_init.h

diff --git a/systemservice/task_manager/client/ss_data_init/include/system_service/tskm_data_init.h b/service/system/task_manager/client/ss_data_init/include/system_service/tskm_data_init.h
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/include/system_service/tskm_data_init.h
rename to service/system/task_manager/client/ss_data_init/include/system_service/tskm_data_init.h

diff --git a/systemservice/task_manager/client/ss_data_init/include/tskm_data_init_local.h b/service/system/task_manager/client/ss_data_init/include/tskm_data_init_local.h
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/include/tskm_data_init_local.h
rename to service/system/task_manager/client/ss_data_init/include/tskm_data_init_local.h

diff --git a/systemservice/task_manager/client/ss_data_init/mkdatainit.sh b/service/system/task_manager/client/ss_data_init/mkdatainit.sh
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/mkdatainit.sh
rename to service/system/task_manager/client/ss_data_init/mkdatainit.sh

diff --git a/systemservice/task_manager/client/ss_data_init/tskm_data_init.cpp.in b/service/system/task_manager/client/ss_data_init/tskm_data_init.cpp.in
similarity index 100%
rename from systemservice/task_manager/client/ss_data_init/tskm_data_init.cpp.in
rename to service/system/task_manager/client/ss_data_init/tskm_data_init.cpp.in

diff --git a/systemservice/task_manager/include-share/tskm_gstep.h b/service/system/task_manager/include-share/tskm_gstep.h
similarity index 100%
rename from systemservice/task_manager/include-share/tskm_gstep.h
rename to service/system/task_manager/include-share/tskm_gstep.h

diff --git a/systemservice/task_manager/include-share/tskm_type_local.h b/service/system/task_manager/include-share/tskm_type_local.h
similarity index 100%
rename from systemservice/task_manager/include-share/tskm_type_local.h
rename to service/system/task_manager/include-share/tskm_type_local.h

diff --git a/systemservice/task_manager/include-share/tskm_util.h b/service/system/task_manager/include-share/tskm_util.h
similarity index 100%
rename from systemservice/task_manager/include-share/tskm_util.h
rename to service/system/task_manager/include-share/tskm_util.h

diff --git a/systemservice/task_manager/server/Makefile b/service/system/task_manager/server/Makefile
similarity index 100%
rename from systemservice/task_manager/server/Makefile
rename to service/system/task_manager/server/Makefile

diff --git a/systemservice/task_manager/server/include/system_service/INI_API.h b/service/system/task_manager/server/include/system_service/INI_API.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/INI_API.h
rename to service/system/task_manager/server/include/system_service/INI_API.h

diff --git a/systemservice/task_manager/server/include/system_service/INI_API.hpp b/service/system/task_manager/server/include/system_service/INI_API.hpp
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/INI_API.hpp
rename to service/system/task_manager/server/include/system_service/INI_API.hpp

diff --git a/systemservice/task_manager/server/include/system_service/Primary_common.h b/service/system/task_manager/server/include/system_service/Primary_common.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/Primary_common.h
rename to service/system/task_manager/server/include/system_service/Primary_common.h

diff --git a/systemservice/task_manager/server/include/system_service/sysup.h b/service/system/task_manager/server/include/system_service/sysup.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/sysup.h
rename to service/system/task_manager/server/include/system_service/sysup.h

diff --git a/systemservice/task_manager/server/include/system_service/sysup_from.h b/service/system/task_manager/server/include/system_service/sysup_from.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/sysup_from.h
rename to service/system/task_manager/server/include/system_service/sysup_from.h

diff --git a/systemservice/task_manager/server/include/system_service/task_manager.h b/service/system/task_manager/server/include/system_service/task_manager.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/task_manager.h
rename to service/system/task_manager/server/include/system_service/task_manager.h

diff --git a/systemservice/task_manager/server/include/system_service/tskm.h b/service/system/task_manager/server/include/system_service/tskm.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/tskm.h
rename to service/system/task_manager/server/include/system_service/tskm.h

diff --git a/systemservice/task_manager/server/include/system_service/tskm_local_type.h b/service/system/task_manager/server/include/system_service/tskm_local_type.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/tskm_local_type.h
rename to service/system/task_manager/server/include/system_service/tskm_local_type.h

diff --git a/systemservice/task_manager/server/include/system_service/tskm_svc.h b/service/system/task_manager/server/include/system_service/tskm_svc.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/tskm_svc.h
rename to service/system/task_manager/server/include/system_service/tskm_svc.h

diff --git a/systemservice/task_manager/server/include/system_service/tskm_type.h b/service/system/task_manager/server/include/system_service/tskm_type.h
similarity index 100%
rename from systemservice/task_manager/server/include/system_service/tskm_type.h
rename to service/system/task_manager/server/include/system_service/tskm_type.h

diff --git a/systemservice/task_manager/server/include/tskm_comm.h b/service/system/task_manager/server/include/tskm_comm.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_comm.h
rename to service/system/task_manager/server/include/tskm_comm.h

diff --git a/systemservice/task_manager/server/include/tskm_debug.h b/service/system/task_manager/server/include/tskm_debug.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_debug.h
rename to service/system/task_manager/server/include/tskm_debug.h

diff --git a/systemservice/task_manager/server/include/tskm_main.h b/service/system/task_manager/server/include/tskm_main.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_main.h
rename to service/system/task_manager/server/include/tskm_main.h

diff --git a/systemservice/task_manager/server/include/tskm_port_pf.h b/service/system/task_manager/server/include/tskm_port_pf.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_port_pf.h
rename to service/system/task_manager/server/include/tskm_port_pf.h

diff --git a/systemservice/task_manager/server/include/tskm_port_subsys.h b/service/system/task_manager/server/include/tskm_port_subsys.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_port_subsys.h
rename to service/system/task_manager/server/include/tskm_port_subsys.h

diff --git a/systemservice/task_manager/server/include/tskm_shutdown.h b/service/system/task_manager/server/include/tskm_shutdown.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_shutdown.h
rename to service/system/task_manager/server/include/tskm_shutdown.h

diff --git a/systemservice/task_manager/server/include/tskm_state.h b/service/system/task_manager/server/include/tskm_state.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_state.h
rename to service/system/task_manager/server/include/tskm_state.h

diff --git a/systemservice/task_manager/server/include/tskm_wakeup.h b/service/system/task_manager/server/include/tskm_wakeup.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_wakeup.h
rename to service/system/task_manager/server/include/tskm_wakeup.h

diff --git a/systemservice/task_manager/server/include/tskm_watch.h b/service/system/task_manager/server/include/tskm_watch.h
similarity index 100%
rename from systemservice/task_manager/server/include/tskm_watch.h
rename to service/system/task_manager/server/include/tskm_watch.h

diff --git a/systemservice/task_manager/server/src/pri_main.cpp b/service/system/task_manager/server/src/pri_main.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/pri_main.cpp
rename to service/system/task_manager/server/src/pri_main.cpp

diff --git a/systemservice/task_manager/server/src/tskm_api.cpp b/service/system/task_manager/server/src/tskm_api.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_api.cpp
rename to service/system/task_manager/server/src/tskm_api.cpp

diff --git a/systemservice/task_manager/server/src/tskm_comm.cpp b/service/system/task_manager/server/src/tskm_comm.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_comm.cpp
rename to service/system/task_manager/server/src/tskm_comm.cpp

diff --git a/systemservice/task_manager/server/src/tskm_debug.cpp b/service/system/task_manager/server/src/tskm_debug.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_debug.cpp
rename to service/system/task_manager/server/src/tskm_debug.cpp

diff --git a/systemservice/task_manager/server/src/tskm_main.cpp b/service/system/task_manager/server/src/tskm_main.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_main.cpp
rename to service/system/task_manager/server/src/tskm_main.cpp

diff --git a/systemservice/task_manager/server/src/tskm_port_pf.cpp b/service/system/task_manager/server/src/tskm_port_pf.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_port_pf.cpp
rename to service/system/task_manager/server/src/tskm_port_pf.cpp

diff --git a/systemservice/task_manager/server/src/tskm_port_subsys.cpp b/service/system/task_manager/server/src/tskm_port_subsys.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_port_subsys.cpp
rename to service/system/task_manager/server/src/tskm_port_subsys.cpp

diff --git a/systemservice/task_manager/server/src/tskm_shutdown.cpp b/service/system/task_manager/server/src/tskm_shutdown.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_shutdown.cpp
rename to service/system/task_manager/server/src/tskm_shutdown.cpp

diff --git a/systemservice/task_manager/server/src/tskm_state.cpp b/service/system/task_manager/server/src/tskm_state.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_state.cpp
rename to service/system/task_manager/server/src/tskm_state.cpp

diff --git a/systemservice/task_manager/server/src/tskm_svc.cpp b/service/system/task_manager/server/src/tskm_svc.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_svc.cpp
rename to service/system/task_manager/server/src/tskm_svc.cpp

diff --git a/systemservice/task_manager/server/src/tskm_wakeup.cpp b/service/system/task_manager/server/src/tskm_wakeup.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_wakeup.cpp
rename to service/system/task_manager/server/src/tskm_wakeup.cpp

diff --git a/systemservice/task_manager/server/src/tskm_watch.cpp b/service/system/task_manager/server/src/tskm_watch.cpp
similarity index 100%
rename from systemservice/task_manager/server/src/tskm_watch.cpp
rename to service/system/task_manager/server/src/tskm_watch.cpp

diff --git a/vehicleservice/positioning/LICENSE b/service/system/version_library/LICENSE
similarity index 100%
rename from vehicleservice/positioning/LICENSE
rename to service/system/version_library/LICENSE

diff --git a/systemservice/version_library/Makefile.client b/service/system/version_library/Makefile.client
similarity index 100%
rename from systemservice/version_library/Makefile.client
rename to service/system/version_library/Makefile.client

diff --git a/systemservice/version_library/library/Makefile b/service/system/version_library/library/Makefile
similarity index 100%
rename from systemservice/version_library/library/Makefile
rename to service/system/version_library/library/Makefile

diff --git a/systemservice/version_library/library/include/system_service/ss_ver.h b/service/system/version_library/library/include/system_service/ss_ver.h
similarity index 100%
rename from systemservice/version_library/library/include/system_service/ss_ver.h
rename to service/system/version_library/library/include/system_service/ss_ver.h

diff --git a/systemservice/version_library/library/include/system_service/version_library.h b/service/system/version_library/library/include/system_service/version_library.h
similarity index 100%
rename from systemservice/version_library/library/include/system_service/version_library.h
rename to service/system/version_library/library/include/system_service/version_library.h

diff --git a/systemservice/version_library/library/src/ss_ver.cc b/service/system/version_library/library/src/ss_ver.cc
similarity index 100%
rename from systemservice/version_library/library/src/ss_ver.cc
rename to service/system/version_library/library/src/ss_ver.cc

diff --git a/vehicleservice/.gitattributes b/service/vehicle/.gitattributes
similarity index 100%
rename from vehicleservice/.gitattributes
rename to service/vehicle/.gitattributes

diff --git a/vehicleservice/positioning_base_library/LICENSE b/service/vehicle/positioning/LICENSE
similarity index 100%
rename from vehicleservice/positioning_base_library/LICENSE
rename to service/vehicle/positioning/LICENSE

diff --git a/vehicleservice/positioning/Makefile.client b/service/vehicle/positioning/Makefile.client
similarity index 100%
rename from vehicleservice/positioning/Makefile.client
rename to service/vehicle/positioning/Makefile.client

diff --git a/vehicleservice/positioning/Makefile.server b/service/vehicle/positioning/Makefile.server
similarity index 100%
rename from vehicleservice/positioning/Makefile.server
rename to service/vehicle/positioning/Makefile.server

diff --git a/vehicleservice/positioning/client/Makefile b/service/vehicle/positioning/client/Makefile
similarity index 100%
rename from vehicleservice/positioning/client/Makefile
rename to service/vehicle/positioning/client/Makefile

diff --git a/vehicleservice/positioning/client/include/CanInput_API.h b/service/vehicle/positioning/client/include/CanInput_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/CanInput_API.h
rename to service/vehicle/positioning/client/include/CanInput_API.h

diff --git a/vehicleservice/positioning/client/include/CanInput_API_private.h b/service/vehicle/positioning/client/include/CanInput_API_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/CanInput_API_private.h
rename to service/vehicle/positioning/client/include/CanInput_API_private.h

diff --git a/vehicleservice/positioning/client/include/Clock_API.h b/service/vehicle/positioning/client/include/Clock_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Clock_API.h
rename to service/vehicle/positioning/client/include/Clock_API.h

diff --git a/vehicleservice/positioning/client/include/CommonDefine.h b/service/vehicle/positioning/client/include/CommonDefine.h
similarity index 100%
rename from vehicleservice/positioning/client/include/CommonDefine.h
rename to service/vehicle/positioning/client/include/CommonDefine.h

diff --git a/vehicleservice/positioning/client/include/DR_API.h b/service/vehicle/positioning/client/include/DR_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/DR_API.h
rename to service/vehicle/positioning/client/include/DR_API.h

diff --git a/vehicleservice/positioning/client/include/DeadReckoning_DbgLogSim.h b/service/vehicle/positioning/client/include/DeadReckoning_DbgLogSim.h
similarity index 100%
rename from vehicleservice/positioning/client/include/DeadReckoning_DbgLogSim.h
rename to service/vehicle/positioning/client/include/DeadReckoning_DbgLogSim.h

diff --git a/vehicleservice/positioning/client/include/Dead_Reckoning_API.h b/service/vehicle/positioning/client/include/Dead_Reckoning_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Dead_Reckoning_API.h
rename to service/vehicle/positioning/client/include/Dead_Reckoning_API.h

diff --git a/vehicleservice/positioning/client/include/Dead_Reckoning_Local_Api.h b/service/vehicle/positioning/client/include/Dead_Reckoning_Local_Api.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Dead_Reckoning_Local_Api.h
rename to service/vehicle/positioning/client/include/Dead_Reckoning_Local_Api.h

diff --git a/vehicleservice/positioning/client/include/Gps_API_private.h b/service/vehicle/positioning/client/include/Gps_API_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Gps_API_private.h
rename to service/vehicle/positioning/client/include/Gps_API_private.h

diff --git a/vehicleservice/positioning/client/include/INI_API.h b/service/vehicle/positioning/client/include/INI_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/INI_API.h
rename to service/vehicle/positioning/client/include/INI_API.h

diff --git a/vehicleservice/positioning/client/include/Naviinfo_API.h b/service/vehicle/positioning/client/include/Naviinfo_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Naviinfo_API.h
rename to service/vehicle/positioning/client/include/Naviinfo_API.h

diff --git a/vehicleservice/positioning/client/include/POS_common_private.h b/service/vehicle/positioning/client/include/POS_common_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/POS_common_private.h
rename to service/vehicle/positioning/client/include/POS_common_private.h

diff --git a/vehicleservice/positioning/client/include/POS_private.h b/service/vehicle/positioning/client/include/POS_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/POS_private.h
rename to service/vehicle/positioning/client/include/POS_private.h

diff --git a/vehicleservice/positioning/client/include/POS_sensor_private.h b/service/vehicle/positioning/client/include/POS_sensor_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/POS_sensor_private.h
rename to service/vehicle/positioning/client/include/POS_sensor_private.h

diff --git a/vehicleservice/positioning/client/include/SensorLocation_API.h b/service/vehicle/positioning/client/include/SensorLocation_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/SensorLocation_API.h
rename to service/vehicle/positioning/client/include/SensorLocation_API.h

diff --git a/vehicleservice/positioning/client/include/SensorLocation_API_private.h b/service/vehicle/positioning/client/include/SensorLocation_API_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/SensorLocation_API_private.h
rename to service/vehicle/positioning/client/include/SensorLocation_API_private.h

diff --git a/vehicleservice/positioning/client/include/SensorMotion_API.h b/service/vehicle/positioning/client/include/SensorMotion_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/SensorMotion_API.h
rename to service/vehicle/positioning/client/include/SensorMotion_API.h

diff --git a/vehicleservice/positioning/client/include/Sensor_API.h b/service/vehicle/positioning/client/include/Sensor_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Sensor_API.h
rename to service/vehicle/positioning/client/include/Sensor_API.h

diff --git a/vehicleservice/positioning/client/include/Sensor_API_private.h b/service/vehicle/positioning/client/include/Sensor_API_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Sensor_API_private.h
rename to service/vehicle/positioning/client/include/Sensor_API_private.h

diff --git a/vehicleservice/positioning/client/include/Sensor_Common_API.h b/service/vehicle/positioning/client/include/Sensor_Common_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Sensor_Common_API.h
rename to service/vehicle/positioning/client/include/Sensor_Common_API.h

diff --git a/vehicleservice/positioning/client/include/VehicleDebug_API.h b/service/vehicle/positioning/client/include/VehicleDebug_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/VehicleDebug_API.h
rename to service/vehicle/positioning/client/include/VehicleDebug_API.h

diff --git a/vehicleservice/positioning/client/include/Vehicle_API.h b/service/vehicle/positioning/client/include/Vehicle_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Vehicle_API.h
rename to service/vehicle/positioning/client/include/Vehicle_API.h

diff --git a/vehicleservice/positioning/client/include/Vehicle_API_Dummy.h b/service/vehicle/positioning/client/include/Vehicle_API_Dummy.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Vehicle_API_Dummy.h
rename to service/vehicle/positioning/client/include/Vehicle_API_Dummy.h

diff --git a/vehicleservice/positioning/client/include/Vehicle_API_private.h b/service/vehicle/positioning/client/include/Vehicle_API_private.h
similarity index 100%
rename from vehicleservice/positioning/client/include/Vehicle_API_private.h
rename to service/vehicle/positioning/client/include/Vehicle_API_private.h

diff --git a/vehicleservice/positioning/client/include/vehicle_service/POS_common_API.h b/service/vehicle/positioning/client/include/vehicle_service/POS_common_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/vehicle_service/POS_common_API.h
rename to service/vehicle/positioning/client/include/vehicle_service/POS_common_API.h

diff --git a/vehicleservice/positioning/client/include/vehicle_service/POS_define.h b/service/vehicle/positioning/client/include/vehicle_service/POS_define.h
similarity index 100%
rename from vehicleservice/positioning/client/include/vehicle_service/POS_define.h
rename to service/vehicle/positioning/client/include/vehicle_service/POS_define.h

diff --git a/vehicleservice/positioning/client/include/vehicle_service/POS_gps_API.h b/service/vehicle/positioning/client/include/vehicle_service/POS_gps_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/vehicle_service/POS_gps_API.h
rename to service/vehicle/positioning/client/include/vehicle_service/POS_gps_API.h

diff --git a/vehicleservice/positioning/client/include/vehicle_service/POS_sensor_API.h b/service/vehicle/positioning/client/include/vehicle_service/POS_sensor_API.h
similarity index 100%
rename from vehicleservice/positioning/client/include/vehicle_service/POS_sensor_API.h
rename to service/vehicle/positioning/client/include/vehicle_service/POS_sensor_API.h

diff --git a/vehicleservice/positioning/client/include/vehicle_service/positioning.h b/service/vehicle/positioning/client/include/vehicle_service/positioning.h
similarity index 100%
rename from vehicleservice/positioning/client/include/vehicle_service/positioning.h
rename to service/vehicle/positioning/client/include/vehicle_service/positioning.h

diff --git a/vehicleservice/positioning/client/src/POS_common_API/Common_API.cpp b/service/vehicle/positioning/client/src/POS_common_API/Common_API.cpp
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_common_API/Common_API.cpp
rename to service/vehicle/positioning/client/src/POS_common_API/Common_API.cpp

diff --git a/vehicleservice/positioning/client/src/POS_common_API/Makefile b/service/vehicle/positioning/client/src/POS_common_API/Makefile
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_common_API/Makefile
rename to service/vehicle/positioning/client/src/POS_common_API/Makefile

diff --git a/vehicleservice/positioning/client/src/POS_common_API/libPOS_common_API.ver b/service/vehicle/positioning/client/src/POS_common_API/libPOS_common_API.ver
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_common_API/libPOS_common_API.ver
rename to service/vehicle/positioning/client/src/POS_common_API/libPOS_common_API.ver

diff --git a/vehicleservice/positioning/client/src/POS_gps_API/Gps_API.cpp b/service/vehicle/positioning/client/src/POS_gps_API/Gps_API.cpp
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_gps_API/Gps_API.cpp
rename to service/vehicle/positioning/client/src/POS_gps_API/Gps_API.cpp

diff --git a/vehicleservice/positioning/client/src/POS_gps_API/Makefile b/service/vehicle/positioning/client/src/POS_gps_API/Makefile
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_gps_API/Makefile
rename to service/vehicle/positioning/client/src/POS_gps_API/Makefile

diff --git a/vehicleservice/positioning/client/src/POS_gps_API/Naviinfo_API.cpp b/service/vehicle/positioning/client/src/POS_gps_API/Naviinfo_API.cpp
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_gps_API/Naviinfo_API.cpp
rename to service/vehicle/positioning/client/src/POS_gps_API/Naviinfo_API.cpp

diff --git a/vehicleservice/positioning/client/src/POS_gps_API/libPOS_gps_API.ver b/service/vehicle/positioning/client/src/POS_gps_API/libPOS_gps_API.ver
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_gps_API/libPOS_gps_API.ver
rename to service/vehicle/positioning/client/src/POS_gps_API/libPOS_gps_API.ver

diff --git a/vehicleservice/positioning/client/src/POS_sensor_API/Makefile b/service/vehicle/positioning/client/src/POS_sensor_API/Makefile
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_sensor_API/Makefile
rename to service/vehicle/positioning/client/src/POS_sensor_API/Makefile

diff --git a/vehicleservice/positioning/client/src/POS_sensor_API/Sensor_API.cpp b/service/vehicle/positioning/client/src/POS_sensor_API/Sensor_API.cpp
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_sensor_API/Sensor_API.cpp
rename to service/vehicle/positioning/client/src/POS_sensor_API/Sensor_API.cpp

diff --git a/vehicleservice/positioning/client/src/POS_sensor_API/Vehicle_API.cpp b/service/vehicle/positioning/client/src/POS_sensor_API/Vehicle_API.cpp
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_sensor_API/Vehicle_API.cpp
rename to service/vehicle/positioning/client/src/POS_sensor_API/Vehicle_API.cpp

diff --git a/vehicleservice/positioning/client/src/POS_sensor_API/libPOS_sensor_API.ver b/service/vehicle/positioning/client/src/POS_sensor_API/libPOS_sensor_API.ver
similarity index 100%
rename from vehicleservice/positioning/client/src/POS_sensor_API/libPOS_sensor_API.ver
rename to service/vehicle/positioning/client/src/POS_sensor_API/libPOS_sensor_API.ver

diff --git a/vehicleservice/positioning/server/Makefile b/service/vehicle/positioning/server/Makefile
similarity index 100%
rename from vehicleservice/positioning/server/Makefile
rename to service/vehicle/positioning/server/Makefile

diff --git a/vehicleservice/positioning/server/include/Sensor/ClockDataMng.h b/service/vehicle/positioning/server/include/Sensor/ClockDataMng.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/ClockDataMng.h
rename to service/vehicle/positioning/server/include/Sensor/ClockDataMng.h

diff --git a/vehicleservice/positioning/server/include/Sensor/ClockGPS_Process_Proto.h b/service/vehicle/positioning/server/include/Sensor/ClockGPS_Process_Proto.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/ClockGPS_Process_Proto.h
rename to service/vehicle/positioning/server/include/Sensor/ClockGPS_Process_Proto.h

diff --git a/vehicleservice/positioning/server/include/Sensor/ClockUtility.h b/service/vehicle/positioning/server/include/Sensor/ClockUtility.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/ClockUtility.h
rename to service/vehicle/positioning/server/include/Sensor/ClockUtility.h

diff --git a/vehicleservice/positioning/server/include/Sensor/ClockUtility_private.h b/service/vehicle/positioning/server/include/Sensor/ClockUtility_private.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/ClockUtility_private.h
rename to service/vehicle/positioning/server/include/Sensor/ClockUtility_private.h

diff --git a/vehicleservice/positioning/server/include/Sensor/DeadReckoning_Common.h b/service/vehicle/positioning/server/include/Sensor/DeadReckoning_Common.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/DeadReckoning_Common.h
rename to service/vehicle/positioning/server/include/Sensor/DeadReckoning_Common.h

diff --git a/vehicleservice/positioning/server/include/Sensor/DeadReckoning_DataMaster.h b/service/vehicle/positioning/server/include/Sensor/DeadReckoning_DataMaster.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/DeadReckoning_DataMaster.h
rename to service/vehicle/positioning/server/include/Sensor/DeadReckoning_DataMaster.h

diff --git a/vehicleservice/positioning/server/include/Sensor/DeadReckoning_DeliveryCtrl.h b/service/vehicle/positioning/server/include/Sensor/DeadReckoning_DeliveryCtrl.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/DeadReckoning_DeliveryCtrl.h
rename to service/vehicle/positioning/server/include/Sensor/DeadReckoning_DeliveryCtrl.h

diff --git a/vehicleservice/positioning/server/include/Sensor/DeadReckoning_main.h b/service/vehicle/positioning/server/include/Sensor/DeadReckoning_main.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/DeadReckoning_main.h
rename to service/vehicle/positioning/server/include/Sensor/DeadReckoning_main.h

diff --git a/vehicleservice/positioning/server/include/Sensor/GpsInt.h b/service/vehicle/positioning/server/include/Sensor/GpsInt.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/GpsInt.h
rename to service/vehicle/positioning/server/include/Sensor/GpsInt.h

diff --git a/vehicleservice/positioning/server/include/Sensor/SensorLog.h b/service/vehicle/positioning/server/include/Sensor/SensorLog.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/SensorLog.h
rename to service/vehicle/positioning/server/include/Sensor/SensorLog.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_Common.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_Common.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_Common.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_Common.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_DataMaster.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_DataMaster.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_DataMaster.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_DataMaster.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_DeliveryCtrl.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_DeliveryCtrl.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_DeliveryCtrl.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_DeliveryCtrl.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_FromAccess.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_FromAccess.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_FromAccess.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_FromAccess.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_SelectionItemList.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_SelectionItemList.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_SelectionItemList.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_SelectionItemList.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_SharedMemory.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_SharedMemory.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_SharedMemory.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_SharedMemory.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSens_Thread.h b/service/vehicle/positioning/server/include/Sensor/VehicleSens_Thread.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSens_Thread.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSens_Thread.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleSensor_Thread.h b/service/vehicle/positioning/server/include/Sensor/VehicleSensor_Thread.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleSensor_Thread.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleSensor_Thread.h

diff --git a/vehicleservice/positioning/server/include/Sensor/VehicleUtility.h b/service/vehicle/positioning/server/include/Sensor/VehicleUtility.h
similarity index 100%
rename from vehicleservice/positioning/server/include/Sensor/VehicleUtility.h
rename to service/vehicle/positioning/server/include/Sensor/VehicleUtility.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/BackupMgrIf.h b/service/vehicle/positioning/server/include/ServiceInterface/BackupMgrIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/BackupMgrIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/BackupMgrIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/ClockIf.h b/service/vehicle/positioning/server/include/ServiceInterface/ClockIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/ClockIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/ClockIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/CommUsbIf.h b/service/vehicle/positioning/server/include/ServiceInterface/CommUsbIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/CommUsbIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/CommUsbIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/DevDetectSrvIf.h b/service/vehicle/positioning/server/include/ServiceInterface/DevDetectSrvIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/DevDetectSrvIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/DevDetectSrvIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/DiagSrvIf.h b/service/vehicle/positioning/server/include/ServiceInterface/DiagSrvIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/DiagSrvIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/DiagSrvIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/PSMShadowIf.h b/service/vehicle/positioning/server/include/ServiceInterface/PSMShadowIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/PSMShadowIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/PSMShadowIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/VehicleIf.h b/service/vehicle/positioning/server/include/ServiceInterface/VehicleIf.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/VehicleIf.h
rename to service/vehicle/positioning/server/include/ServiceInterface/VehicleIf.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/ps_psmshadow_notifications.h b/service/vehicle/positioning/server/include/ServiceInterface/ps_psmshadow_notifications.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/ps_psmshadow_notifications.h
rename to service/vehicle/positioning/server/include/ServiceInterface/ps_psmshadow_notifications.h

diff --git a/vehicleservice/positioning/server/include/ServiceInterface/ps_version.h b/service/vehicle/positioning/server/include/ServiceInterface/ps_version.h
similarity index 100%
rename from vehicleservice/positioning/server/include/ServiceInterface/ps_version.h
rename to service/vehicle/positioning/server/include/ServiceInterface/ps_version.h

diff --git a/vehicleservice/positioning/server/include/nsfw/positioning_common.h b/service/vehicle/positioning/server/include/nsfw/positioning_common.h
similarity index 100%
rename from vehicleservice/positioning/server/include/nsfw/positioning_common.h
rename to service/vehicle/positioning/server/include/nsfw/positioning_common.h

diff --git a/vehicleservice/positioning/server/include/nsfw/vehicle_version.h b/service/vehicle/positioning/server/include/nsfw/vehicle_version.h
similarity index 100%
rename from vehicleservice/positioning/server/include/nsfw/vehicle_version.h
rename to service/vehicle/positioning/server/include/nsfw/vehicle_version.h

diff --git a/vehicleservice/positioning/server/src/Sensor/ClockUtility.cpp b/service/vehicle/positioning/server/src/Sensor/ClockUtility.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/ClockUtility.cpp
rename to service/vehicle/positioning/server/src/Sensor/ClockUtility.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Common.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Common.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Common.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Common.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_DataMasterMain.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_DataMasterMain.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_DataMasterMain.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_DataMasterMain.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_DeliveryCtrl.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_DeliveryCtrl.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_DeliveryCtrl.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_DeliveryCtrl.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Altitude_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Altitude_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Altitude_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Altitude_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_GyroOffset_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_GyroOffset_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_GyroOffset_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_GyroOffset_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactorLevel_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactorLevel_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactorLevel_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactorLevel_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactor_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactor_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactor_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_GyroScaleFactor_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Heading_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Heading_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Heading_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Heading_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Latitude_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Latitude_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Latitude_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Latitude_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Longitude_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Longitude_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Longitude_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Longitude_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_SnsCounter.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_SnsCounter.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_SnsCounter.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_SnsCounter.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactorLevel_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactorLevel_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactorLevel_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactorLevel_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactor_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactor_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactor_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_SpeedPulseScaleFactor_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Speed_dr.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Speed_dr.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_Did_Speed_dr.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_Did_Speed_dr.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/DeadReckoning_main.cpp b/service/vehicle/positioning/server/src/Sensor/DeadReckoning_main.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/DeadReckoning_main.cpp
rename to service/vehicle/positioning/server/src/Sensor/DeadReckoning_main.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/GpsInt.cpp b/service/vehicle/positioning/server/src/Sensor/GpsInt.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/GpsInt.cpp
rename to service/vehicle/positioning/server/src/Sensor/GpsInt.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/Makefile b/service/vehicle/positioning/server/src/Sensor/Makefile
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/Makefile
rename to service/vehicle/positioning/server/src/Sensor/Makefile

diff --git a/vehicleservice/positioning/server/src/Sensor/SensorLog.cpp b/service/vehicle/positioning/server/src/Sensor/SensorLog.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/SensorLog.cpp
rename to service/vehicle/positioning/server/src/Sensor/SensorLog.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_CanDeliveryEntry.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_CanDeliveryEntry.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_CanDeliveryEntry.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_CanDeliveryEntry.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Common.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Common.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Common.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Common.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_DataMasterMain.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_DataMasterMain.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_DataMasterMain.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_DataMasterMain.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_DeliveryCtrl.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_DeliveryCtrl.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_DeliveryCtrl.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_DeliveryCtrl.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GPSInterruptFlag.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GPSInterruptFlag.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GPSInterruptFlag.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GPSInterruptFlag.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsAntennaStatus.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsAntennaStatus.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsAntennaStatus.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsAntennaStatus.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsAntenna_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockDrift_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsClockFreq_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsCounter_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsCounter_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsCounter_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsCounter_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsNmea_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsNmea_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsNmea_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsNmea_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTime.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTime.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTime.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTime.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTimeRaw_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTime_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTime_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GpsTime_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GpsTime_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_FullBinary_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_Nmea_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_Nmea_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_Nmea_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82_Nmea_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82__CWORD44_Gp4_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82__CWORD44_Gp4_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82__CWORD44_Gp4_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Gps_CWORD82__CWORD44_Gp4_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsX.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsX.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsX.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsX.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsXExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsXExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsXExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsXExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsXFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsXFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsXFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsXFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsX_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsX_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsX_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsX_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsY.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsY.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsY.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsY.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsYExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsYExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsYExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsYExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsYFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsYFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsYFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsYFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsY_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsY_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsY_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsY_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GsnsZ_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroConnectStatus.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroConnectStatus.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroConnectStatus.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroConnectStatus.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTempExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTempExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTempExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTempExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTempFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTempFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTempFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTempFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTemp_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTrouble.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTrouble.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroTrouble.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroTrouble.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroX.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroX.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroX.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroX.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroXFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroXFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroXFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroXFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroX_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroX_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroX_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroX_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroY.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroY.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroY.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroY.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroYExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroYExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroYExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroYExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroYFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroYFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroYFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroYFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroY_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroY_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroY_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroY_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZ.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZ.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZ.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZ.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZ_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZ_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_GyroZ_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_GyroZ_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_n.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_n.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_n.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationAltitude_n.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea_n.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea_n.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea_n.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationInfoNmea_n.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_n.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_n.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_n.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_LocationLonLat_n.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MainGpsInterruptSignal.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MainGpsInterruptSignal.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MainGpsInterruptSignal.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MainGpsInterruptSignal.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Mon_Hw_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Mon_Hw_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Mon_Hw_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Mon_Hw_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_n.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_n.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_n.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionHeading_n.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_i.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_i.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_i.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_i.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_n.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_n.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_n.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_MotionSpeed_n.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Clock_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Clock_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Clock_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Clock_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Dop_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Dop_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Dop_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Dop_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Posllh_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Posllh_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Posllh_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Posllh_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Status_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Status_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Status_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Status_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_SvInfo_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_SvInfo_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_SvInfo_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_SvInfo_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeGps_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeGps_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeGps_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeGps_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeUtc_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeUtc_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeUtc_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_TimeUtc_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Velned_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Velned_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Nav_Velned_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Nav_Velned_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_NaviinfoDiagGPS_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_NaviinfoDiagGPS_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_NaviinfoDiagGPS_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_NaviinfoDiagGPS_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_PulseTime.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_PulseTime.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_PulseTime.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_PulseTime.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_PulseTimeExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_PulseTime_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_PulseTime_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_PulseTime_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_PulseTime_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Rev.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Rev.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Rev.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Rev.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_RevExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_RevFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_RevFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_RevFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_RevFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Rev_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Rev_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_Rev_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_Rev_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SettingTime.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SettingTime.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SettingTime.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SettingTime.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SettingTime_clock.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SettingTime_clock.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SettingTime_clock.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SettingTime_clock.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SnsCounterExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SnsCounterExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SnsCounterExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SnsCounterExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SnsCounter_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedKmph_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseExt_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlag.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlag.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlag.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlag.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlagFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlagFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlagFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFlagFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFst_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFst_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFst_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulseFst_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse_l.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse_l.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse_l.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SpeedPulse_l.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SysGpsInterruptSignal.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SysGpsInterruptSignal.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_SysGpsInterruptSignal.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_SysGpsInterruptSignal.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_WknRollover.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_WknRollover.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_WknRollover.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_WknRollover.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_WknRollover_g.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_WknRollover_g.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Did_WknRollover_g.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Did_WknRollover_g.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_FromAccess.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_FromAccess.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_FromAccess.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_FromAccess.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_SelectionItemList.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_SelectionItemList.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_SelectionItemList.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_SelectionItemList.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_SharedMemory.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_SharedMemory.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_SharedMemory.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_SharedMemory.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleSens_Thread.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleSens_Thread.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleSens_Thread.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleSens_Thread.cpp

diff --git a/vehicleservice/positioning/server/src/Sensor/VehicleUtility.cpp b/service/vehicle/positioning/server/src/Sensor/VehicleUtility.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/Sensor/VehicleUtility.cpp
rename to service/vehicle/positioning/server/src/Sensor/VehicleUtility.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/BackupMgrIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/BackupMgrIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/BackupMgrIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/BackupMgrIf.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/ClockIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/ClockIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/ClockIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/ClockIf.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/CommUsbIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/CommUsbIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/CommUsbIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/CommUsbIf.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/DevDetectSrvIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/DevDetectSrvIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/DevDetectSrvIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/DevDetectSrvIf.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/DiagSrvIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/DiagSrvIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/DiagSrvIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/DiagSrvIf.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/Makefile b/service/vehicle/positioning/server/src/ServiceInterface/Makefile
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/Makefile
rename to service/vehicle/positioning/server/src/ServiceInterface/Makefile

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/PSMShadowIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/PSMShadowIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/PSMShadowIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/PSMShadowIf.cpp

diff --git a/vehicleservice/positioning/server/src/ServiceInterface/VehicleIf.cpp b/service/vehicle/positioning/server/src/ServiceInterface/VehicleIf.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/ServiceInterface/VehicleIf.cpp
rename to service/vehicle/positioning/server/src/ServiceInterface/VehicleIf.cpp

diff --git a/vehicleservice/positioning/server/src/nsfw/Makefile b/service/vehicle/positioning/server/src/nsfw/Makefile
similarity index 100%
rename from vehicleservice/positioning/server/src/nsfw/Makefile
rename to service/vehicle/positioning/server/src/nsfw/Makefile

diff --git a/vehicleservice/positioning/server/src/nsfw/positioning_application.cpp b/service/vehicle/positioning/server/src/nsfw/positioning_application.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/nsfw/positioning_application.cpp
rename to service/vehicle/positioning/server/src/nsfw/positioning_application.cpp

diff --git a/vehicleservice/positioning/server/src/nsfw/ps_main.cpp b/service/vehicle/positioning/server/src/nsfw/ps_main.cpp
similarity index 100%
rename from vehicleservice/positioning/server/src/nsfw/ps_main.cpp
rename to service/vehicle/positioning/server/src/nsfw/ps_main.cpp

diff --git a/video_in_hal/LICENSE b/service/vehicle/positioning_base_library/LICENSE
similarity index 100%
rename from video_in_hal/LICENSE
rename to service/vehicle/positioning_base_library/LICENSE

diff --git a/vehicleservice/positioning_base_library/Makefile.client b/service/vehicle/positioning_base_library/Makefile.client
similarity index 100%
rename from vehicleservice/positioning_base_library/Makefile.client
rename to service/vehicle/positioning_base_library/Makefile.client

diff --git a/vehicleservice/positioning_base_library/library/Makefile b/service/vehicle/positioning_base_library/library/Makefile
similarity index 100%
rename from vehicleservice/positioning_base_library/library/Makefile
rename to service/vehicle/positioning_base_library/library/Makefile

diff --git a/vehicleservice/positioning_base_library/library/include/DEV_TimerEntryDrv_if.h b/service/vehicle/positioning_base_library/library/include/DEV_TimerEntryDrv_if.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/DEV_TimerEntryDrv_if.h
rename to service/vehicle/positioning_base_library/library/include/DEV_TimerEntryDrv_if.h

diff --git a/vehicleservice/positioning_base_library/library/include/TimerEntryDrv_If.h b/service/vehicle/positioning_base_library/library/include/TimerEntryDrv_If.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/TimerEntryDrv_If.h
rename to service/vehicle/positioning_base_library/library/include/TimerEntryDrv_If.h

diff --git a/vehicleservice/positioning_base_library/library/include/WPF_STD_private.h b/service/vehicle/positioning_base_library/library/include/WPF_STD_private.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/WPF_STD_private.h
rename to service/vehicle/positioning_base_library/library/include/WPF_STD_private.h

diff --git a/vehicleservice/positioning_base_library/library/include/_pbCommon.h b/service/vehicle/positioning_base_library/library/include/_pbCommon.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/_pbCommon.h
rename to service/vehicle/positioning_base_library/library/include/_pbCommon.h

diff --git a/vehicleservice/positioning_base_library/library/include/_pbEvent_Internal.h b/service/vehicle/positioning_base_library/library/include/_pbEvent_Internal.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/_pbEvent_Internal.h
rename to service/vehicle/positioning_base_library/library/include/_pbEvent_Internal.h

diff --git a/vehicleservice/positioning_base_library/library/include/_pbInternalProc.h b/service/vehicle/positioning_base_library/library/include/_pbInternalProc.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/_pbInternalProc.h
rename to service/vehicle/positioning_base_library/library/include/_pbInternalProc.h

diff --git a/vehicleservice/positioning_base_library/library/include/_pbSerial.h b/service/vehicle/positioning_base_library/library/include/_pbSerial.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/_pbSerial.h
rename to service/vehicle/positioning_base_library/library/include/_pbSerial.h

diff --git a/vehicleservice/positioning_base_library/library/include/_pbWaitforsingleobject.h b/service/vehicle/positioning_base_library/library/include/_pbWaitforsingleobject.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/_pbWaitforsingleobject.h
rename to service/vehicle/positioning_base_library/library/include/_pbWaitforsingleobject.h

diff --git a/vehicleservice/positioning_base_library/library/include/sysup.h b/service/vehicle/positioning_base_library/library/include/sysup.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/sysup.h
rename to service/vehicle/positioning_base_library/library/include/sysup.h

diff --git a/vehicleservice/positioning_base_library/library/include/sysup_addr.h b/service/vehicle/positioning_base_library/library/include/sysup_addr.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/sysup_addr.h
rename to service/vehicle/positioning_base_library/library/include/sysup_addr.h

diff --git a/vehicleservice/positioning_base_library/library/include/tchar.h b/service/vehicle/positioning_base_library/library/include/tchar.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/tchar.h
rename to service/vehicle/positioning_base_library/library/include/tchar.h

diff --git a/vehicleservice/positioning_base_library/library/include/vehicle_service/WPF_STD.h b/service/vehicle/positioning_base_library/library/include/vehicle_service/WPF_STD.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/vehicle_service/WPF_STD.h
rename to service/vehicle/positioning_base_library/library/include/vehicle_service/WPF_STD.h

diff --git a/vehicleservice/positioning_base_library/library/include/vehicle_service/pos_message_header.h b/service/vehicle/positioning_base_library/library/include/vehicle_service/pos_message_header.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/vehicle_service/pos_message_header.h
rename to service/vehicle/positioning_base_library/library/include/vehicle_service/pos_message_header.h

diff --git a/vehicleservice/positioning_base_library/library/include/vehicle_service/positioning_base_library.h b/service/vehicle/positioning_base_library/library/include/vehicle_service/positioning_base_library.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/vehicle_service/positioning_base_library.h
rename to service/vehicle/positioning_base_library/library/include/vehicle_service/positioning_base_library.h

diff --git a/vehicleservice/positioning_base_library/library/include/vehicle_service/positioning_positioningbaselibrarylog.h b/service/vehicle/positioning_base_library/library/include/vehicle_service/positioning_positioningbaselibrarylog.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/vehicle_service/positioning_positioningbaselibrarylog.h
rename to service/vehicle/positioning_base_library/library/include/vehicle_service/positioning_positioningbaselibrarylog.h

diff --git a/vehicleservice/positioning_base_library/library/include/vehicle_service/std_types.h b/service/vehicle/positioning_base_library/library/include/vehicle_service/std_types.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/vehicle_service/std_types.h
rename to service/vehicle/positioning_base_library/library/include/vehicle_service/std_types.h

diff --git a/vehicleservice/positioning_base_library/library/include/vehicle_service/sys_timerapi.h b/service/vehicle/positioning_base_library/library/include/vehicle_service/sys_timerapi.h
similarity index 100%
rename from vehicleservice/positioning_base_library/library/include/vehicle_service/sys_timerapi.h
rename to service/vehicle/positioning_base_library/library/include/vehicle_service/sys_timerapi.h

diff --git a/vehicleservice/positioning_base_library/library/libPOS_base_API.ver b/service/vehicle/positioning_base_library/library/libPOS_base_API.ver
similarity index 100%
rename from vehicleservice/positioning_base_library/library/libPOS_base_API.ver
rename to service/vehicle/positioning_base_library/library/libPOS_base_API.ver

diff --git a/vehicleservice/positioning_base_library/library/src/MsgBapi.cpp b/service/vehicle/positioning_base_library/library/src/MsgBapi.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/MsgBapi.cpp
rename to service/vehicle/positioning_base_library/library/src/MsgBapi.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_CWORD64_api.cpp b/service/vehicle/positioning_base_library/library/src/_CWORD64_api.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_CWORD64_api.cpp
rename to service/vehicle/positioning_base_library/library/src/_CWORD64_api.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbCSection.cpp b/service/vehicle/positioning_base_library/library/src/_pbCSection.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbCSection.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbCSection.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbCommon.cpp b/service/vehicle/positioning_base_library/library/src/_pbCommon.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbCommon.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbCommon.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbDram.cpp b/service/vehicle/positioning_base_library/library/src/_pbDram.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbDram.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbDram.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbEvent.cpp b/service/vehicle/positioning_base_library/library/src/_pbEvent.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbEvent.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbEvent.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbFsys.cpp b/service/vehicle/positioning_base_library/library/src/_pbFsys.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbFsys.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbFsys.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbMem.cpp b/service/vehicle/positioning_base_library/library/src/_pbMem.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbMem.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbMem.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbMisc.cpp b/service/vehicle/positioning_base_library/library/src/_pbMisc.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbMisc.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbMisc.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbMsg.cpp b/service/vehicle/positioning_base_library/library/src/_pbMsg.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbMsg.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbMsg.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbMutex.cpp b/service/vehicle/positioning_base_library/library/src/_pbMutex.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbMutex.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbMutex.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbOSCtrl.cpp b/service/vehicle/positioning_base_library/library/src/_pbOSCtrl.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbOSCtrl.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbOSCtrl.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbOther.cpp b/service/vehicle/positioning_base_library/library/src/_pbOther.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbOther.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbOther.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbProcMng.cpp b/service/vehicle/positioning_base_library/library/src/_pbProcMng.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbProcMng.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbProcMng.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbSem.cpp b/service/vehicle/positioning_base_library/library/src/_pbSem.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbSem.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbSem.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbSerial.cpp b/service/vehicle/positioning_base_library/library/src/_pbSerial.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbSerial.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbSerial.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbSram.cpp b/service/vehicle/positioning_base_library/library/src/_pbSram.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbSram.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbSram.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbSum.cpp b/service/vehicle/positioning_base_library/library/src/_pbSum.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbSum.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbSum.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbTimer.cpp b/service/vehicle/positioning_base_library/library/src/_pbTimer.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbTimer.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbTimer.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/_pbWaitforsingleobject.cpp b/service/vehicle/positioning_base_library/library/src/_pbWaitforsingleobject.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/_pbWaitforsingleobject.cpp
rename to service/vehicle/positioning_base_library/library/src/_pbWaitforsingleobject.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/memcpy_64p_sync.cpp b/service/vehicle/positioning_base_library/library/src/memcpy_64p_sync.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/memcpy_64p_sync.cpp
rename to service/vehicle/positioning_base_library/library/src/memcpy_64p_sync.cpp

diff --git a/vehicleservice/positioning_base_library/library/src/memset_64p_sync.cpp b/service/vehicle/positioning_base_library/library/src/memset_64p_sync.cpp
similarity index 100%
rename from vehicleservice/positioning_base_library/library/src/memset_64p_sync.cpp
rename to service/vehicle/positioning_base_library/library/src/memset_64p_sync.cpp

diff --git a/vehicleservice/vehicle_service.mk b/service/vehicle/vehicle_service.mk
similarity index 100%
rename from vehicleservice/vehicle_service.mk
rename to service/vehicle/vehicle_service.mk