diff --git a/README_zh.md b/README_zh.md
index 1f95cbb2c819b49883f10fc852535cf75e00f1a0..591341802ad503ce7c0d97ebd626619b281f1839 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -28,8 +28,7 @@
 ├── sa_profile                              # 分布式硬件管理框架的SA配置信息
 ├── services                                # 分布式硬件管理框架的SA具体实现
 │   └── distributedhardwarefwkservice       # 分布式硬件管理框架的服务层
-│       └── accessmanager                   # 硬件接入管理
-│   └── distributedhardwarefwkserviceimpl   # 分布式硬件管理框架的服务实现层
+│       ├── accessmanager                   # 硬件接入管理
 │       ├── resourcemanager                 # 硬件资源管理
 │       ├── componentmanager                # 分布式硬件部件管理
 │       ├── localhardwaremanager            # 本地硬件信息管理
diff --git a/bundle.json b/bundle.json
index 7cf5e4ade89892608ade60eb3f941ee60986514a..1e6faf8c3f792dd74a7ed047e982dc073f0e3443 100644
--- a/bundle.json
+++ b/bundle.json
@@ -53,16 +53,14 @@
       "sub_component": [
         "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
         "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
-        "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
         "//foundation/distributedhardware/distributed_hardware_fwk/sa_profile:dhfwk_sa_profile",
         "//foundation/distributedhardware/distributed_hardware_fwk/sa_profile:dhardware.cfg"
       ],
       "test": [
         "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/unittest:utils_test",
-        "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/unittest:svrimpl_test",
         "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/unittest:test",
         "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/fuzztest:fuzztest",
-        "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzztest",
+        "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest",
         "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest"
       ]
     }
diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn
index 442f7a08ee004d6b14b2cf3d39e0b4bcbaa9a217..f0a83f9591146f9ab65bcb6c1cadd5ea60f7447c 100644
--- a/services/distributedhardwarefwkservice/BUILD.gn
+++ b/services/distributedhardwarefwkservice/BUILD.gn
@@ -28,7 +28,16 @@ ohos_shared_library("distributedhardwarefwksvr") {
     "${utils_path}/include",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
     "//foundation/distributedhardware/device_manager/common/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
+    "//third_party/json/include",
+    "include/componentloader",
+    "include/versionmanager",
+    "include/componentmanager",
+    "include/task",
+    "include/utils",
+    "include/localhardwaremanager",
+    "include/resourcemanager",
+    "include/hidumphelper",
+    "${utils_path}/include/eventbus",
   ]
 
   sources = [
@@ -36,15 +45,40 @@ ohos_shared_library("distributedhardwarefwksvr") {
     "src/distributed_hardware_manager_factory.cpp",
     "src/distributed_hardware_service.cpp",
     "src/distributed_hardware_stub.cpp",
+    "src/componentloader/component_loader.cpp",
+    "src/componentmanager/component_disable.cpp",
+    "src/componentmanager/component_enable.cpp",
+    "src/componentmanager/component_manager.cpp",
+    "src/distributed_hardware_manager.cpp",
+    "src/distributed_hardware_proxy.cpp",
+    "src/hidumphelper/enabled_comps_dump.cpp",
+    "src/hidumphelper/hidump_helper.cpp",
+    "src/localhardwaremanager/local_hardware_manager.cpp",
+    "src/localhardwaremanager/plugin_listener_impl.cpp",
+    "src/resourcemanager/capability_info.cpp",
+    "src/resourcemanager/capability_info_manager.cpp",
+    "src/resourcemanager/capability_utils.cpp",
+    "src/resourcemanager/db_adapter.cpp",
+    "src/task/disable_task.cpp",
+    "src/task/enable_task.cpp",
+    "src/task/monitor_task_timer.cpp",
+    "src/task/offline_task.cpp",
+    "src/task/online_task.cpp",
+    "src/task/task.cpp",
+    "src/task/task_board.cpp",
+    "src/task/task_executor.cpp",
+    "src/task/task_factory.cpp",
+    "src/utils/dh_context.cpp",
+    "src/versionmanager/version_manager.cpp",
   ]
 
   deps = [
-    "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "${utils_path}:distributedhardwareutils",
     "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager",
     "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
     "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//utils/native/base:utils",
+    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
   ]
 
   defines = [
@@ -64,6 +98,7 @@ ohos_shared_library("distributedhardwarefwksvr") {
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
     "samgr_standard:samgr_proxy",
+    "distributeddatamgr:distributeddata_inner",
   ]
 
   subsystem_name = "distributedhardware"
diff --git a/services/distributedhardwarefwkserviceimpl/include/componentloader/component_loader.h b/services/distributedhardwarefwkservice/include/componentloader/component_loader.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/componentloader/component_loader.h
rename to services/distributedhardwarefwkservice/include/componentloader/component_loader.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_disable.h b/services/distributedhardwarefwkservice/include/componentmanager/component_disable.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/componentmanager/component_disable.h
rename to services/distributedhardwarefwkservice/include/componentmanager/component_disable.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_enable.h b/services/distributedhardwarefwkservice/include/componentmanager/component_enable.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/componentmanager/component_enable.h
rename to services/distributedhardwarefwkservice/include/componentmanager/component_enable.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h b/services/distributedhardwarefwkservice/include/componentmanager/component_manager.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h
rename to services/distributedhardwarefwkservice/include/componentmanager/component_manager.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/distributed_hardware_manager.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/distributed_hardware_manager.h
rename to services/distributedhardwarefwkservice/include/distributed_hardware_manager.h
diff --git a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h
index 1082b962e06ad14905625927e495084b73220a5d..31a41f558c72b3b62a0d19365cc557801b6059fa 100644
--- a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h
+++ b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h
@@ -21,7 +21,6 @@
 #include <unordered_map>
 
 #include "device_type.h"
-#include "idistributed_hardware_manager.h"
 #include "single_instance.h"
 
 namespace OHOS {
@@ -40,14 +39,10 @@ public:
 private:
     bool Init();
     void UnInit();
-    int32_t LoadLibrary();
-    void CloseLibrary();
     void CheckExitSAOrNot();
 
 private:
-    void *handler_ { nullptr };
-    IDistributedHardwareManager *distributedHardwareMgrPtr_ { nullptr };
-    std::mutex mutex_;
+    std::atomic<bool> isInit = false;
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkserviceimpl/include/distributed_hardware_proxy.h b/services/distributedhardwarefwkservice/include/distributed_hardware_proxy.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/distributed_hardware_proxy.h
rename to services/distributedhardwarefwkservice/include/distributed_hardware_proxy.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/hidumphelper/enabled_comps_dump.h b/services/distributedhardwarefwkservice/include/hidumphelper/enabled_comps_dump.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/hidumphelper/enabled_comps_dump.h
rename to services/distributedhardwarefwkservice/include/hidumphelper/enabled_comps_dump.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/hidumphelper/hidump_helper.h b/services/distributedhardwarefwkservice/include/hidumphelper/hidump_helper.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/hidumphelper/hidump_helper.h
rename to services/distributedhardwarefwkservice/include/hidumphelper/hidump_helper.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h b/services/distributedhardwarefwkservice/include/localhardwaremanager/local_hardware_manager.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h
rename to services/distributedhardwarefwkservice/include/localhardwaremanager/local_hardware_manager.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/plugin_listener_impl.h b/services/distributedhardwarefwkservice/include/localhardwaremanager/plugin_listener_impl.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/plugin_listener_impl.h
rename to services/distributedhardwarefwkservice/include/localhardwaremanager/plugin_listener_impl.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info.h
rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_info.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_event.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_event.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_event.h
rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_info_event.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_manager.h
rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_utils.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_utils.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_utils.h
rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_utils.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h b/services/distributedhardwarefwkservice/include/resourcemanager/db_adapter.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h
rename to services/distributedhardwarefwkservice/include/resourcemanager/db_adapter.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/disable_task.h b/services/distributedhardwarefwkservice/include/task/disable_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/disable_task.h
rename to services/distributedhardwarefwkservice/include/task/disable_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/enable_task.h b/services/distributedhardwarefwkservice/include/task/enable_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/enable_task.h
rename to services/distributedhardwarefwkservice/include/task/enable_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/monitor_task_timer.h b/services/distributedhardwarefwkservice/include/task/monitor_task_timer.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/monitor_task_timer.h
rename to services/distributedhardwarefwkservice/include/task/monitor_task_timer.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h b/services/distributedhardwarefwkservice/include/task/offline_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/offline_task.h
rename to services/distributedhardwarefwkservice/include/task/offline_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/online_task.h b/services/distributedhardwarefwkservice/include/task/online_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/online_task.h
rename to services/distributedhardwarefwkservice/include/task/online_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task.h b/services/distributedhardwarefwkservice/include/task/task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/task.h
rename to services/distributedhardwarefwkservice/include/task/task.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_board.h b/services/distributedhardwarefwkservice/include/task/task_board.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/task_board.h
rename to services/distributedhardwarefwkservice/include/task/task_board.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_executor.h b/services/distributedhardwarefwkservice/include/task/task_executor.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/task_executor.h
rename to services/distributedhardwarefwkservice/include/task/task_executor.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_factory.h b/services/distributedhardwarefwkservice/include/task/task_factory.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/task/task_factory.h
rename to services/distributedhardwarefwkservice/include/task/task_factory.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/utils/dh_context.h
rename to services/distributedhardwarefwkservice/include/utils/dh_context.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h b/services/distributedhardwarefwkservice/include/utils/impl_utils.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h
rename to services/distributedhardwarefwkservice/include/utils/impl_utils.h
diff --git a/services/distributedhardwarefwkserviceimpl/include/versionmanager/version_manager.h b/services/distributedhardwarefwkservice/include/versionmanager/version_manager.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/include/versionmanager/version_manager.h
rename to services/distributedhardwarefwkservice/include/versionmanager/version_manager.h
diff --git a/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp
rename to services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp
rename to services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp
rename to services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp
rename to services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp
rename to services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp
diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp
index c11e29b47b796c1d39fd044578666b1447299037..d8d2b0d088cb7e1dbe7f520dca646f2076f3999d 100644
--- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp
+++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp
@@ -32,37 +32,24 @@
 #include "dh_utils_tool.h"
 #include "distributed_hardware_errno.h"
 #include "distributed_hardware_log.h"
-#include "idistributed_hardware_manager.h"
+#include "distributed_hardware_manager.h"
 
 namespace OHOS {
 namespace DistributedHardware {
-const char* LIB_NAME = "libdistributedhardwarefwksvr_impl.z.so";
-const std::string FUNC_GET_INSTANCE = "GetDistributedHardwareManagerInstance";
-
 #undef DH_LOG_TAG
 #define DH_LOG_TAG "DistributedHardwareManagerFactory"
 
-using GetMgrFunc = IDistributedHardwareManager *(*)();
-
 IMPLEMENT_SINGLE_INSTANCE(DistributedHardwareManagerFactory);
-
 bool DistributedHardwareManagerFactory::Init()
 {
     DHLOGI("start");
-
-    auto loadResult = LoadLibrary();
-    if (loadResult != DH_FWK_SUCCESS) {
-        DHLOGE("LoadLibrary failed, errCode = %d", loadResult);
-        return false;
-    }
-
-    auto initResult = distributedHardwareMgrPtr_->Initialize();
+    auto initResult = DistributedHardwareManager::GetInstance().Initialize();
     if (initResult != DH_FWK_SUCCESS) {
         DHLOGE("Initialize failed, errCode = %d", initResult);
         return false;
     }
+    isInit = true;
     DHLOGD("success");
-
     return true;
 }
 
@@ -74,11 +61,9 @@ void DistributedHardwareManagerFactory::UnInit()
         "dhfwk sa exit begin.");
 
     // release all the resources synchronously
-    distributedHardwareMgrPtr_->Release();
-
-    CloseLibrary();
+    DistributedHardwareManager::GetInstance().Release();
+    isInit = false;
     DHTraceEnd();
-
     CheckExitSAOrNot();
 }
 
@@ -108,12 +93,7 @@ void DistributedHardwareManagerFactory::CheckExitSAOrNot()
 
 bool DistributedHardwareManagerFactory::IsInit()
 {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (distributedHardwareMgrPtr_ == nullptr) {
-        DHLOGE("distributedHardwareMgr is not Initialize");
-        return false;
-    }
-    return true;
+    return isInit.load();
 }
 
 int32_t DistributedHardwareManagerFactory::SendOnLineEvent(const std::string &networkId, const std::string &uuid,
@@ -129,13 +109,12 @@ int32_t DistributedHardwareManagerFactory::SendOnLineEvent(const std::string &ne
         return ERR_DH_FWK_REMOTE_DEVICE_ID_IS_EMPTY;
     }
 
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (distributedHardwareMgrPtr_ == nullptr && !Init()) {
+    if (!isInit && !Init()) {
         DHLOGE("distributedHardwareMgr is null");
         return ERR_DH_FWK_HARDWARE_MANAGER_LOAD_IMPL_FAILED;
     }
 
-    auto onlineResult = distributedHardwareMgrPtr_->SendOnLineEvent(networkId, uuid, deviceType);
+    auto onlineResult = DistributedHardwareManager::GetInstance().SendOnLineEvent(networkId, uuid, deviceType);
     if (onlineResult != DH_FWK_SUCCESS) {
         DHLOGE("online failed, errCode = %d", onlineResult);
         return onlineResult;
@@ -151,86 +130,33 @@ int32_t DistributedHardwareManagerFactory::SendOffLineEvent(const std::string &n
         return ERR_DH_FWK_REMOTE_NETWORK_ID_IS_EMPTY;
     }
 
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (distributedHardwareMgrPtr_ == nullptr && !Init()) {
+    if (!isInit && !Init()) {
         DHLOGE("distributedHardwareMgr is null");
         return ERR_DH_FWK_HARDWARE_MANAGER_LOAD_IMPL_FAILED;
     }
 
-    auto offlineResult = distributedHardwareMgrPtr_->SendOffLineEvent(networkId, uuid, deviceType);
+    auto offlineResult = DistributedHardwareManager::GetInstance().SendOffLineEvent(networkId, uuid, deviceType);
     if (offlineResult != DH_FWK_SUCCESS) {
         DHLOGE("offline failed, errCode = %d", offlineResult);
         return offlineResult;
     }
 
-    if (distributedHardwareMgrPtr_->GetOnLineCount() == 0) {
+    if (DistributedHardwareManager::GetInstance().GetOnLineCount() == 0) {
         DHLOGI("all devices are offline, start to free the resource");
         UnInit();
     }
     return DH_FWK_SUCCESS;
 }
 
-int32_t DistributedHardwareManagerFactory::LoadLibrary()
-{
-    DHLOGI("start.");
-    if (handler_ != nullptr && distributedHardwareMgrPtr_ != nullptr) {
-        DHLOGE("DistributedHardwareManager handler has loaded.");
-        return DH_FWK_SUCCESS;
-    }
-
-    handler_ = dlopen(LIB_NAME, RTLD_NOW | RTLD_NODELETE);
-    if (handler_ == nullptr) {
-        DHLOGE("open %s failed, fail reason : %s", LIB_NAME, dlerror());
-        return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_OPEN_FAILED;
-    }
-
-    auto getManager = reinterpret_cast<GetMgrFunc>(dlsym(handler_, FUNC_GET_INSTANCE.c_str()));
-    if (getManager == nullptr) {
-        DHLOGE("can not find %s, failed reason : %s", FUNC_GET_INSTANCE.c_str(), dlerror());
-        CloseLibrary();
-        return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_GET_INSTANCE_FAILED;
-    }
-
-    distributedHardwareMgrPtr_ = getManager();
-    if (distributedHardwareMgrPtr_ == nullptr) {
-        DHLOGE("distributedHardwareMgrPtr is null.");
-        CloseLibrary();
-        return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_IS_NULL;
-    }
-    DHLOGI("load %s success.", LIB_NAME);
-    return DH_FWK_SUCCESS;
-}
-
-void DistributedHardwareManagerFactory::CloseLibrary()
-{
-    if (handler_ == nullptr) {
-        DHLOGI("%s is already closed.", LIB_NAME);
-        return;
-    }
-    distributedHardwareMgrPtr_ = nullptr;
-    dlclose(handler_);
-    handler_ = nullptr;
-    DHLOGI("%s is closed.", LIB_NAME);
-}
-
 int32_t DistributedHardwareManagerFactory::GetComponentVersion(std::unordered_map<DHType, std::string> &versionMap)
 {
     DHLOGI("start");
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (distributedHardwareMgrPtr_ == nullptr) {
-        DHLOGE("distributedHardwareMgr is null");
-        return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_IS_NULL;
-    }
-    return distributedHardwareMgrPtr_->GetComponentVersion(versionMap);
+    return DistributedHardwareManager::GetInstance().GetComponentVersion(versionMap);
 }
 
 int32_t DistributedHardwareManagerFactory::Dump(const std::vector<std::string> &argsStr, std::string &result)
 {
-    if (distributedHardwareMgrPtr_ == nullptr) {
-        DHLOGE("distributedHardwareMgr is null");
-        return ERR_DH_FWK_HIDUMP_ERROR;
-    }
-    return distributedHardwareMgrPtr_->Dump(argsStr, result);
+    return DistributedHardwareManager::GetInstance().Dump(argsStr, result);
 }
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_proxy.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp
rename to services/distributedhardwarefwkservice/src/distributed_hardware_proxy.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/hidumphelper/enabled_comps_dump.cpp b/services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/hidumphelper/enabled_comps_dump.cpp
rename to services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/hidumphelper/hidump_helper.cpp b/services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/hidumphelper/hidump_helper.cpp
rename to services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp
rename to services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp
rename to services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info.cpp
rename to services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp
rename to services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp
rename to services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp
rename to services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp b/services/distributedhardwarefwkservice/src/task/disable_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp
rename to services/distributedhardwarefwkservice/src/task/disable_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp b/services/distributedhardwarefwkservice/src/task/enable_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp
rename to services/distributedhardwarefwkservice/src/task/enable_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/monitor_task_timer.cpp b/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/monitor_task_timer.cpp
rename to services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp b/services/distributedhardwarefwkservice/src/task/offline_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp
rename to services/distributedhardwarefwkservice/src/task/offline_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp b/services/distributedhardwarefwkservice/src/task/online_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp
rename to services/distributedhardwarefwkservice/src/task/online_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task.cpp b/services/distributedhardwarefwkservice/src/task/task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/task.cpp
rename to services/distributedhardwarefwkservice/src/task/task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_board.cpp b/services/distributedhardwarefwkservice/src/task/task_board.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/task_board.cpp
rename to services/distributedhardwarefwkservice/src/task/task_board.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_executor.cpp b/services/distributedhardwarefwkservice/src/task/task_executor.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/task_executor.cpp
rename to services/distributedhardwarefwkservice/src/task/task_executor.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp b/services/distributedhardwarefwkservice/src/task/task_factory.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp
rename to services/distributedhardwarefwkservice/src/task/task_factory.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/utils/dh_context.cpp
rename to services/distributedhardwarefwkservice/src/utils/dh_context.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/src/versionmanager/version_manager.cpp b/services/distributedhardwarefwkservice/src/versionmanager/version_manager.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/src/versionmanager/version_manager.cpp
rename to services/distributedhardwarefwkservice/src/versionmanager/version_manager.cpp
diff --git a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn
index 43174dfbc1fe80d25ea5c632d7dd04eba685638d..8a29f0b3847a94867b2d667da3a4ff3749e22b16 100644
--- a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn
@@ -14,5 +14,9 @@
 group("fuzztest") {
   testonly = true
 
-  deps = [ "accessmanager_fuzzer:fuzztest" ]
+  deps = [
+    "accessmanager_fuzzer:fuzztest",
+    "componentmanager_fuzzer:fuzztest",
+    "resourcemanager_fuzzer:fuzztest",
+  ]
 }
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn
similarity index 83%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn
rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn
index 9955a866f8e23b3a6eee5e920928effd9b01f23b..68d690a744377acd299c31810d4eaa2c9d8d2655 100644
--- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn
@@ -20,14 +20,14 @@ import(
 ##############################fuzztest##########################################
 ohos_fuzztest("ComponentmanagerFuzzTest") {
   module_out_path = "distributed_hardware_fwk/componentmanager"
-  fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer"
+  fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer"
 
   include_dirs = [
     "${utils_path}/include",
     "${utils_path}/include/log",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/componentmanager",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/componentmanager",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
     "//utils/native/base/include",
@@ -41,7 +41,7 @@ ohos_fuzztest("ComponentmanagerFuzzTest") {
   sources = [ "componentmanager_fuzzer.cpp" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
   ]
 
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp
rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h
rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/corpus/init
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init
rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/corpus/init
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/project.xml b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/project.xml
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/project.xml
rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/project.xml
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
similarity index 87%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
index bda4171b24c07dcf4db31484acb9c5fb31cbb8d7..d8e72fe5998a7b4eb49f7c9c93b0e1db9fea32fe 100644
--- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn
@@ -20,15 +20,15 @@ import(
 ##############################fuzztest##########################################
 ohos_fuzztest("ResourcemanagerFuzzTest") {
   module_out_path = "distributed_hardware_fwk/resourcemanager"
-  fuzz_config_file = "${services_path}/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer"
+  fuzz_config_file = "${services_path}/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer"
 
   include_dirs = [
     "${utils_path}/include",
     "${utils_path}/include/log",
     "${utils_path}/include/eventbus",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/resourcemanager",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/resourcemanager",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
     "//utils/native/base/include",
@@ -45,7 +45,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") {
   sources = [ "resourcemanager_fuzzer.cpp" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//utils/native/base:utils",
   ]
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/corpus/init
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init
rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/corpus/init
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/project.xml b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/project.xml
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/project.xml
rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/project.xml
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp
rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h
rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h
diff --git a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn
index def0e61e6ed2f35d37c6b2cdb39e3e2bbb18126b..a41d5794a546dd1be496c158fc420724288ac67f 100644
--- a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn
@@ -14,5 +14,13 @@
 group("test") {
   testonly = true
 
-  deps = [ "common/accessmanager:AccessManagerTest" ]
+  deps = [
+    "common/accessmanager:AccessManagerTest",
+    "common/distributedhardwaremanager:distributed_hardware_manager_test",
+    "common/componentloader:component_loader_test",
+    "common/componentmanager:component_manager_test",
+    "common/resourcemanager:resource_manager_test",
+    "common/task:dh_task_test",
+    "common/versionmanager:version_manager_test",
+  ]
 }
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn
similarity index 80%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn
rename to services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn
index e83d680cff7148867f9c23ea1722c695849dd476..7643bf3ae02f643907c3c5c0b1632b7471c5e981 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn
@@ -23,10 +23,10 @@ config("module_private_config") {
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/versionmanager",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/componentloader",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/versionmanager",
+    "${services_path}/distributedhardwarefwkservice/include/componentloader",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
   ]
@@ -40,7 +40,7 @@ ohos_unittest("ComponentLoaderTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//third_party/googletest:gtest_main",
   ]
 
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/include/component_loader_test.h b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/include/component_loader_test.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/include/component_loader_test.h
rename to services/distributedhardwarefwkservice/test/unittest/common/componentloader/include/component_loader_test.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/src/component_loader_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/src/component_loader_test.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn
similarity index 85%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn
rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn
index f37e19bdc2fd2da700f7b2872bed6e3347a433cb..399f60809998e926d862b43d311d78afe0607b1b 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn
@@ -23,9 +23,9 @@ config("module_private_config") {
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/componentmanager",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/componentmanager",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
     "//utils/native/base/include",
@@ -40,7 +40,7 @@ ohos_unittest("ComponentManagerTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/component_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/component_manager_test.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/component_manager_test.h
rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/component_manager_test.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h
rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h
rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/src/component_manager_test.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn
similarity index 85%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn
rename to services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn
index 035bc692c97122a1b27131aba15e3045a477119d..851229f0306e0ca17ebca20d8e691cefbfaa76c0 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn
@@ -26,9 +26,9 @@ config("module_private_config") {
     "${utils_path}/include/eventbus",
     "${common_path}/log/include",
     "${common_path}/utils/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/task",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/task",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "//utils/native/base/include",
   ]
 }
@@ -36,12 +36,12 @@ config("module_private_config") {
 ohos_unittest("DistributedHardwareManagerTest") {
   module_out_path = module_out_path
 
-  sources = [ "distributed_hardware_manager_test.cpp" ]
+  sources = [ "src/distributed_hardware_manager_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/include/distributed_hardware_manager_test.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.h
rename to services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/include/distributed_hardware_manager_test.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn
similarity index 87%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn
rename to services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn
index 14d15c23a98ff67d1a4ffa8a8ca770554b4b37b7..2bac3db2ab0d2af0c37073150e365ab50eb53190 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn
@@ -24,9 +24,9 @@ config("module_private_config") {
     "${utils_path}/include",
     "${utils_path}/include/log",
     "${utils_path}/include/eventbus",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/resourcemanager",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/resourcemanager",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
     "//utils/native/base/include",
@@ -45,7 +45,7 @@ ohos_unittest("ResourceManagerTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/include/resource_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/include/resource_manager_test.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/include/resource_manager_test.h
rename to services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/include/resource_manager_test.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn
similarity index 86%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn
rename to services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn
index bbddc9ad8a451a49fdf8bfba0fcf1c4f8bb1ef1c..d77da12d2c3cf95faaa9acb1df48b9b1a2f83dc9 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn
@@ -23,9 +23,9 @@ config("module_private_config") {
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/task",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/task",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
     "//utils/native/base/include",
@@ -48,7 +48,7 @@ ohos_unittest("DHTaskTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_disable_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_disable_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_enable_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_enable_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_offline_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_offline_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_online_task.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_online_task.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_factory.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_factory.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_utils.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_utils.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/task_test.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/task_test.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/task_test.h
rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/task_test.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_disable_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_disable_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_enable_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_enable_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_offline_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_offline_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_online_task.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_online_task.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_task_factory.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_task_factory.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn
similarity index 80%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn
rename to services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn
index 60f92bc841ef6708d23e55676944542d4fb7c442..27fffc29e189b05fcc2f09ca88eb2ce00992e6f3 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn
@@ -23,10 +23,10 @@ config("module_private_config") {
     "include",
     "${utils_path}/include",
     "${utils_path}/include/log",
-    "${services_path}/distributedhardwarefwkserviceimpl/include",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/componentloader",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/versionmanager",
-    "${services_path}/distributedhardwarefwkserviceimpl/include/utils",
+    "${services_path}/distributedhardwarefwkservice/include",
+    "${services_path}/distributedhardwarefwkservice/include/componentloader",
+    "${services_path}/distributedhardwarefwkservice/include/versionmanager",
+    "${services_path}/distributedhardwarefwkservice/include/utils",
     "${common_path}/utils/include",
     "${common_path}/log/include",
     "//utils/native/base/include",
@@ -41,7 +41,7 @@ ohos_unittest("VersionManagerTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//third_party/googletest:gtest_main",
   ]
 
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/include/version_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/include/version_manager_test.h
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/include/version_manager_test.h
rename to services/distributedhardwarefwkservice/test/unittest/common/versionmanager/include/version_manager_test.h
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/src/version_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp
similarity index 100%
rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/src/version_manager_test.cpp
rename to services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp
diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn
deleted file mode 100644
index 83328024ead464c63820022252b8344039436970..0000000000000000000000000000000000000000
--- a/services/distributedhardwarefwkserviceimpl/BUILD.gn
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni")
-
-ohos_shared_library("distributedhardwarefwksvr_impl") {
-  include_dirs = [
-    "//utils/native/base/include",
-    "//utils/system/safwk/native/include",
-    "//third_party/json/include",
-    "include",
-    "include/componentloader",
-    "include/versionmanager",
-    "include/componentmanager",
-    "include/task",
-    "include/utils",
-    "include/localhardwaremanager",
-    "include/resourcemanager",
-    "include/hidumphelper",
-    "${common_path}/log/include",
-    "${common_path}/utils/include",
-    "${utils_path}/include",
-    "${utils_path}/include/log",
-    "${utils_path}/include/eventbus",
-  ]
-
-  sources = [
-    "src/componentloader/component_loader.cpp",
-    "src/componentmanager/component_disable.cpp",
-    "src/componentmanager/component_enable.cpp",
-    "src/componentmanager/component_manager.cpp",
-    "src/distributed_hardware_manager.cpp",
-    "src/distributed_hardware_proxy.cpp",
-    "src/hidumphelper/enabled_comps_dump.cpp",
-    "src/hidumphelper/hidump_helper.cpp",
-    "src/localhardwaremanager/local_hardware_manager.cpp",
-    "src/localhardwaremanager/plugin_listener_impl.cpp",
-    "src/resourcemanager/capability_info.cpp",
-    "src/resourcemanager/capability_info_manager.cpp",
-    "src/resourcemanager/capability_utils.cpp",
-    "src/resourcemanager/db_adapter.cpp",
-    "src/task/disable_task.cpp",
-    "src/task/enable_task.cpp",
-    "src/task/monitor_task_timer.cpp",
-    "src/task/offline_task.cpp",
-    "src/task/online_task.cpp",
-    "src/task/task.cpp",
-    "src/task/task_board.cpp",
-    "src/task/task_executor.cpp",
-    "src/task/task_factory.cpp",
-    "src/utils/dh_context.cpp",
-    "src/versionmanager/version_manager.cpp",
-  ]
-
-  deps = [
-    "${utils_path}:distributedhardwareutils",
-    "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager",
-    "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-    "//utils/native/base:utils",
-  ]
-
-  defines = [
-    "HI_LOG_ENABLE",
-    "DH_LOG_TAG=\"dhfwksvr\"",
-    "LOG_DOMAIN=0xD004100",
-  ]
-
-  external_deps = [
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
-    "distributeddatamgr:distributeddata_inner",
-    "eventhandler:libeventhandler",
-    "hisysevent_native:libhisysevent",
-    "hitrace_native:hitrace_meter",
-    "hiviewdfx_hilog_native:libhilog",
-    "init:libbegetutil",
-    "ipc:ipc_core",
-    "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
-  ]
-
-  subsystem_name = "distributedhardware"
-
-  part_name = "distributed_hardware_fwk"
-}
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn
deleted file mode 100644
index 9def5f890e2a38d002aa72ae62a98b00cffbed9a..0000000000000000000000000000000000000000
--- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-group("fuzztest") {
-  testonly = true
-
-  deps = [
-    "componentmanager_fuzzer:fuzztest",
-    "resourcemanager_fuzzer:fuzztest",
-  ]
-}
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn
deleted file mode 100644
index 81f9d266baf2d70b6561f80ef80c763cd9bde775..0000000000000000000000000000000000000000
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-group("svrimpl_test") {
-  testonly = true
-  deps = [
-    "common:distributed_hardware_manager_test",
-    "common/componentloader:component_loader_test",
-    "common/componentmanager:component_manager_test",
-    "common/resourcemanager:resource_manager_test",
-    "common/task:dh_task_test",
-    "common/versionmanager:version_manager_test",
-  ]
-}