diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index cf76f85e..7c39ef93 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,6 +1,6 @@
 service-mgmt/sm-common
 service-mgmt/sm-db
-service-mgmt/sm-1.0.0
+service-mgmt/sm
 service-mgmt-api
 service-mgmt-client
 service-mgmt-tools
diff --git a/devstack/lib/ha b/devstack/lib/ha
index 037a4ac6..12ee724b 100644
--- a/devstack/lib/ha
+++ b/devstack/lib/ha
@@ -26,7 +26,7 @@ STX_SM_COMMON_VERSION=${STX_SM_COMMON_VERSION:=$STX_SM_VERSION}
 STX_SM_MAJOR_VERSION=${STX_SM_MAJOR_VERSION:="1"}
 STX_SM_DB_VERSION=${STX_SM_DB_VERSION:=$STX_SM_VERSION}
 
-STX_SM_DIR=$STX_HA_DIR/service-mgmt/sm-${STX_SM_VERSION}
+STX_SM_DIR=$STX_HA_DIR/service-mgmt/sm
 STX_SM_CONF_DIR=$STX_SYSCONFDIR/sm
 STX_SM_VAR_DIR=/var/lib/sm
 STX_SM_API_CONF_DIR=$STX_SYSCONFDIR/sm-api
@@ -46,7 +46,7 @@ PYTHON_SITE_DIR=$(python -c "from distutils.sysconfig import get_python_lib; pri
 # ---------
 
 function build_sm {
-    pushd $STX_HA_DIR/service-mgmt/sm-${STX_SM_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm
 
     # On Xenial needed to remove -Werror and add -Wunused-result
     # CCFLAGS= -g -O2 -Wall -Werror -Wformat  -std=c++11
@@ -115,7 +115,7 @@ function cleanup_ha {
 }
 
 function cleanup_sm {
-    pushd $STX_HA_DIR/service-mgmt/sm-${STX_SM_COMMON_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm
 
     make clean
 
@@ -256,7 +256,7 @@ function install_ha {
 }
 
 function install_sm {
-    pushd $STX_HA_DIR/service-mgmt/sm-${STX_SM_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm
 
     build_sm
 
diff --git a/service-mgmt/sm-1.0.0/LICENSE b/service-mgmt/sm/LICENSE
similarity index 100%
rename from service-mgmt/sm-1.0.0/LICENSE
rename to service-mgmt/sm/LICENSE
diff --git a/service-mgmt/sm-1.0.0/Makefile b/service-mgmt/sm/Makefile
similarity index 100%
rename from service-mgmt/sm-1.0.0/Makefile
rename to service-mgmt/sm/Makefile
diff --git a/service-mgmt/sm-1.0.0/centos/build_srpm.data b/service-mgmt/sm/centos/build_srpm.data
similarity index 100%
rename from service-mgmt/sm-1.0.0/centos/build_srpm.data
rename to service-mgmt/sm/centos/build_srpm.data
diff --git a/service-mgmt/sm-1.0.0/centos/sm.spec b/service-mgmt/sm/centos/sm.spec
similarity index 100%
rename from service-mgmt/sm-1.0.0/centos/sm.spec
rename to service-mgmt/sm/centos/sm.spec
diff --git a/service-mgmt/sm-1.0.0/scripts/Makefile b/service-mgmt/sm/scripts/Makefile
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/Makefile
rename to service-mgmt/sm/scripts/Makefile
diff --git a/service-mgmt/sm-1.0.0/scripts/sm b/service-mgmt/sm/scripts/sm
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm
rename to service-mgmt/sm/scripts/sm
diff --git a/service-mgmt/sm-1.0.0/scripts/sm-shutdown.service b/service-mgmt/sm/scripts/sm-shutdown.service
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm-shutdown.service
rename to service-mgmt/sm/scripts/sm-shutdown.service
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.conf b/service-mgmt/sm/scripts/sm.conf
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.conf
rename to service-mgmt/sm/scripts/sm.conf
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.logrotate b/service-mgmt/sm/scripts/sm.logrotate
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.logrotate
rename to service-mgmt/sm/scripts/sm.logrotate
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.notification b/service-mgmt/sm/scripts/sm.notification
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.notification
rename to service-mgmt/sm/scripts/sm.notification
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.notify b/service-mgmt/sm/scripts/sm.notify
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.notify
rename to service-mgmt/sm/scripts/sm.notify
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.service b/service-mgmt/sm/scripts/sm.service
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.service
rename to service-mgmt/sm/scripts/sm.service
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.shutdown b/service-mgmt/sm/scripts/sm.shutdown
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.shutdown
rename to service-mgmt/sm/scripts/sm.shutdown
diff --git a/service-mgmt/sm-1.0.0/scripts/sm.troubleshoot b/service-mgmt/sm/scripts/sm.troubleshoot
similarity index 100%
rename from service-mgmt/sm-1.0.0/scripts/sm.troubleshoot
rename to service-mgmt/sm/scripts/sm.troubleshoot
diff --git a/service-mgmt/sm-1.0.0/src/Makefile b/service-mgmt/sm/src/Makefile
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/Makefile
rename to service-mgmt/sm/src/Makefile
diff --git a/service-mgmt/sm-1.0.0/src/fm_api_wrapper.c b/service-mgmt/sm/src/fm_api_wrapper.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/fm_api_wrapper.c
rename to service-mgmt/sm/src/fm_api_wrapper.c
diff --git a/service-mgmt/sm-1.0.0/src/fm_api_wrapper.h b/service-mgmt/sm/src/fm_api_wrapper.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/fm_api_wrapper.h
rename to service-mgmt/sm/src/fm_api_wrapper.h
diff --git a/service-mgmt/sm-1.0.0/src/main.c b/service-mgmt/sm/src/main.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/main.c
rename to service-mgmt/sm/src/main.c
diff --git a/service-mgmt/sm-1.0.0/src/service_status b/service-mgmt/sm/src/service_status
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/service_status
rename to service-mgmt/sm/src/service_status
diff --git a/service-mgmt/sm-1.0.0/src/sm_alarm.c b/service-mgmt/sm/src/sm_alarm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_alarm.c
rename to service-mgmt/sm/src/sm_alarm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_alarm.h b/service-mgmt/sm/src/sm_alarm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_alarm.h
rename to service-mgmt/sm/src/sm_alarm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_alarm_defs.h b/service-mgmt/sm/src/sm_alarm_defs.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_alarm_defs.h
rename to service-mgmt/sm/src/sm_alarm_defs.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_alarm_thread.c b/service-mgmt/sm/src/sm_alarm_thread.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_alarm_thread.c
rename to service-mgmt/sm/src/sm_alarm_thread.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_alarm_thread.h b/service-mgmt/sm/src/sm_alarm_thread.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_alarm_thread.h
rename to service-mgmt/sm/src/sm_alarm_thread.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_api.c b/service-mgmt/sm/src/sm_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_api.c
rename to service-mgmt/sm/src/sm_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_api.h b/service-mgmt/sm/src/sm_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_api.h
rename to service-mgmt/sm/src/sm_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_cluster_hbs_info_msg.cpp b/service-mgmt/sm/src/sm_cluster_hbs_info_msg.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_cluster_hbs_info_msg.cpp
rename to service-mgmt/sm/src/sm_cluster_hbs_info_msg.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_cluster_hbs_info_msg.h b/service-mgmt/sm/src/sm_cluster_hbs_info_msg.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_cluster_hbs_info_msg.h
rename to service-mgmt/sm/src/sm_cluster_hbs_info_msg.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_configuration_table.c b/service-mgmt/sm/src/sm_configuration_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_configuration_table.c
rename to service-mgmt/sm/src/sm_configuration_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_configuration_table.h b/service-mgmt/sm/src/sm_configuration_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_configuration_table.h
rename to service-mgmt/sm/src/sm_configuration_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_configure.cpp b/service-mgmt/sm/src/sm_configure.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_configure.cpp
rename to service-mgmt/sm/src/sm_configure.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_configure.h b/service-mgmt/sm/src/sm_configure.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_configure.h
rename to service-mgmt/sm/src/sm_configure.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover.c b/service-mgmt/sm/src/sm_failover.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover.c
rename to service-mgmt/sm/src/sm_failover.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover.h b/service-mgmt/sm/src/sm_failover.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover.h
rename to service-mgmt/sm/src/sm_failover.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.cpp b/service-mgmt/sm/src/sm_failover_fail_pending_state.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.cpp
rename to service-mgmt/sm/src/sm_failover_fail_pending_state.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.h b/service-mgmt/sm/src/sm_failover_fail_pending_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.h
rename to service-mgmt/sm/src/sm_failover_fail_pending_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_failed_state.cpp b/service-mgmt/sm/src/sm_failover_failed_state.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_failed_state.cpp
rename to service-mgmt/sm/src/sm_failover_failed_state.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_failed_state.h b/service-mgmt/sm/src/sm_failover_failed_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_failed_state.h
rename to service-mgmt/sm/src/sm_failover_failed_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_fsm.cpp b/service-mgmt/sm/src/sm_failover_fsm.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_fsm.cpp
rename to service-mgmt/sm/src/sm_failover_fsm.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_fsm.h b/service-mgmt/sm/src/sm_failover_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_fsm.h
rename to service-mgmt/sm/src/sm_failover_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_initial_state.cpp b/service-mgmt/sm/src/sm_failover_initial_state.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_initial_state.cpp
rename to service-mgmt/sm/src/sm_failover_initial_state.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_initial_state.h b/service-mgmt/sm/src/sm_failover_initial_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_initial_state.h
rename to service-mgmt/sm/src/sm_failover_initial_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_normal_state.cpp b/service-mgmt/sm/src/sm_failover_normal_state.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_normal_state.cpp
rename to service-mgmt/sm/src/sm_failover_normal_state.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_normal_state.h b/service-mgmt/sm/src/sm_failover_normal_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_normal_state.h
rename to service-mgmt/sm/src/sm_failover_normal_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_ss.c b/service-mgmt/sm/src/sm_failover_ss.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_ss.c
rename to service-mgmt/sm/src/sm_failover_ss.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_ss.h b/service-mgmt/sm/src/sm_failover_ss.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_ss.h
rename to service-mgmt/sm/src/sm_failover_ss.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_survived_state.cpp b/service-mgmt/sm/src/sm_failover_survived_state.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_survived_state.cpp
rename to service-mgmt/sm/src/sm_failover_survived_state.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_survived_state.h b/service-mgmt/sm/src/sm_failover_survived_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_survived_state.h
rename to service-mgmt/sm/src/sm_failover_survived_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_utils.c b/service-mgmt/sm/src/sm_failover_utils.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_utils.c
rename to service-mgmt/sm/src/sm_failover_utils.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_utils.h b/service-mgmt/sm/src/sm_failover_utils.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_failover_utils.h
rename to service-mgmt/sm/src/sm_failover_utils.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_heartbeat.c b/service-mgmt/sm/src/sm_heartbeat.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_heartbeat.c
rename to service-mgmt/sm/src/sm_heartbeat.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_heartbeat.h b/service-mgmt/sm/src/sm_heartbeat.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_heartbeat.h
rename to service-mgmt/sm/src/sm_heartbeat.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_heartbeat_msg.c b/service-mgmt/sm/src/sm_heartbeat_msg.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_heartbeat_msg.c
rename to service-mgmt/sm/src/sm_heartbeat_msg.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_heartbeat_msg.h b/service-mgmt/sm/src/sm_heartbeat_msg.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_heartbeat_msg.h
rename to service-mgmt/sm/src/sm_heartbeat_msg.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_heartbeat_thread.c b/service-mgmt/sm/src/sm_heartbeat_thread.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_heartbeat_thread.c
rename to service-mgmt/sm/src/sm_heartbeat_thread.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_heartbeat_thread.h b/service-mgmt/sm/src/sm_heartbeat_thread.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_heartbeat_thread.h
rename to service-mgmt/sm/src/sm_heartbeat_thread.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_log.c b/service-mgmt/sm/src/sm_log.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_log.c
rename to service-mgmt/sm/src/sm_log.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_log.h b/service-mgmt/sm/src/sm_log.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_log.h
rename to service-mgmt/sm/src/sm_log.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_log_defs.h b/service-mgmt/sm/src/sm_log_defs.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_log_defs.h
rename to service-mgmt/sm/src/sm_log_defs.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_log_thread.c b/service-mgmt/sm/src/sm_log_thread.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_log_thread.c
rename to service-mgmt/sm/src/sm_log_thread.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_log_thread.h b/service-mgmt/sm/src/sm_log_thread.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_log_thread.h
rename to service-mgmt/sm/src/sm_log_thread.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_main_event_handler.c b/service-mgmt/sm/src/sm_main_event_handler.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_main_event_handler.c
rename to service-mgmt/sm/src/sm_main_event_handler.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_main_event_handler.h b/service-mgmt/sm/src/sm_main_event_handler.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_main_event_handler.h
rename to service-mgmt/sm/src/sm_main_event_handler.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_msg.c b/service-mgmt/sm/src/sm_msg.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_msg.c
rename to service-mgmt/sm/src/sm_msg.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_msg.h b/service-mgmt/sm/src/sm_msg.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_msg.h
rename to service-mgmt/sm/src/sm_msg.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_api.cpp b/service-mgmt/sm/src/sm_node_api.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_api.cpp
rename to service-mgmt/sm/src/sm_node_api.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_api.h b/service-mgmt/sm/src/sm_node_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_api.h
rename to service-mgmt/sm/src/sm_node_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_disabled_state.c b/service-mgmt/sm/src/sm_node_disabled_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_disabled_state.c
rename to service-mgmt/sm/src/sm_node_disabled_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_disabled_state.h b/service-mgmt/sm/src/sm_node_disabled_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_disabled_state.h
rename to service-mgmt/sm/src/sm_node_disabled_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_enabled_state.c b/service-mgmt/sm/src/sm_node_enabled_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_enabled_state.c
rename to service-mgmt/sm/src/sm_node_enabled_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_enabled_state.h b/service-mgmt/sm/src/sm_node_enabled_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_enabled_state.h
rename to service-mgmt/sm/src/sm_node_enabled_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_fsm.c b/service-mgmt/sm/src/sm_node_fsm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_fsm.c
rename to service-mgmt/sm/src/sm_node_fsm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_fsm.h b/service-mgmt/sm/src/sm_node_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_fsm.h
rename to service-mgmt/sm/src/sm_node_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_swact_monitor.cpp b/service-mgmt/sm/src/sm_node_swact_monitor.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_swact_monitor.cpp
rename to service-mgmt/sm/src/sm_node_swact_monitor.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_swact_monitor.h b/service-mgmt/sm/src/sm_node_swact_monitor.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_swact_monitor.h
rename to service-mgmt/sm/src/sm_node_swact_monitor.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_unknown_state.c b/service-mgmt/sm/src/sm_node_unknown_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_unknown_state.c
rename to service-mgmt/sm/src/sm_node_unknown_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_node_unknown_state.h b/service-mgmt/sm/src/sm_node_unknown_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_node_unknown_state.h
rename to service-mgmt/sm/src/sm_node_unknown_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_notify_api.c b/service-mgmt/sm/src/sm_notify_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_notify_api.c
rename to service-mgmt/sm/src/sm_notify_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_notify_api.h b/service-mgmt/sm/src/sm_notify_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_notify_api.h
rename to service-mgmt/sm/src/sm_notify_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_process.c b/service-mgmt/sm/src/sm_process.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_process.c
rename to service-mgmt/sm/src/sm_process.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_process.h b/service-mgmt/sm/src/sm_process.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_process.h
rename to service-mgmt/sm/src/sm_process.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_process_death.c b/service-mgmt/sm/src/sm_process_death.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_process_death.c
rename to service-mgmt/sm/src/sm_process_death.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_process_death.h b/service-mgmt/sm/src/sm_process_death.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_process_death.h
rename to service-mgmt/sm/src/sm_process_death.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_action.c b/service-mgmt/sm/src/sm_service_action.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_action.c
rename to service-mgmt/sm/src/sm_service_action.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_action.h b/service-mgmt/sm/src/sm_service_action.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_action.h
rename to service-mgmt/sm/src/sm_service_action.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_action_result_table.c b/service-mgmt/sm/src/sm_service_action_result_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_action_result_table.c
rename to service-mgmt/sm/src/sm_service_action_result_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_action_result_table.h b/service-mgmt/sm/src/sm_service_action_result_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_action_result_table.h
rename to service-mgmt/sm/src/sm_service_action_result_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_action_table.c b/service-mgmt/sm/src/sm_service_action_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_action_table.c
rename to service-mgmt/sm/src/sm_service_action_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_action_table.h b/service-mgmt/sm/src/sm_service_action_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_action_table.h
rename to service-mgmt/sm/src/sm_service_action_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_api.c b/service-mgmt/sm/src/sm_service_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_api.c
rename to service-mgmt/sm/src/sm_service_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_api.h b/service-mgmt/sm/src/sm_service_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_api.h
rename to service-mgmt/sm/src/sm_service_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_audit.c b/service-mgmt/sm/src/sm_service_audit.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_audit.c
rename to service-mgmt/sm/src/sm_service_audit.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_audit.h b/service-mgmt/sm/src/sm_service_audit.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_audit.h
rename to service-mgmt/sm/src/sm_service_audit.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_dependency.c b/service-mgmt/sm/src/sm_service_dependency.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_dependency.c
rename to service-mgmt/sm/src/sm_service_dependency.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_dependency.h b/service-mgmt/sm/src/sm_service_dependency.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_dependency.h
rename to service-mgmt/sm/src/sm_service_dependency.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_dependency_table.c b/service-mgmt/sm/src/sm_service_dependency_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_dependency_table.c
rename to service-mgmt/sm/src/sm_service_dependency_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_dependency_table.h b/service-mgmt/sm/src/sm_service_dependency_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_dependency_table.h
rename to service-mgmt/sm/src/sm_service_dependency_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_disable.c b/service-mgmt/sm/src/sm_service_disable.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_disable.c
rename to service-mgmt/sm/src/sm_service_disable.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_disable.h b/service-mgmt/sm/src/sm_service_disable.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_disable.h
rename to service-mgmt/sm/src/sm_service_disable.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_disabled_state.c b/service-mgmt/sm/src/sm_service_disabled_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_disabled_state.c
rename to service-mgmt/sm/src/sm_service_disabled_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_disabled_state.h b/service-mgmt/sm/src/sm_service_disabled_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_disabled_state.h
rename to service-mgmt/sm/src/sm_service_disabled_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_disabling_state.c b/service-mgmt/sm/src/sm_service_disabling_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_disabling_state.c
rename to service-mgmt/sm/src/sm_service_disabling_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_disabling_state.h b/service-mgmt/sm/src/sm_service_disabling_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_disabling_state.h
rename to service-mgmt/sm/src/sm_service_disabling_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_api.c b/service-mgmt/sm/src/sm_service_domain_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_api.c
rename to service-mgmt/sm/src/sm_service_domain_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_api.h b/service-mgmt/sm/src/sm_service_domain_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_api.h
rename to service-mgmt/sm/src/sm_service_domain_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_assignment_table.c b/service-mgmt/sm/src/sm_service_domain_assignment_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_assignment_table.c
rename to service-mgmt/sm/src/sm_service_domain_assignment_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_assignment_table.h b/service-mgmt/sm/src/sm_service_domain_assignment_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_assignment_table.h
rename to service-mgmt/sm/src/sm_service_domain_assignment_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_backup_state.c b/service-mgmt/sm/src/sm_service_domain_backup_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_backup_state.c
rename to service-mgmt/sm/src/sm_service_domain_backup_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_backup_state.h b/service-mgmt/sm/src/sm_service_domain_backup_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_backup_state.h
rename to service-mgmt/sm/src/sm_service_domain_backup_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_filter.c b/service-mgmt/sm/src/sm_service_domain_filter.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_filter.c
rename to service-mgmt/sm/src/sm_service_domain_filter.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_filter.h b/service-mgmt/sm/src/sm_service_domain_filter.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_filter.h
rename to service-mgmt/sm/src/sm_service_domain_filter.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_fsm.c b/service-mgmt/sm/src/sm_service_domain_fsm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_fsm.c
rename to service-mgmt/sm/src/sm_service_domain_fsm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_fsm.h b/service-mgmt/sm/src/sm_service_domain_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_fsm.h
rename to service-mgmt/sm/src/sm_service_domain_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_initial_state.c b/service-mgmt/sm/src/sm_service_domain_initial_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_initial_state.c
rename to service-mgmt/sm/src/sm_service_domain_initial_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_initial_state.h b/service-mgmt/sm/src/sm_service_domain_initial_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_initial_state.h
rename to service-mgmt/sm/src/sm_service_domain_initial_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_api.c b/service-mgmt/sm/src/sm_service_domain_interface_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_api.c
rename to service-mgmt/sm/src/sm_service_domain_interface_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_api.h b/service-mgmt/sm/src/sm_service_domain_interface_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_api.h
rename to service-mgmt/sm/src/sm_service_domain_interface_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_disabled_state.c b/service-mgmt/sm/src/sm_service_domain_interface_disabled_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_disabled_state.c
rename to service-mgmt/sm/src/sm_service_domain_interface_disabled_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_disabled_state.h b/service-mgmt/sm/src/sm_service_domain_interface_disabled_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_disabled_state.h
rename to service-mgmt/sm/src/sm_service_domain_interface_disabled_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_enabled_state.c b/service-mgmt/sm/src/sm_service_domain_interface_enabled_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_enabled_state.c
rename to service-mgmt/sm/src/sm_service_domain_interface_enabled_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_enabled_state.h b/service-mgmt/sm/src/sm_service_domain_interface_enabled_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_enabled_state.h
rename to service-mgmt/sm/src/sm_service_domain_interface_enabled_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_fsm.c b/service-mgmt/sm/src/sm_service_domain_interface_fsm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_fsm.c
rename to service-mgmt/sm/src/sm_service_domain_interface_fsm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_fsm.h b/service-mgmt/sm/src/sm_service_domain_interface_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_fsm.h
rename to service-mgmt/sm/src/sm_service_domain_interface_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_not_in_use_state.c b/service-mgmt/sm/src/sm_service_domain_interface_not_in_use_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_not_in_use_state.c
rename to service-mgmt/sm/src/sm_service_domain_interface_not_in_use_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_not_in_use_state.h b/service-mgmt/sm/src/sm_service_domain_interface_not_in_use_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_not_in_use_state.h
rename to service-mgmt/sm/src/sm_service_domain_interface_not_in_use_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_table.c b/service-mgmt/sm/src/sm_service_domain_interface_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_table.c
rename to service-mgmt/sm/src/sm_service_domain_interface_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_table.h b/service-mgmt/sm/src/sm_service_domain_interface_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_table.h
rename to service-mgmt/sm/src/sm_service_domain_interface_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_unknown_state.c b/service-mgmt/sm/src/sm_service_domain_interface_unknown_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_unknown_state.c
rename to service-mgmt/sm/src/sm_service_domain_interface_unknown_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_interface_unknown_state.h b/service-mgmt/sm/src/sm_service_domain_interface_unknown_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_interface_unknown_state.h
rename to service-mgmt/sm/src/sm_service_domain_interface_unknown_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_leader_state.c b/service-mgmt/sm/src/sm_service_domain_leader_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_leader_state.c
rename to service-mgmt/sm/src/sm_service_domain_leader_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_leader_state.h b/service-mgmt/sm/src/sm_service_domain_leader_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_leader_state.h
rename to service-mgmt/sm/src/sm_service_domain_leader_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_member_table.c b/service-mgmt/sm/src/sm_service_domain_member_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_member_table.c
rename to service-mgmt/sm/src/sm_service_domain_member_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_member_table.h b/service-mgmt/sm/src/sm_service_domain_member_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_member_table.h
rename to service-mgmt/sm/src/sm_service_domain_member_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_down_state.c b/service-mgmt/sm/src/sm_service_domain_neighbor_down_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_down_state.c
rename to service-mgmt/sm/src/sm_service_domain_neighbor_down_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_down_state.h b/service-mgmt/sm/src/sm_service_domain_neighbor_down_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_down_state.h
rename to service-mgmt/sm/src/sm_service_domain_neighbor_down_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.c b/service-mgmt/sm/src/sm_service_domain_neighbor_exchange_start_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.c
rename to service-mgmt/sm/src/sm_service_domain_neighbor_exchange_start_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.h b/service-mgmt/sm/src/sm_service_domain_neighbor_exchange_start_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_start_state.h
rename to service-mgmt/sm/src/sm_service_domain_neighbor_exchange_start_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.c b/service-mgmt/sm/src/sm_service_domain_neighbor_exchange_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.c
rename to service-mgmt/sm/src/sm_service_domain_neighbor_exchange_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.h b/service-mgmt/sm/src/sm_service_domain_neighbor_exchange_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_exchange_state.h
rename to service-mgmt/sm/src/sm_service_domain_neighbor_exchange_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.c b/service-mgmt/sm/src/sm_service_domain_neighbor_fsm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.c
rename to service-mgmt/sm/src/sm_service_domain_neighbor_fsm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.h b/service-mgmt/sm/src/sm_service_domain_neighbor_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_fsm.h
rename to service-mgmt/sm/src/sm_service_domain_neighbor_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_full_state.c b/service-mgmt/sm/src/sm_service_domain_neighbor_full_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_full_state.c
rename to service-mgmt/sm/src/sm_service_domain_neighbor_full_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_full_state.h b/service-mgmt/sm/src/sm_service_domain_neighbor_full_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_full_state.h
rename to service-mgmt/sm/src/sm_service_domain_neighbor_full_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_table.c b/service-mgmt/sm/src/sm_service_domain_neighbor_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_table.c
rename to service-mgmt/sm/src/sm_service_domain_neighbor_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_table.h b/service-mgmt/sm/src/sm_service_domain_neighbor_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_neighbor_table.h
rename to service-mgmt/sm/src/sm_service_domain_neighbor_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_other_state.c b/service-mgmt/sm/src/sm_service_domain_other_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_other_state.c
rename to service-mgmt/sm/src/sm_service_domain_other_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_other_state.h b/service-mgmt/sm/src/sm_service_domain_other_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_other_state.h
rename to service-mgmt/sm/src/sm_service_domain_other_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.c b/service-mgmt/sm/src/sm_service_domain_scheduler.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.c
rename to service-mgmt/sm/src/sm_service_domain_scheduler.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.h b/service-mgmt/sm/src/sm_service_domain_scheduler.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_scheduler.h
rename to service-mgmt/sm/src/sm_service_domain_scheduler.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_table.c b/service-mgmt/sm/src/sm_service_domain_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_table.c
rename to service-mgmt/sm/src/sm_service_domain_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_table.h b/service-mgmt/sm/src/sm_service_domain_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_table.h
rename to service-mgmt/sm/src/sm_service_domain_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_utils.c b/service-mgmt/sm/src/sm_service_domain_utils.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_utils.c
rename to service-mgmt/sm/src/sm_service_domain_utils.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_utils.h b/service-mgmt/sm/src/sm_service_domain_utils.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_utils.h
rename to service-mgmt/sm/src/sm_service_domain_utils.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_waiting_state.c b/service-mgmt/sm/src/sm_service_domain_waiting_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_waiting_state.c
rename to service-mgmt/sm/src/sm_service_domain_waiting_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_waiting_state.h b/service-mgmt/sm/src/sm_service_domain_waiting_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_waiting_state.h
rename to service-mgmt/sm/src/sm_service_domain_waiting_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_weight.c b/service-mgmt/sm/src/sm_service_domain_weight.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_weight.c
rename to service-mgmt/sm/src/sm_service_domain_weight.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_domain_weight.h b/service-mgmt/sm/src/sm_service_domain_weight.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_domain_weight.h
rename to service-mgmt/sm/src/sm_service_domain_weight.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enable.c b/service-mgmt/sm/src/sm_service_enable.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enable.c
rename to service-mgmt/sm/src/sm_service_enable.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enable.h b/service-mgmt/sm/src/sm_service_enable.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enable.h
rename to service-mgmt/sm/src/sm_service_enable.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_active_state.c b/service-mgmt/sm/src/sm_service_enabled_active_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_active_state.c
rename to service-mgmt/sm/src/sm_service_enabled_active_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_active_state.h b/service-mgmt/sm/src/sm_service_enabled_active_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_active_state.h
rename to service-mgmt/sm/src/sm_service_enabled_active_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_go_active_state.c b/service-mgmt/sm/src/sm_service_enabled_go_active_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_go_active_state.c
rename to service-mgmt/sm/src/sm_service_enabled_go_active_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_go_active_state.h b/service-mgmt/sm/src/sm_service_enabled_go_active_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_go_active_state.h
rename to service-mgmt/sm/src/sm_service_enabled_go_active_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_go_standby_state.c b/service-mgmt/sm/src/sm_service_enabled_go_standby_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_go_standby_state.c
rename to service-mgmt/sm/src/sm_service_enabled_go_standby_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_go_standby_state.h b/service-mgmt/sm/src/sm_service_enabled_go_standby_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_go_standby_state.h
rename to service-mgmt/sm/src/sm_service_enabled_go_standby_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_standby_state.c b/service-mgmt/sm/src/sm_service_enabled_standby_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_standby_state.c
rename to service-mgmt/sm/src/sm_service_enabled_standby_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabled_standby_state.h b/service-mgmt/sm/src/sm_service_enabled_standby_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabled_standby_state.h
rename to service-mgmt/sm/src/sm_service_enabled_standby_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabling_state.c b/service-mgmt/sm/src/sm_service_enabling_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabling_state.c
rename to service-mgmt/sm/src/sm_service_enabling_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabling_state.h b/service-mgmt/sm/src/sm_service_enabling_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabling_state.h
rename to service-mgmt/sm/src/sm_service_enabling_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabling_throttle_state.c b/service-mgmt/sm/src/sm_service_enabling_throttle_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabling_throttle_state.c
rename to service-mgmt/sm/src/sm_service_enabling_throttle_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_enabling_throttle_state.h b/service-mgmt/sm/src/sm_service_enabling_throttle_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_enabling_throttle_state.h
rename to service-mgmt/sm/src/sm_service_enabling_throttle_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_engine.c b/service-mgmt/sm/src/sm_service_engine.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_engine.c
rename to service-mgmt/sm/src/sm_service_engine.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_engine.h b/service-mgmt/sm/src/sm_service_engine.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_engine.h
rename to service-mgmt/sm/src/sm_service_engine.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_fsm.c b/service-mgmt/sm/src/sm_service_fsm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_fsm.c
rename to service-mgmt/sm/src/sm_service_fsm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_fsm.h b/service-mgmt/sm/src/sm_service_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_fsm.h
rename to service-mgmt/sm/src/sm_service_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_go_active.c b/service-mgmt/sm/src/sm_service_go_active.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_go_active.c
rename to service-mgmt/sm/src/sm_service_go_active.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_go_active.h b/service-mgmt/sm/src/sm_service_go_active.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_go_active.h
rename to service-mgmt/sm/src/sm_service_go_active.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_go_standby.c b/service-mgmt/sm/src/sm_service_go_standby.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_go_standby.c
rename to service-mgmt/sm/src/sm_service_go_standby.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_go_standby.h b/service-mgmt/sm/src/sm_service_go_standby.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_go_standby.h
rename to service-mgmt/sm/src/sm_service_go_standby.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_active_state.c b/service-mgmt/sm/src/sm_service_group_active_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_active_state.c
rename to service-mgmt/sm/src/sm_service_group_active_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_active_state.h b/service-mgmt/sm/src/sm_service_group_active_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_active_state.h
rename to service-mgmt/sm/src/sm_service_group_active_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_api.c b/service-mgmt/sm/src/sm_service_group_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_api.c
rename to service-mgmt/sm/src/sm_service_group_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_api.h b/service-mgmt/sm/src/sm_service_group_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_api.h
rename to service-mgmt/sm/src/sm_service_group_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_audit.c b/service-mgmt/sm/src/sm_service_group_audit.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_audit.c
rename to service-mgmt/sm/src/sm_service_group_audit.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_audit.h b/service-mgmt/sm/src/sm_service_group_audit.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_audit.h
rename to service-mgmt/sm/src/sm_service_group_audit.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_disable.c b/service-mgmt/sm/src/sm_service_group_disable.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_disable.c
rename to service-mgmt/sm/src/sm_service_group_disable.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_disable.h b/service-mgmt/sm/src/sm_service_group_disable.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_disable.h
rename to service-mgmt/sm/src/sm_service_group_disable.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_disabled_state.c b/service-mgmt/sm/src/sm_service_group_disabled_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_disabled_state.c
rename to service-mgmt/sm/src/sm_service_group_disabled_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_disabled_state.h b/service-mgmt/sm/src/sm_service_group_disabled_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_disabled_state.h
rename to service-mgmt/sm/src/sm_service_group_disabled_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_disabling_state.c b/service-mgmt/sm/src/sm_service_group_disabling_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_disabling_state.c
rename to service-mgmt/sm/src/sm_service_group_disabling_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_disabling_state.h b/service-mgmt/sm/src/sm_service_group_disabling_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_disabling_state.h
rename to service-mgmt/sm/src/sm_service_group_disabling_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_enable.c b/service-mgmt/sm/src/sm_service_group_enable.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_enable.c
rename to service-mgmt/sm/src/sm_service_group_enable.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_enable.h b/service-mgmt/sm/src/sm_service_group_enable.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_enable.h
rename to service-mgmt/sm/src/sm_service_group_enable.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_engine.c b/service-mgmt/sm/src/sm_service_group_engine.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_engine.c
rename to service-mgmt/sm/src/sm_service_group_engine.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_engine.h b/service-mgmt/sm/src/sm_service_group_engine.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_engine.h
rename to service-mgmt/sm/src/sm_service_group_engine.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_fsm.c b/service-mgmt/sm/src/sm_service_group_fsm.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_fsm.c
rename to service-mgmt/sm/src/sm_service_group_fsm.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_fsm.h b/service-mgmt/sm/src/sm_service_group_fsm.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_fsm.h
rename to service-mgmt/sm/src/sm_service_group_fsm.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_active.c b/service-mgmt/sm/src/sm_service_group_go_active.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_active.c
rename to service-mgmt/sm/src/sm_service_group_go_active.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_active.h b/service-mgmt/sm/src/sm_service_group_go_active.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_active.h
rename to service-mgmt/sm/src/sm_service_group_go_active.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_active_state.c b/service-mgmt/sm/src/sm_service_group_go_active_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_active_state.c
rename to service-mgmt/sm/src/sm_service_group_go_active_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_active_state.h b/service-mgmt/sm/src/sm_service_group_go_active_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_active_state.h
rename to service-mgmt/sm/src/sm_service_group_go_active_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_standby.c b/service-mgmt/sm/src/sm_service_group_go_standby.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_standby.c
rename to service-mgmt/sm/src/sm_service_group_go_standby.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_standby.h b/service-mgmt/sm/src/sm_service_group_go_standby.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_standby.h
rename to service-mgmt/sm/src/sm_service_group_go_standby.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_standby_state.c b/service-mgmt/sm/src/sm_service_group_go_standby_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_standby_state.c
rename to service-mgmt/sm/src/sm_service_group_go_standby_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_go_standby_state.h b/service-mgmt/sm/src/sm_service_group_go_standby_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_go_standby_state.h
rename to service-mgmt/sm/src/sm_service_group_go_standby_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_health.c b/service-mgmt/sm/src/sm_service_group_health.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_health.c
rename to service-mgmt/sm/src/sm_service_group_health.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_health.h b/service-mgmt/sm/src/sm_service_group_health.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_health.h
rename to service-mgmt/sm/src/sm_service_group_health.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_initial_state.c b/service-mgmt/sm/src/sm_service_group_initial_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_initial_state.c
rename to service-mgmt/sm/src/sm_service_group_initial_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_initial_state.h b/service-mgmt/sm/src/sm_service_group_initial_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_initial_state.h
rename to service-mgmt/sm/src/sm_service_group_initial_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_member_table.c b/service-mgmt/sm/src/sm_service_group_member_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_member_table.c
rename to service-mgmt/sm/src/sm_service_group_member_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_member_table.h b/service-mgmt/sm/src/sm_service_group_member_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_member_table.h
rename to service-mgmt/sm/src/sm_service_group_member_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_notification.c b/service-mgmt/sm/src/sm_service_group_notification.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_notification.c
rename to service-mgmt/sm/src/sm_service_group_notification.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_notification.h b/service-mgmt/sm/src/sm_service_group_notification.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_notification.h
rename to service-mgmt/sm/src/sm_service_group_notification.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_shutdown_state.c b/service-mgmt/sm/src/sm_service_group_shutdown_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_shutdown_state.c
rename to service-mgmt/sm/src/sm_service_group_shutdown_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_shutdown_state.h b/service-mgmt/sm/src/sm_service_group_shutdown_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_shutdown_state.h
rename to service-mgmt/sm/src/sm_service_group_shutdown_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_standby_state.c b/service-mgmt/sm/src/sm_service_group_standby_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_standby_state.c
rename to service-mgmt/sm/src/sm_service_group_standby_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_standby_state.h b/service-mgmt/sm/src/sm_service_group_standby_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_standby_state.h
rename to service-mgmt/sm/src/sm_service_group_standby_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_table.c b/service-mgmt/sm/src/sm_service_group_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_table.c
rename to service-mgmt/sm/src/sm_service_group_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_group_table.h b/service-mgmt/sm/src/sm_service_group_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_group_table.h
rename to service-mgmt/sm/src/sm_service_group_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_heartbeat.c b/service-mgmt/sm/src/sm_service_heartbeat.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_heartbeat.c
rename to service-mgmt/sm/src/sm_service_heartbeat.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_heartbeat.h b/service-mgmt/sm/src/sm_service_heartbeat.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_heartbeat.h
rename to service-mgmt/sm/src/sm_service_heartbeat.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_heartbeat_api.c b/service-mgmt/sm/src/sm_service_heartbeat_api.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_heartbeat_api.c
rename to service-mgmt/sm/src/sm_service_heartbeat_api.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_heartbeat_api.h b/service-mgmt/sm/src/sm_service_heartbeat_api.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_heartbeat_api.h
rename to service-mgmt/sm/src/sm_service_heartbeat_api.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_heartbeat_thread.c b/service-mgmt/sm/src/sm_service_heartbeat_thread.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_heartbeat_thread.c
rename to service-mgmt/sm/src/sm_service_heartbeat_thread.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_heartbeat_thread.h b/service-mgmt/sm/src/sm_service_heartbeat_thread.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_heartbeat_thread.h
rename to service-mgmt/sm/src/sm_service_heartbeat_thread.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_initial_state.c b/service-mgmt/sm/src/sm_service_initial_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_initial_state.c
rename to service-mgmt/sm/src/sm_service_initial_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_initial_state.h b/service-mgmt/sm/src/sm_service_initial_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_initial_state.h
rename to service-mgmt/sm/src/sm_service_initial_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_shutdown_state.c b/service-mgmt/sm/src/sm_service_shutdown_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_shutdown_state.c
rename to service-mgmt/sm/src/sm_service_shutdown_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_shutdown_state.h b/service-mgmt/sm/src/sm_service_shutdown_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_shutdown_state.h
rename to service-mgmt/sm/src/sm_service_shutdown_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_table.c b/service-mgmt/sm/src/sm_service_table.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_table.c
rename to service-mgmt/sm/src/sm_service_table.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_table.h b/service-mgmt/sm/src/sm_service_table.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_table.h
rename to service-mgmt/sm/src/sm_service_table.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_unknown_state.c b/service-mgmt/sm/src/sm_service_unknown_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_unknown_state.c
rename to service-mgmt/sm/src/sm_service_unknown_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_service_unknown_state.h b/service-mgmt/sm/src/sm_service_unknown_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_service_unknown_state.h
rename to service-mgmt/sm/src/sm_service_unknown_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_swact_state.c b/service-mgmt/sm/src/sm_swact_state.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_swact_state.c
rename to service-mgmt/sm/src/sm_swact_state.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_swact_state.h b/service-mgmt/sm/src/sm_swact_state.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_swact_state.h
rename to service-mgmt/sm/src/sm_swact_state.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_task_affining_thread.c b/service-mgmt/sm/src/sm_task_affining_thread.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_task_affining_thread.c
rename to service-mgmt/sm/src/sm_task_affining_thread.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_task_affining_thread.h b/service-mgmt/sm/src/sm_task_affining_thread.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_task_affining_thread.h
rename to service-mgmt/sm/src/sm_task_affining_thread.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_troubleshoot.c b/service-mgmt/sm/src/sm_troubleshoot.c
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_troubleshoot.c
rename to service-mgmt/sm/src/sm_troubleshoot.c
diff --git a/service-mgmt/sm-1.0.0/src/sm_troubleshoot.h b/service-mgmt/sm/src/sm_troubleshoot.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_troubleshoot.h
rename to service-mgmt/sm/src/sm_troubleshoot.h
diff --git a/service-mgmt/sm-1.0.0/src/sm_worker_thread.cpp b/service-mgmt/sm/src/sm_worker_thread.cpp
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_worker_thread.cpp
rename to service-mgmt/sm/src/sm_worker_thread.cpp
diff --git a/service-mgmt/sm-1.0.0/src/sm_worker_thread.h b/service-mgmt/sm/src/sm_worker_thread.h
similarity index 100%
rename from service-mgmt/sm-1.0.0/src/sm_worker_thread.h
rename to service-mgmt/sm/src/sm_worker_thread.h