From 9c164ee303b8351db31771a35fb2ad488c571700 Mon Sep 17 00:00:00 2001
From: zhangfeng <hw.zhangfeng@huawei.com>
Date: Thu, 21 Apr 2022 09:11:11 +0000
Subject: [PATCH] Signed-off-by: zhangfeng <hw.zhangfeng@huawei.com> Change-Id:
 I00efb8805c8b6217e4f93f64fea9198e92a45ef3

---
 OAT.xml                                       |   5 +-
 bundle.json                                   | 131 -------------
 LICENSE => dhcp/LICENSE                       |   0
 dhcp/bundle.json                              |  78 ++++++++
 dhcp/dhcp.gni                                 |  19 ++
 .../native_cpp}/include/dhcp_define.h         |   0
 .../native_cpp/include/dhcp_service_api.h     |  29 +++
 .../interfaces/i_dhcp_client_service.h        |   0
 .../interfaces/i_dhcp_result_notify.h         |   0
 .../interfaces/i_dhcp_server_service.h        |   0
 .../native_cpp}/interfaces/i_dhcp_service.h   |   0
 .../services}/dhcp_client/BUILD.gn            |  23 +--
 .../services}/dhcp_client/include/dhcp_api.h  |   0
 .../dhcp_client/include/dhcp_client.h         |   0
 .../dhcp_client/include/dhcp_define.h         |   0
 .../dhcp_client/include/dhcp_function.h       |   0
 .../services}/dhcp_client/include/dhcp_ipv4.h |   0
 .../dhcp_client/include/dhcp_options.h        |   0
 .../dhcp_client/include/dhcp_socket.h         |   0
 .../services}/dhcp_client/src/dhcp_api.cpp    |   0
 .../services}/dhcp_client/src/dhcp_client.c   |   0
 .../services}/dhcp_client/src/dhcp_function.c |   0
 .../services}/dhcp_client/src/dhcp_ipv4.c     |   0
 .../services}/dhcp_client/src/dhcp_main.c     |   0
 .../services}/dhcp_client/src/dhcp_options.c  |   0
 .../services}/dhcp_client/src/dhcp_socket.c   |   0
 .../services}/dhcp_server/BUILD.gn            |   8 +-
 .../dhcp_server/etc/dhcpd.conf.sample         |   0
 .../services}/dhcp_server/etc/dhcpd_mini.conf |   0
 .../dhcp_server/include/address_utils.h       |   0
 .../dhcp_server/include/common_util.h         |   0
 .../dhcp_server/include/dhcp_address_pool.h   |   0
 .../dhcp_server/include/dhcp_argument.h       |   0
 .../dhcp_server/include/dhcp_binding.h        |   0
 .../dhcp_server/include/dhcp_config.h         |   0
 .../dhcp_server/include/dhcp_define.h         |   0
 .../services}/dhcp_server/include/dhcp_ipv4.h |   0
 .../dhcp_server/include/dhcp_logger.h         |   0
 .../dhcp_server/include/dhcp_message.h        |   0
 .../dhcp_server/include/dhcp_option.h         |   0
 .../dhcp_server/include/dhcp_server.h         |   0
 .../dhcp_server/include/hash_table.h          |   0
 .../services}/dhcp_server/src/address_utils.c |   0
 .../services}/dhcp_server/src/common_util.c   |   0
 .../dhcp_server/src/dhcp_address_pool.c       |   0
 .../services}/dhcp_server/src/dhcp_argument.c |   0
 .../services}/dhcp_server/src/dhcp_binding.c  |   0
 .../services}/dhcp_server/src/dhcp_config.c   |   0
 .../services}/dhcp_server/src/dhcp_dhcpd.c    |   0
 .../services}/dhcp_server/src/dhcp_option.c   |   0
 .../services}/dhcp_server/src/dhcp_server.c   |   0
 .../services}/dhcp_server/src/hash_table.c    |   0
 .../services}/mgr_service/BUILD.gn            |  23 ++-
 .../include/dhcp_client_service_impl.h        |   0
 .../include/dhcp_event_subscriber.h           |   0
 .../services}/mgr_service/include/dhcp_func.h |   0
 .../mgr_service/include/dhcp_server_service.h |   0
 .../mgr_service/include/dhcp_service.h        |   0
 .../src/dhcp_client_service_impl.cpp          |   0
 .../mgr_service/src/dhcp_event_subscriber.cpp |   0
 .../services}/mgr_service/src/dhcp_func.cpp   |   0
 .../mgr_service/src/dhcp_server_service.cpp   |   0
 .../mgr_service/src/dhcp_service.cpp          |   2 +-
 .../mgr_service/src/dhcp_service_api.cpp      |  34 ++++
 .../tests/services}/dhcp_client/BUILD.gn      |  26 +--
 .../dhcp_client/dhcp_client_test.cpp          |   0
 .../dhcp_client/dhcp_function_test.cpp        |   0
 .../services}/dhcp_client/dhcp_ipv4_test.cpp  |   0
 .../services}/dhcp_client/dhcp_main_test.cpp  |   0
 .../dhcp_client/dhcp_options_test.cpp         |   0
 .../dhcp_client/dhcp_socket_test.cpp          |   0
 .../services}/dhcp_client/global_test.cpp     |   0
 .../tests/services}/dhcp_client/global_test.h |   0
 .../dhcp_client/mock_custom_func.cpp          |   0
 .../services}/dhcp_client/mock_custom_func.h  |   0
 .../dhcp_client/mock_system_func.cpp          |   0
 .../services}/dhcp_client/mock_system_func.h  |   0
 .../services}/dhcp_server/unittest/BUILD.gn   |  30 +--
 .../unittest/address_utils_test.cpp           |   0
 .../dhcp_server/unittest/common_util_test.cpp |   0
 .../unittest/dhcp_address_pool_test.cpp       |   0
 .../unittest/dhcp_argument_test.cpp           |   0
 .../unittest/dhcp_binding_test.cpp            |   0
 .../dhcp_server/unittest/dhcp_config_test.cpp |   0
 .../dhcp_server/unittest/dhcp_message_sim.cpp |   0
 .../dhcp_server/unittest/dhcp_message_sim.h   |   0
 .../dhcp_server/unittest/dhcp_option_test.cpp |   0
 .../dhcp_server/unittest/dhcp_server_test.cpp |   0
 .../dhcp_server/unittest/hash_table_test.cpp  |   0
 .../dhcp_server/unittest/system_func_mock.cpp |   0
 .../dhcp_server/unittest/system_func_mock.h   |   0
 .../tests/services}/mgr_service/BUILD.gn      |  27 +--
 .../mgr_service/dhcp_client_service_test.cpp  |   0
 .../services}/mgr_service/dhcp_func_test.cpp  |   0
 .../mgr_service/dhcp_manage_test.cpp          |   0
 .../mgr_service/dhcp_result_notify.cpp        |   0
 .../mgr_service/dhcp_result_notify.h          |   0
 .../mgr_service/dhcp_server_service_test.cpp  |   0
 .../mgr_service/dhcp_service_test.cpp         |   0
 .../services}/mgr_service/global_test.cpp     |   0
 .../tests/services}/mgr_service/global_test.h |   0
 .../mgr_service/mock_system_func.cpp          |   0
 .../services}/mgr_service/mock_system_func.h  |   0
 .../wifi_standard/wifi_framework/BUILD.gn     |  43 -----
 .../wifi_manage/wifi_ap/BUILD.gn              |  83 --------
 .../wifi_manage/wifi_p2p/BUILD.gn             | 117 ------------
 .../wifi_manage/wifi_scan/BUILD.gn            |  76 --------
 .../wifi_manage/wifi_sta/BUILD.gn             |  92 ---------
 .../wifi_manage/wifi_ap/BUILD.gn              | 109 -----------
 .../wifi_manage/wifi_p2p/test/BUILD.gn        | 162 ----------------
 .../wifi_manage/wifi_scan/BUILD.gn            | 101 ----------
 .../wifi_manage/wifi_sta/BUILD.gn             | 127 -------------
 .gitattributes => wifi/.gitattributes         |   0
 wifi/LICENSE                                  | 177 ++++++++++++++++++
 README.md => wifi/README.md                   |   0
 README_zh.md => wifi/README_zh.md             |   0
 .../application}/wifi_direct_demo/README.md   |   0
 .../wifi_direct_demo/build.gradle             |   0
 .../wifi_direct_demo/entry/.gitignore         |   0
 .../wifi_direct_demo/entry/build.gradle       |   0
 .../wifi_direct_demo/entry/proguard-rules.pro |   0
 .../entry/src/main/config.json                |   0
 .../entry/src/main/ets/MainAbility/app.ets    |   0
 .../main/ets/MainAbility/common/LogUtil.ets   |   0
 .../ets/MainAbility/common/StorageUtil.ets    |   0
 .../main/ets/MainAbility/model/BaseModel.ets  |   0
 .../model/wifiModeImpl/WifiEntity.ets         |   0
 .../model/wifiModeImpl/WifiModel.ets          |   0
 .../component/dialog/customPromptDialog.ets   |   0
 .../pages/component/dialog/inputComponent.ets |   0
 .../src/main/ets/MainAbility/pages/index.ets  |   0
 .../ets/MainAbility/res/image/ic_phone.svg    |   0
 .../ets/MainAbility/res/image/ic_right.svg    |   0
 .../main/resources/base/element/string.json   |   0
 .../main/resources/base/media/ic_loading.gif  | Bin
 .../src/main/resources/base/media/icon.png    | Bin
 .../wifi_direct_demo/figures/img.png          | Bin
 .../wifi_direct_demo/gradle.properties        |   0
 .../application}/wifi_direct_demo/gradlew     |   0
 .../application}/wifi_direct_demo/gradlew.bat |   0
 .../wifi_direct_demo/package.json             |   0
 .../wifi_direct_demo/settings.gradle          |   0
 wifi/bundle.json                              | 127 +++++++++++++
 .../figures}/en-us_image_0000001115710400.png | Bin
 .../figures}/zh-cn_image_0000001115710400.png | Bin
 hisysevent.yaml => wifi/hisysevent.yaml       |   0
 .../innerkits/native_c/station_info.h         |   0
 .../innerkits/native_c/wifi_device.h          |   0
 .../innerkits/native_c/wifi_device_config.h   |   0
 .../innerkits/native_c/wifi_error_code.h      |   0
 .../innerkits/native_c/wifi_event.h           |   0
 .../innerkits/native_c/wifi_hid2d.h           |   0
 .../innerkits/native_c/wifi_hotspot.h         |   0
 .../innerkits/native_c/wifi_hotspot_config.h  |   0
 .../innerkits/native_c/wifi_linked_info.h     |   0
 .../interfaces}/innerkits/native_c/wifi_p2p.h |   0
 .../innerkits/native_c/wifi_p2p_config.h      |   0
 .../innerkits/native_c/wifi_scan_info.h       |   0
 .../innerkits/native_cpp/napi/BUILD.gn        |  33 ++--
 .../native_cpp/napi/wifi_napi_device.cpp      |   0
 .../native_cpp/napi/wifi_napi_device.h        |   0
 .../native_cpp/napi/wifi_napi_entry.cpp       |   0
 .../native_cpp/napi/wifi_napi_event.cpp       |   0
 .../native_cpp/napi/wifi_napi_event.h         |   0
 .../native_cpp/napi/wifi_napi_hotspot.cpp     |   0
 .../native_cpp/napi/wifi_napi_hotspot.h       |   0
 .../native_cpp/napi/wifi_napi_p2p.cpp         |   0
 .../innerkits/native_cpp/napi/wifi_napi_p2p.h |   0
 .../native_cpp/napi/wifi_napi_utils.cpp       |   0
 .../native_cpp/napi/wifi_napi_utils.h         |   0
 .../native_cpp/wifi_standard/BUILD.gn         |  33 ++--
 .../wifi_standard/c_adapter/wifi_c_device.cpp |   0
 .../wifi_standard/c_adapter/wifi_c_event.cpp  |   0
 .../wifi_standard/c_adapter/wifi_c_hid2d.cpp  |   0
 .../c_adapter/wifi_c_hotspot.cpp              |   0
 .../wifi_standard/c_adapter/wifi_c_p2p.cpp    |   0
 .../wifi_standard/c_adapter/wifi_c_utils.cpp  |   0
 .../wifi_standard/c_adapter/wifi_c_utils.h    |   0
 .../wifi_standard/include/wifi_device.h       |   2 +-
 .../wifi_standard/include/wifi_hid2d.h        |   0
 .../wifi_standard/include/wifi_hotspot.h      |   0
 .../wifi_standard/include/wifi_p2p.h          |   0
 .../wifi_standard/include/wifi_scan.h         |   0
 .../wifi_standard/interfaces/define.h         |   0
 .../wifi_standard/interfaces/i_wifi_device.h  |   0
 .../interfaces/i_wifi_device_callback.h       |   0
 .../wifi_standard/interfaces/i_wifi_hotspot.h |   0
 .../interfaces/i_wifi_hotspot_callback.h      |   0
 .../wifi_standard/interfaces/i_wifi_p2p.h     |   0
 .../interfaces/i_wifi_p2p_callback.h          |   0
 .../wifi_standard/interfaces/i_wifi_scan.h    |   0
 .../interfaces/i_wifi_scan_callback.h         |   0
 .../wifi_standard/interfaces/wifi_ap_msg.h    |   0
 .../wifi_standard/interfaces/wifi_errcode.h   |   0
 .../wifi_standard/interfaces/wifi_hid2d_msg.h |   0
 .../wifi_standard/interfaces/wifi_msg.h       |   0
 .../wifi_standard/interfaces/wifi_p2p_msg.h   |   0
 .../wifi_standard/interfaces/wifi_scan_msg.h  |   0
 .../wifi_standard/src/wifi_device.cpp         |   0
 .../src/wifi_device_callback_stub.cpp         |   0
 .../src/wifi_device_callback_stub.h           |   0
 .../wifi_standard/src/wifi_device_impl.cpp    |   0
 .../wifi_standard/src/wifi_device_impl.h      |   0
 .../wifi_standard/src/wifi_device_proxy.cpp   |   0
 .../wifi_standard/src/wifi_device_proxy.h     |   0
 .../wifi_standard/src/wifi_hid2d.cpp          |   0
 .../wifi_standard/src/wifi_hid2d_msg.cpp      |   0
 .../wifi_standard/src/wifi_hotspot.cpp        |   0
 .../src/wifi_hotspot_callback_stub.cpp        |   0
 .../src/wifi_hotspot_callback_stub.h          |   0
 .../wifi_standard/src/wifi_hotspot_impl.cpp   |   0
 .../wifi_standard/src/wifi_hotspot_impl.h     |   0
 .../wifi_standard/src/wifi_hotspot_proxy.cpp  |   0
 .../wifi_standard/src/wifi_hotspot_proxy.h    |   0
 .../wifi_standard/src/wifi_logger.h           |   0
 .../native_cpp/wifi_standard/src/wifi_p2p.cpp |   0
 .../src/wifi_p2p_callback_stub.cpp            |   0
 .../src/wifi_p2p_callback_stub.h              |   0
 .../wifi_standard/src/wifi_p2p_impl.cpp       |   0
 .../wifi_standard/src/wifi_p2p_impl.h         |   0
 .../wifi_standard/src/wifi_p2p_msg.cpp        |   0
 .../wifi_standard/src/wifi_p2p_proxy.cpp      |   0
 .../wifi_standard/src/wifi_p2p_proxy.h        |   0
 .../wifi_standard/src/wifi_scan.cpp           |   0
 .../src/wifi_scan_callback_stub.cpp           |   0
 .../src/wifi_scan_callback_stub.h             |   0
 .../wifi_standard/src/wifi_scan_impl.cpp      |   0
 .../wifi_standard/src/wifi_scan_impl.h        |   0
 .../wifi_standard/src/wifi_scan_proxy.cpp     |   0
 .../wifi_standard/src/wifi_scan_proxy.h       |   0
 .../interfaces}/kits/jskits/@ohos.wifi.d.ts   |   0
 .../kits/jskits/@ohos.wifiext.d.ts            |   0
 .../services}/wifi_standard/etc/init/BUILD.gn |   2 +-
 .../wifi_standard/etc/init/wifi_standard.cfg  |   0
 .../wifi_standard/ipc_framework/cRPC/BUILD.gn |   9 +-
 .../ipc_framework/cRPC/include/client.h       |   0
 .../ipc_framework/cRPC/include/common.h       |   0
 .../ipc_framework/cRPC/include/context.h      |   0
 .../ipc_framework/cRPC/include/evloop.h       |   0
 .../ipc_framework/cRPC/include/hash_table.h   |   0
 .../ipc_framework/cRPC/include/log.h          |   0
 .../ipc_framework/cRPC/include/net.h          |   0
 .../ipc_framework/cRPC/include/serial.h       |   0
 .../ipc_framework/cRPC/include/server.h       |   0
 .../ipc_framework/cRPC/src/client.c           |   0
 .../ipc_framework/cRPC/src/context.c          |   0
 .../ipc_framework/cRPC/src/evloop.c           |   0
 .../ipc_framework/cRPC/src/hash_table.c       |   0
 .../ipc_framework/cRPC/src/net.c              |   0
 .../ipc_framework/cRPC/src/serial.c           |   0
 .../ipc_framework/cRPC/src/server.c           |   0
 .../wifi_standard/sa_profile/1120.xml         |   0
 .../wifi_standard/sa_profile/1121.xml         |   0
 .../wifi_standard/sa_profile/1123.xml         |   0
 .../wifi_standard/sa_profile/1124.xml         |   0
 .../wifi_standard/sa_profile/BUILD.gn         |   4 +-
 .../wifi_standard/wifi_framework/BUILD.gn     |  36 ++++
 .../common/config/wifi_config_country_freqs.h |   0
 .../common/config/wifi_config_file_impl.h     |   0
 .../common/config/wifi_config_file_spec.cpp   |   0
 .../common/config/wifi_config_file_spec.h     |   0
 .../common/config/wifi_settings.cpp           |   0
 .../common/config/wifi_settings.h             |   0
 .../common/include/permission_def.h           |   0
 .../common/include/wifi_internal_msg.h        |   0
 .../wifi_framework/common/log/log_helper.c    |   0
 .../wifi_framework/common/log/log_helper.h    |   0
 .../wifi_framework/common/log/wifi_log.h      |   0
 .../wifi_framework/common/log/wifi_log_tags.h |   0
 .../wifi_framework/common/log/wifi_logger.h   |   0
 .../common/net_helper/base_address.cpp        |   0
 .../common/net_helper/base_address.h          |   0
 .../common/net_helper/dhcpd_interface.cpp     |   0
 .../common/net_helper/dhcpd_interface.h       |   0
 .../common/net_helper/http_request.cpp        |   0
 .../common/net_helper/http_request.h          |   0
 .../common/net_helper/if_config.cpp           |   0
 .../common/net_helper/if_config.h             |   0
 .../common/net_helper/ip_tools.cpp            |   0
 .../common/net_helper/ip_tools.h              |   0
 .../common/net_helper/ipv4_address.cpp        |   0
 .../common/net_helper/ipv4_address.h          |   0
 .../common/net_helper/ipv6_address.cpp        |   0
 .../common/net_helper/ipv6_address.h          |   0
 .../common/net_helper/mac_address.cpp         |   0
 .../common/net_helper/mac_address.h           |   0
 .../common/net_helper/network_interface.cpp   |   0
 .../common/net_helper/network_interface.h     |   0
 .../common/utils/wifi_common_event_helper.cpp |   0
 .../common/utils/wifi_common_event_helper.h   |   0
 .../common/utils/wifi_global_func.cpp         |   0
 .../common/utils/wifi_global_func.h           |   0
 .../wifi_framework/wifi_manage/BUILD.gn       | 107 +++++------
 .../wifi_manage/common/handler.cpp            |   0
 .../wifi_manage/common/handler.h              |   0
 .../wifi_manage/common/internal_message.cpp   |   0
 .../wifi_manage/common/internal_message.h     |   0
 .../wifi_manage/common/message_queue.cpp      |   0
 .../wifi_manage/common/message_queue.h        |   0
 .../wifi_manage/common/state.cpp              |   0
 .../wifi_framework/wifi_manage/common/state.h |   0
 .../wifi_manage/common/state_machine.cpp      |   0
 .../wifi_manage/common/state_machine.h        |   0
 .../common/wifi_broadcast_helper.cpp          |   0
 .../common/wifi_broadcast_helper.h            |   0
 .../common/wifi_permission_helper.cpp         |   0
 .../common/wifi_permission_helper.h           |   0
 .../common/wifi_permission_utils.cpp          |   0
 .../common/wifi_permission_utils.h            |   0
 .../wifi_manage/idl_client/BUILD.gn           |  53 +++---
 .../idl_client/idl_interface/i_wifi.c         |   0
 .../idl_client/idl_interface/i_wifi.h         |   0
 .../idl_client/idl_interface/i_wifi_chip.c    |   0
 .../idl_client/idl_interface/i_wifi_chip.h    |   0
 .../i_wifi_chip_event_callback.h              |   0
 .../idl_interface/i_wifi_event_callback.h     |   0
 .../idl_interface/i_wifi_event_p2p_callback.h |   0
 .../idl_interface/i_wifi_hotspot_iface.c      |   0
 .../idl_interface/i_wifi_hotspot_iface.h      |   0
 .../idl_client/idl_interface/i_wifi_iface.c   |   0
 .../idl_client/idl_interface/i_wifi_iface.h   |   0
 .../idl_interface/i_wifi_p2p_iface.c          |   0
 .../idl_interface/i_wifi_p2p_iface.h          |   0
 .../idl_interface/i_wifi_public_func.c        |   0
 .../idl_interface/i_wifi_public_func.h        |   0
 .../idl_interface/i_wifi_sta_iface.c          |   0
 .../idl_interface/i_wifi_sta_iface.h          |   0
 .../idl_client/idl_interface/i_wifi_struct.h  |   0
 .../idl_interface/i_wifi_supplicant_iface.c   |   0
 .../idl_interface/i_wifi_supplicant_iface.h   |   0
 .../idl_client/supplicant_event_callback.h    |   0
 .../idl_client/wifi_ap_event_callback.h       |   0
 .../idl_client/wifi_ap_hal_interface.cpp      |   0
 .../idl_client/wifi_ap_hal_interface.h        |   0
 .../idl_client/wifi_base_hal_interface.cpp    |   0
 .../idl_client/wifi_base_hal_interface.h      |   0
 .../idl_client/wifi_chip_event_callback.h     |   0
 .../idl_client/wifi_chip_hal_interface.cpp    |   0
 .../idl_client/wifi_chip_hal_interface.h      |   0
 .../wifi_manage/idl_client/wifi_error_no.h    |   0
 .../idl_client/wifi_event_callback.h          |   0
 .../idl_client/wifi_idl_client.cpp            |   0
 .../wifi_manage/idl_client/wifi_idl_client.h  |   0
 .../wifi_manage/idl_client/wifi_idl_define.h  |   0
 .../idl_client/wifi_idl_inner_interface.cpp   |   0
 .../idl_client/wifi_idl_inner_interface.h     |   0
 .../wifi_manage/idl_client/wifi_idl_struct.h  |   0
 .../idl_client/wifi_p2p_event_callback.h      |   0
 .../idl_client/wifi_p2p_hal_interface.cpp     |   0
 .../idl_client/wifi_p2p_hal_interface.h       |   0
 .../wifi_manage/idl_client/wifi_scan_param.h  |   0
 .../idl_client/wifi_sta_hal_interface.cpp     |   0
 .../idl_client/wifi_sta_hal_interface.h       |   0
 .../wifi_manage/idl_client/wifi_sta_request.h |   0
 .../wifi_supplicant_hal_interface.cpp         |   0
 .../wifi_supplicant_hal_interface.h           |   0
 .../wifi_manage/wifi_ap/BUILD.gn              |  86 +++++++++
 .../wifi_manage/wifi_ap/ap_config_use.cpp     |   0
 .../wifi_manage/wifi_ap/ap_config_use.h       |   0
 .../wifi_manage/wifi_ap/ap_define.h           |   2 +-
 .../wifi_manage/wifi_ap/ap_idle_state.cpp     |   0
 .../wifi_manage/wifi_ap/ap_idle_state.h       |   0
 .../wifi_manage/wifi_ap/ap_interface.cpp      |   0
 .../wifi_manage/wifi_ap/ap_interface.h        |   0
 .../wifi_manage/wifi_ap/ap_macro.h            |   0
 .../wifi_manage/wifi_ap/ap_monitor.cpp        |   2 +-
 .../wifi_manage/wifi_ap/ap_monitor.h          |   0
 .../wifi_manage/wifi_ap/ap_root_state.cpp     |   0
 .../wifi_manage/wifi_ap/ap_root_state.h       |   0
 .../wifi_manage/wifi_ap/ap_service.cpp        |   0
 .../wifi_manage/wifi_ap/ap_service.h          |   0
 .../wifi_manage/wifi_ap/ap_started_state.cpp  |   2 +-
 .../wifi_manage/wifi_ap/ap_started_state.h    |   0
 .../wifi_manage/wifi_ap/ap_state_machine.cpp  |   2 +-
 .../wifi_manage/wifi_ap/ap_state_machine.h    |   0
 .../wifi_ap/ap_stations_manager.cpp           |   0
 .../wifi_manage/wifi_ap/ap_stations_manager.h |   0
 .../wifi_manage/wifi_ap/i_ap_service.h        |   0
 .../wifi_ap/i_ap_service_callbacks.h          |   0
 .../wifi_ap/wifi_ap_nat_manager.cpp           |   0
 .../wifi_manage/wifi_ap/wifi_ap_nat_manager.h |   0
 .../wifi_manage/wifi_auth_center.cpp          |   0
 .../wifi_manage/wifi_auth_center.h            |   0
 .../wifi_manage/wifi_config_center.cpp        |   0
 .../wifi_manage/wifi_config_center.h          |   0
 .../wifi_device_callback_proxy.cpp            |   0
 .../wifi_manage/wifi_device_callback_proxy.h  |   0
 .../wifi_device_death_recipient.cpp           |   0
 .../wifi_manage/wifi_device_death_recipient.h |   0
 .../wifi_manage/wifi_device_service_impl.cpp  |   0
 .../wifi_manage/wifi_device_service_impl.h    |   0
 .../wifi_manage/wifi_device_stub.cpp          |   0
 .../wifi_manage/wifi_device_stub.h            |   0
 .../wifi_manage/wifi_dumper.cpp               |   0
 .../wifi_framework/wifi_manage/wifi_dumper.h  |   0
 .../wifi_manage/wifi_hid2d_cfg.cpp            |   0
 .../wifi_manage/wifi_hid2d_cfg.h              |   0
 .../wifi_manage/wifi_hid2d_service_utils.cpp  |   0
 .../wifi_manage/wifi_hid2d_service_utils.h    |   0
 .../wifi_hotspot_callback_proxy.cpp           |   0
 .../wifi_manage/wifi_hotspot_callback_proxy.h |   0
 .../wifi_hotspot_death_recipient.cpp          |   0
 .../wifi_hotspot_death_recipient.h            |   0
 .../wifi_manage/wifi_hotspot_service_impl.cpp |   0
 .../wifi_manage/wifi_hotspot_service_impl.h   |   0
 .../wifi_manage/wifi_hotspot_stub.cpp         |   0
 .../wifi_manage/wifi_hotspot_stub.h           |   0
 .../wifi_internal_event_dispatcher.cpp        |   0
 .../wifi_internal_event_dispatcher.h          |   0
 .../wifi_manage/wifi_manager.cpp              |   0
 .../wifi_framework/wifi_manage/wifi_manager.h |   0
 .../wifi_manage/wifi_net_agent.cpp            |   0
 .../wifi_manage/wifi_net_agent.h              |   0
 .../wifi_manage/wifi_p2p/BUILD.gn             | 119 ++++++++++++
 .../wifi_manage/wifi_p2p/abstract_ui.h        |   0
 .../authorizing_negotiation_request_state.cpp |   0
 .../authorizing_negotiation_request_state.h   |   0
 .../wifi_p2p/group_formed_state.cpp           |   0
 .../wifi_manage/wifi_p2p/group_formed_state.h |   0
 .../wifi_p2p/group_negotiation_state.cpp      |   0
 .../wifi_p2p/group_negotiation_state.h        |   0
 .../wifi_p2p/invitation_received_state.cpp    |   0
 .../wifi_p2p/invitation_received_state.h      |   0
 .../wifi_p2p/invitation_request_state.cpp     |   0
 .../wifi_p2p/invitation_request_state.h       |   0
 .../wifi_manage/wifi_p2p/ip2p_service.h       |   0
 .../wifi_p2p/ip2p_service_callbacks.h         |   0
 .../wifi_p2p/p2p_default_state.cpp            |   0
 .../wifi_manage/wifi_p2p/p2p_default_state.h  |   0
 .../wifi_manage/wifi_p2p/p2p_define.h         |   0
 .../wifi_p2p/p2p_disabled_state.cpp           |   0
 .../wifi_manage/wifi_p2p/p2p_disabled_state.h |   0
 .../wifi_p2p/p2p_disabling_state.cpp          |   0
 .../wifi_p2p/p2p_disabling_state.h            |   0
 .../wifi_p2p/p2p_enabled_state.cpp            |   0
 .../wifi_manage/wifi_p2p/p2p_enabled_state.h  |   0
 .../wifi_p2p/p2p_enabling_state.cpp           |   0
 .../wifi_manage/wifi_p2p/p2p_enabling_state.h |   0
 .../wifi_p2p/p2p_group_formation_state.cpp    |   0
 .../wifi_p2p/p2p_group_formation_state.h      |   0
 .../wifi_p2p/p2p_group_join_state.cpp         |   0
 .../wifi_p2p/p2p_group_join_state.h           |   0
 .../wifi_p2p/p2p_group_operating_state.cpp    |   0
 .../wifi_p2p/p2p_group_operating_state.h      |   0
 .../wifi_manage/wifi_p2p/p2p_idle_state.cpp   |   0
 .../wifi_manage/wifi_p2p/p2p_idle_state.h     |   0
 .../wifi_manage/wifi_p2p/p2p_interface.cpp    |   0
 .../wifi_manage/wifi_p2p/p2p_interface.h      |   0
 .../wifi_p2p/p2p_inviting_state.cpp           |   0
 .../wifi_manage/wifi_p2p/p2p_inviting_state.h |   0
 .../wifi_manage/wifi_p2p/p2p_macro.h          |   0
 .../wifi_manage/wifi_p2p/p2p_monitor.cpp      |   0
 .../wifi_manage/wifi_p2p/p2p_monitor.h        |   0
 .../wifi_p2p/p2p_state_machine.cpp            |   0
 .../wifi_manage/wifi_p2p/p2p_state_machine.h  |   0
 .../wifi_p2p/provision_discovery_state.cpp    |   0
 .../wifi_p2p/provision_discovery_state.h      |   0
 .../wifi_p2p/wifi_p2p_device_manager.cpp      |   0
 .../wifi_p2p/wifi_p2p_device_manager.h        |   0
 .../wifi_p2p/wifi_p2p_dns_sd_service_info.cpp |   0
 .../wifi_p2p/wifi_p2p_dns_sd_service_info.h   |   0
 .../wifi_p2p_dns_sd_service_request.cpp       |   0
 .../wifi_p2p_dns_sd_service_request.h         |   0
 .../wifi_p2p_dns_sd_service_response.cpp      |   0
 .../wifi_p2p_dns_sd_service_response.h        |   0
 .../wifi_p2p/wifi_p2p_dns_txt_record.cpp      |   0
 .../wifi_p2p/wifi_p2p_dns_txt_record.h        |   0
 .../wifi_p2p/wifi_p2p_group_info_proxy.cpp    |   0
 .../wifi_p2p/wifi_p2p_group_info_proxy.h      |   0
 .../wifi_p2p/wifi_p2p_group_manager.cpp       |   0
 .../wifi_p2p/wifi_p2p_group_manager.h         |   0
 .../wifi_manage/wifi_p2p/wifi_p2p_service.cpp |   0
 .../wifi_manage/wifi_p2p/wifi_p2p_service.h   |   0
 .../wifi_p2p/wifi_p2p_service_manager.cpp     |   0
 .../wifi_p2p/wifi_p2p_service_manager.h       |   0
 .../wifi_p2p_service_request_list.cpp         |   0
 .../wifi_p2p/wifi_p2p_service_request_list.h  |   0
 .../wifi_p2p_service_response_list.cpp        |   0
 .../wifi_p2p/wifi_p2p_service_response_list.h |   0
 .../wifi_p2p/wifi_p2p_temp_disc_event.cpp     |   0
 .../wifi_p2p/wifi_p2p_temp_disc_event.h       |   0
 .../wifi_p2p/wifi_p2p_upnp_service_info.cpp   |   0
 .../wifi_p2p/wifi_p2p_upnp_service_info.h     |   0
 .../wifi_p2p_upnp_service_request.cpp         |   0
 .../wifi_p2p/wifi_p2p_upnp_service_request.h  |   0
 .../wifi_p2p_upnp_service_response.cpp        |   0
 .../wifi_p2p/wifi_p2p_upnp_service_response.h |   0
 .../wifi_manage/wifi_p2p_callback_proxy.cpp   |   0
 .../wifi_manage/wifi_p2p_callback_proxy.h     |   0
 .../wifi_manage/wifi_p2p_death_recipient.cpp  |   0
 .../wifi_manage/wifi_p2p_death_recipient.h    |   0
 .../wifi_manage/wifi_p2p_service_impl.cpp     |   0
 .../wifi_manage/wifi_p2p_service_impl.h       |   0
 .../wifi_manage/wifi_p2p_stub.cpp             |   0
 .../wifi_manage/wifi_p2p_stub.h               |   0
 .../wifi_manage/wifi_protect.cpp              |   0
 .../wifi_framework/wifi_manage/wifi_protect.h |   0
 .../wifi_manage/wifi_protect_manager.cpp      |   0
 .../wifi_manage/wifi_protect_manager.h        |   0
 .../wifi_manage/wifi_scan/BUILD.gn            |  77 ++++++++
 .../wifi_manage/wifi_scan/iscan_service.h     |   0
 .../wifi_scan/iscan_service_callbacks.h       |   0
 .../wifi_manage/wifi_scan/scan_common.h       |   0
 .../wifi_manage/wifi_scan/scan_interface.cpp  |   0
 .../wifi_manage/wifi_scan/scan_interface.h    |   0
 .../wifi_manage/wifi_scan/scan_monitor.cpp    |   0
 .../wifi_manage/wifi_scan/scan_monitor.h      |   0
 .../wifi_manage/wifi_scan/scan_service.cpp    |   0
 .../wifi_manage/wifi_scan/scan_service.h      |   0
 .../wifi_scan/scan_state_machine.cpp          |   0
 .../wifi_scan/scan_state_machine.h            |   0
 .../wifi_manage/wifi_scan_callback_proxy.cpp  |   0
 .../wifi_manage/wifi_scan_callback_proxy.h    |   0
 .../wifi_manage/wifi_scan_death_recipient.cpp |   0
 .../wifi_manage/wifi_scan_death_recipient.h   |   0
 .../wifi_manage/wifi_scan_service_impl.cpp    |   0
 .../wifi_manage/wifi_scan_service_impl.h      |   0
 .../wifi_manage/wifi_scan_stub.cpp            |   0
 .../wifi_manage/wifi_scan_stub.h              |   0
 .../wifi_manage/wifi_service_manager.cpp      |   0
 .../wifi_manage/wifi_service_manager.h        |   0
 .../wifi_manage/wifi_sta/BUILD.gn             |  94 ++++++++++
 .../wifi_manage/wifi_sta/ista_service.h       |   0
 .../wifi_sta/sta_auto_connect_service.cpp     |   0
 .../wifi_sta/sta_auto_connect_service.h       |   0
 .../wifi_manage/wifi_sta/sta_define.h         |   0
 .../wifi_sta/sta_device_appraisal.h           |   0
 .../wifi_manage/wifi_sta/sta_interface.cpp    |   0
 .../wifi_manage/wifi_sta/sta_interface.h      |   0
 .../wifi_manage/wifi_sta/sta_monitor.cpp      |   0
 .../wifi_manage/wifi_sta/sta_monitor.h        |   0
 .../wifi_sta/sta_network_check.cpp            |   0
 .../wifi_manage/wifi_sta/sta_network_check.h  |   0
 .../wifi_sta/sta_saved_device_appraisal.cpp   |   0
 .../wifi_sta/sta_saved_device_appraisal.h     |   0
 .../wifi_manage/wifi_sta/sta_service.cpp      |   0
 .../wifi_manage/wifi_sta/sta_service.h        |   0
 .../wifi_sta/sta_service_callback.h           |   0
 .../wifi_sta/sta_state_machine.cpp            |   0
 .../wifi_manage/wifi_sta/sta_state_machine.h  |   0
 .../services}/wifi_standard/wifi_hal/BUILD.gn |  28 +--
 .../wifi_hal/common/wifi_hal_common_func.c    |   0
 .../wifi_hal/common/wifi_hal_common_func.h    |   0
 .../wifi_standard/wifi_hal/common/wifi_log.h  |   0
 .../wifi_standard/wifi_hal/etc/init/BUILD.gn  |   8 +-
 .../etc/init/default_conf/hostapd.conf        |   0
 .../wifi_hal/etc/init/hostapd.conf            |   0
 .../wifi_hal/etc/init/p2p_supplicant.conf     |   0
 .../wifi_hal/etc/init/wifi_hal_service.cfg    |   0
 .../wifi_hal/etc/init/wpa_supplicant.conf     |   0
 .../services}/wifi_standard/wifi_hal/main.c   |   0
 .../wifi_standard/wifi_hal/wifi_hal_adapter.c |   0
 .../wifi_standard/wifi_hal/wifi_hal_adapter.h |   0
 .../wifi_hal/wifi_hal_ap_interface.c          |   0
 .../wifi_hal/wifi_hal_ap_interface.h          |   0
 .../wifi_hal/wifi_hal_base_interface.c        |   0
 .../wifi_hal/wifi_hal_base_interface.h        |   0
 .../wifi_hal/wifi_hal_callback.c              |   0
 .../wifi_hal/wifi_hal_callback.h              |   0
 .../wifi_hal/wifi_hal_chip_interface.c        |   0
 .../wifi_hal/wifi_hal_chip_interface.h        |   0
 .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.c |   0
 .../wifi_standard/wifi_hal/wifi_hal_crpc_ap.h |   0
 .../wifi_hal/wifi_hal_crpc_base.c             |   0
 .../wifi_hal/wifi_hal_crpc_base.h             |   0
 .../wifi_hal/wifi_hal_crpc_chip.c             |   0
 .../wifi_hal/wifi_hal_crpc_chip.h             |   0
 .../wifi_hal/wifi_hal_crpc_common.c           |   0
 .../wifi_hal/wifi_hal_crpc_common.h           |   0
 .../wifi_hal/wifi_hal_crpc_p2p.c              |   0
 .../wifi_hal/wifi_hal_crpc_p2p.h              |   0
 .../wifi_hal/wifi_hal_crpc_server.c           |   0
 .../wifi_hal/wifi_hal_crpc_server.h           |   0
 .../wifi_hal/wifi_hal_crpc_sta.c              |   0
 .../wifi_hal/wifi_hal_crpc_sta.h              |   0
 .../wifi_hal/wifi_hal_crpc_supplicant.c       |   0
 .../wifi_hal/wifi_hal_crpc_supplicant.h       |   0
 .../wifi_standard/wifi_hal/wifi_hal_define.h  |   0
 .../hostapd_hal/wifi_hostapd_hal.c            |   2 +-
 .../hostapd_hal/wifi_hostapd_hal.h            |   0
 .../wpa_supplicant_hal/wifi_wpa_common.c      |   0
 .../wpa_supplicant_hal/wifi_wpa_common.h      |   0
 .../wpa_supplicant_hal/wifi_wpa_hal.c         |   0
 .../wpa_supplicant_hal/wifi_wpa_hal.h         |   0
 .../wpa_p2p_hal/wifi_p2p_hal.c                |   0
 .../wpa_p2p_hal/wifi_p2p_hal.h                |   0
 .../wpa_sta_hal/wifi_supplicant_hal.c         |   0
 .../wpa_sta_hal/wifi_supplicant_hal.h         |   0
 .../wifi_hal/wifi_hal_module_manage.c         |   0
 .../wifi_hal/wifi_hal_module_manage.h         |   0
 .../wifi_hal/wifi_hal_p2p_interface.c         |   0
 .../wifi_hal/wifi_hal_p2p_interface.h         |   0
 .../wifi_hal/wifi_hal_p2p_struct.h            |   0
 .../wifi_hal/wifi_hal_sta_interface.c         |   0
 .../wifi_hal/wifi_hal_sta_interface.h         |   0
 .../wifi_standard/wifi_hal/wifi_hal_struct.h  |   0
 .../wifi_hal/wifi_hal_vendor_interface.c      |   0
 .../wifi_hal/wifi_hal_vendor_interface.h      |   0
 .../ipc_framework/cRPC/unittest/BUILD.gn      |  18 +-
 .../cRPC/unittest/context_test.cpp            |   0
 .../cRPC/unittest/context_test.h              |   0
 .../cRPC/unittest/hash_table_test.cpp         |   0
 .../cRPC/unittest/hash_table_test.h           |   0
 .../ipc_framework/cRPC/unittest/net_test.cpp  |   0
 .../ipc_framework/cRPC/unittest/net_test.h    |   0
 .../cRPC/unittest/rpc_test_main.cpp           |   0
 .../cRPC/unittest/serial_test.cpp             |   0
 .../ipc_framework/cRPC/unittest/serial_test.h |   0
 .../wifi_framework/common/unittest/BUILD.gn   |  40 ++--
 .../common/unittest/common_test.cpp           |   0
 .../common/unittest/wifi_config_file_test.cpp |   0
 .../common/unittest/wifi_config_file_test.h   |   0
 .../common/unittest/wifi_global_func_test.cpp |   0
 .../common/unittest/wifi_global_func_test.h   |   0
 .../common/unittest/wifi_ip_tools_test.cpp    |   0
 .../common/unittest/wifi_ip_tools_test.h      |   0
 .../common/unittest/wifi_log_helper_test.cpp  |   0
 .../common/unittest/wifi_log_helper_test.h    |   0
 .../unittest/wifi_network_interface_test.cpp  |   0
 .../unittest/wifi_network_interface_test.h    |   0
 .../wifi_manage/idl_client/unittest/BUILD.gn  | 106 +++++------
 .../unittest/idl_client_test_main.cpp         |   0
 .../unittest/mock_wifi_hal_service.c          |   0
 .../unittest/wifi_ap_hal_interface_test.cpp   |   0
 .../unittest/wifi_ap_hal_interface_test.h     |   0
 .../unittest/wifi_base_hal_interface_test.cpp |   0
 .../unittest/wifi_base_hal_interface_test.h   |   0
 .../unittest/wifi_chip_hal_interface_test.cpp |   0
 .../unittest/wifi_chip_hal_interface_test.h   |   0
 .../unittest/wifi_idl_client_test.cpp         |   0
 .../unittest/wifi_idl_client_test.h           |   0
 .../unittest/wifi_idl_interface_test.cpp      |   0
 .../unittest/wifi_idl_interface_test.h        |   0
 .../unittest/wifi_p2p_hal_interface_test.cpp  |   0
 .../unittest/wifi_p2p_hal_interface_test.h    |   0
 .../unittest/wifi_sta_hal_interface_test.cpp  |   0
 .../unittest/wifi_sta_hal_interface_test.h    |   0
 .../wifi_supplicant_hal_interface_test.cpp    |   0
 .../wifi_supplicant_hal_interface_test.h      |   0
 .../wifi_manage/unittest/BUILD.gn             |  70 +++----
 .../unittest/wifi_auth_center_test.cpp        |   0
 .../unittest/wifi_auth_center_test.h          |   0
 .../unittest/wifi_config_center_test.cpp      |   0
 .../unittest/wifi_config_center_test.h        |   0
 .../wifi_internal_event_dispatcher_test.cpp   |   0
 .../wifi_internal_event_dispatcher_test.h     |   0
 .../wifi_manage/unittest/wifi_manage_test.cpp |   0
 .../unittest/wifi_manager_service_test.cpp    |   0
 .../unittest/wifi_manager_service_test.h      |   0
 .../unittest/wifi_mock_p2p_service.cpp        |   0
 .../unittest/wifi_mock_p2p_service.h          |   0
 .../unittest/wifi_service_manager_test.cpp    |   0
 .../unittest/wifi_service_manager_test.h      |   0
 .../wifi_manage/wifi_ap/BUILD.gn              | 113 +++++++++++
 .../wifi_ap/Mock/mock_ap_config_use.h         |   4 +-
 .../wifi_ap/Mock/mock_ap_idle_state.h         |   0
 .../wifi_ap/Mock/mock_ap_monitor.h            |   0
 .../wifi_ap/Mock/mock_ap_root_state.h         |   0
 .../wifi_ap/Mock/mock_ap_service.h            |   0
 .../wifi_ap/Mock/mock_ap_started_state.h      |   0
 .../wifi_ap/Mock/mock_ap_state_machine.h      |   0
 .../wifi_ap/Mock/mock_ap_stations_manager.h   |   0
 .../wifi_ap/Mock/mock_network_interface.cpp   |   0
 .../wifi_ap/Mock/mock_network_interface.h     |   0
 .../wifi_manage/wifi_ap/Mock/mock_pendant.h   |   0
 .../wifi_ap/Mock/mock_system_interface.cpp    |   0
 .../wifi_ap/Mock/mock_system_interface.h      |   0
 .../Mock/mock_wifi_ap_hal_interface.cpp       |   0
 .../wifi_ap/Mock/mock_wifi_ap_hal_interface.h |   0
 .../wifi_ap/Mock/mock_wifi_ap_nat_manager.h   |   0
 .../wifi_ap/Mock/mock_wifi_settings.cpp       |   0
 .../wifi_ap/Mock/mock_wifi_settings.h         |   6 +-
 .../wifi_ap/Mock/operator_overload.cpp        |   0
 .../wifi_ap/Mock/operator_overload.h          |   0
 .../wifi_ap/ap_config_use_test.cpp            |   0
 .../wifi_ap/ap_idle_state_test.cpp            |   0
 .../wifi_manage/wifi_ap/ap_monitor_test.cpp   |   0
 .../wifi_ap/ap_root_state_test.cpp            |   0
 .../wifi_manage/wifi_ap/ap_service_test.cpp   |   0
 .../wifi_ap/ap_started_state_test.cpp         |   2 +-
 .../wifi_ap/ap_state_machine_test.cpp         |   0
 .../wifi_ap/ap_stations_manager_test.cpp      |   0
 .../wifi_manage/wifi_ap/global_test.cpp       |   0
 .../wifi_manage/wifi_ap/global_test.h         |   0
 .../wifi_ap/wifi_ap_nat_manager_test.cpp      |   0
 .../wifi_ap/wifi_ap_service_test.cpp          |   0
 .../wifi_manage/wifi_ap/wifi_ap_test.cpp      |   0
 .../wifi_manage/wifi_p2p/test/BUILD.gn        | 163 ++++++++++++++++
 ...ck_authorizing_negotiation_request_state.h |   0
 .../test/Mock/mock_group_formed_state.h       |   0
 .../test/Mock/mock_group_negotiation_state.h  |   0
 .../Mock/mock_invitation_recelved_state.h     |   0
 .../test/Mock/mock_invitation_request_state.h |   0
 .../test/Mock/mock_p2p_default_state.h        |   0
 .../test/Mock/mock_p2p_disabled_state.h       |   0
 .../test/Mock/mock_p2p_disabling_state.h      |   0
 .../test/Mock/mock_p2p_enabled_state.h        |   0
 .../test/Mock/mock_p2p_enabling_state.h       |   0
 .../Mock/mock_p2p_group_formation_state.h     |   0
 .../test/Mock/mock_p2p_group_join_state.h     |   0
 .../Mock/mock_p2p_group_operating_state.h     |   0
 .../wifi_p2p/test/Mock/mock_p2p_idle_state.h  |   0
 .../test/Mock/mock_p2p_inviting_state.h       |   0
 .../wifi_p2p/test/Mock/mock_p2p_monitor.h     |   0
 .../test/Mock/mock_p2p_state_machine.h        |   0
 .../Mock/mock_provision_discovery_state.h     |   0
 .../Mock/mock_wifi_p2p_device_manager.cpp     |   0
 .../test/Mock/mock_wifi_p2p_device_manager.h  |   0
 .../test/Mock/mock_wifi_p2p_hal_interface.cpp |   0
 .../test/Mock/mock_wifi_p2p_hal_interface.h   |   0
 .../wifi_p2p/test/Mock/mock_wifi_settings.cpp |   0
 .../wifi_p2p/test/Mock/mock_wifi_settings.h   |   0
 ...orizing_negotiation_request_state_test.cpp |   0
 .../wifi_manage/wifi_p2p/test/global_test.cpp |   0
 .../wifi_manage/wifi_p2p/test/global_test.h   |   0
 .../wifi_p2p/test/group_formed_state_test.cpp |   0
 .../test/group_negotiation_state_test.cpp     |   0
 .../test/invitation_recelved_state_test.cpp   |   0
 .../test/invitation_request_state_test.cpp    |   0
 .../wifi_p2p/test/mock_p2p_pendant.h          |   0
 .../wifi_p2p/test/p2p_default_state_test.cpp  |   0
 .../wifi_p2p/test/p2p_disabled_state_test.cpp |   0
 .../test/p2p_disabling_state_test.cpp         |   0
 .../wifi_p2p/test/p2p_enabled_state_test.cpp  |   0
 .../wifi_p2p/test/p2p_enabling_state_test.cpp |   0
 .../test/p2p_group_formation_state_test.cpp   |   0
 .../test/p2p_group_join_state_test.cpp        |   0
 .../test/p2p_group_operating_state_test.cpp   |   0
 .../wifi_p2p/test/p2p_idle_state_test.cpp     |   0
 .../wifi_p2p/test/p2p_inviting_state_test.cpp |   0
 .../wifi_p2p/test/p2p_monitor_test.cpp        |   0
 .../wifi_p2p/test/p2p_state_machine_test.cpp  |   0
 .../test/provision_discovery_state_test.cpp   |   0
 .../test/wifi_p2p_device_manager_test.cpp     |   0
 .../wifi_p2p_dns_sd_service_info_test.cpp     |   0
 .../wifi_p2p_dns_sd_service_request_test.cpp  |   0
 .../wifi_p2p_dns_sd_service_response_test.cpp |   0
 .../test/wifi_p2p_group_info_proxy_test.cpp   |   0
 .../test/wifi_p2p_group_manager_test.cpp      |   0
 .../test/wifi_p2p_service_manager_test.cpp    |   0
 .../wifi_p2p_service_request_list_test.cpp    |   0
 .../wifi_p2p_service_response_list_test.cpp   |   0
 .../wifi_p2p/test/wifi_p2p_service_test.cpp   |   0
 .../wifi_p2p/test/wifi_p2p_test_entry.cpp     |   0
 .../test/wifi_p2p_upnp_service_info_test.cpp  |   0
 .../wifi_p2p_upnp_service_request_test.cpp    |   0
 .../wifi_p2p_upnp_service_response_test.cpp   |   0
 .../wifi_manage/wifi_scan/BUILD.gn            | 101 ++++++++++
 .../wifi_scan/Mock/mock_scan_service.cpp      |   0
 .../wifi_scan/Mock/mock_scan_service.h        |   0
 .../Mock/mock_scan_state_machine.cpp          |   0
 .../wifi_scan/Mock/mock_scan_state_machine.h  |   0
 .../wifi_scan/Mock/mock_wifi_manager.cpp      |   0
 .../wifi_scan/Mock/mock_wifi_manager.h        |   0
 .../wifi_scan/Mock/mock_wifi_settings.cpp     |   0
 .../wifi_scan/Mock/mock_wifi_settings.h       |   0
 .../Mock/mock_wifi_sta_hal_interface.cpp      |   0
 .../Mock/mock_wifi_sta_hal_interface.h        |   0
 .../mock_wifi_supplicant_hal_interface.cpp    |   0
 .../Mock/mock_wifi_supplicant_hal_interface.h |   0
 .../wifi_manage/wifi_scan/global_test.cpp     |   0
 .../wifi_manage/wifi_scan/global_test.h       |   0
 .../wifi_scan/scan_interface_test.cpp         |   0
 .../wifi_scan/scan_monitor_test.cpp           |   0
 .../wifi_scan/scan_service_test.cpp           |   0
 .../wifi_scan/scan_state_machine_test.cpp     |   0
 .../wifi_manage/wifi_scan/wifi_scan_test.cpp  |   0
 .../wifi_manage/wifi_sta/BUILD.gn             | 128 +++++++++++++
 .../wifi_sta/Mock/mock_device_appraisal.h     |   0
 .../wifi_sta/Mock/mock_dhcp_service.cpp       |   0
 .../wifi_sta/Mock/mock_dhcp_service.h         |   0
 .../wifi_sta/Mock/mock_if_config.cpp          |   0
 .../wifi_sta/Mock/mock_if_config.h            |   0
 .../wifi_sta/Mock/mock_mac_address.cpp        |   0
 .../wifi_sta/Mock/mock_mac_address.h          |   0
 .../Mock/mock_sta_auto_connect_service.cpp    |   0
 .../Mock/mock_sta_auto_connect_service.h      |   0
 .../wifi_sta/Mock/mock_sta_monitor.h          |   0
 .../wifi_sta/Mock/mock_sta_network_check.cpp  |   0
 .../wifi_sta/Mock/mock_sta_network_check.h    |   0
 .../wifi_sta/Mock/mock_sta_service.h          |   0
 .../wifi_sta/Mock/mock_sta_state_machine.cpp  |   0
 .../wifi_sta/Mock/mock_sta_state_machine.h    |   0
 .../Mock/mock_wifi_chip_hal_interface.cpp     |   0
 .../Mock/mock_wifi_chip_hal_interface.h       |   0
 .../wifi_sta/Mock/mock_wifi_manager.cpp       |   0
 .../wifi_sta/Mock/mock_wifi_manager.h         |   0
 .../wifi_sta/Mock/mock_wifi_settings.cpp      |   0
 .../wifi_sta/Mock/mock_wifi_settings.h        |   2 +-
 .../Mock/mock_wifi_sta_hal_interface.cpp      |   0
 .../Mock/mock_wifi_sta_hal_interface.h        |   0
 .../mock_wifi_supplicant_hal_interface.cpp    |   0
 .../Mock/mock_wifi_supplicant_hal_interface.h |   0
 .../wifi_manage/wifi_sta/global_test.cpp      |   0
 .../wifi_manage/wifi_sta/global_test.h        |   0
 .../sta_auto_connect_service_test.cpp         |   0
 .../wifi_sta/sta_interface_test.cpp           |   0
 .../wifi_manage/wifi_sta/sta_monitor_test.cpp |   0
 .../wifi_sta/sta_network_check_test.cpp       |   0
 .../sta_saved_device_appraisal_test.cpp       |   0
 .../wifi_manage/wifi_sta/sta_service_test.cpp |   0
 .../wifi_sta/sta_state_machine_test.cpp       |   0
 .../wifi_manage/wifi_sta/wifi_sta_test.cpp    |   0
 .../wifi_standard/wifi_hal/unittest/BUILD.gn  |  77 ++++----
 .../wifi_hal/unittest/mock_wpa_ctrl.cpp       |   0
 .../wifi_hal/unittest/mock_wpa_ctrl.h         |   0
 .../wifi_hal/unittest/wifi_hal_adapter_test.h |   0
 .../unittest/wifi_hal_ap_interface_test.cpp   |   0
 .../unittest/wifi_hal_ap_interface_test.h     |   0
 .../unittest/wifi_hal_base_interface_test.cpp |   0
 .../unittest/wifi_hal_base_interface_test.h   |   0
 .../unittest/wifi_hal_chip_interface_test.cpp |   0
 .../unittest/wifi_hal_chip_interface_test.h   |   0
 .../wifi_hal_crpc_server_add_test.cpp         |   0
 .../unittest/wifi_hal_crpc_server_add_test.h  |   0
 .../unittest/wifi_hal_crpc_server_test.cpp    |   0
 .../unittest/wifi_hal_crpc_server_test.h      |   0
 .../unittest/wifi_hal_hostapd_test.cpp        |   0
 .../wifi_hal/unittest/wifi_hal_hostapd_test.h |   0
 .../unittest/wifi_hal_p2p_interface_test.cpp  |   0
 .../unittest/wifi_hal_p2p_interface_test.h    |   0
 .../unittest/wifi_hal_sta_interface_test.cpp  |   0
 .../unittest/wifi_hal_sta_interface_test.h    |   0
 .../wifi_hal/unittest/wifi_hal_test.cpp       |   0
 .../wifi_hal/unittest/wifi_hal_vendor.conf    |   0
 .../unittest/wifi_hal_vendor_interface_test.c |   0
 .../unittest/wifi_hal_wpa_p2p_test.cpp        |   0
 .../wifi_hal/unittest/wifi_hal_wpa_p2p_test.h |   0
 .../unittest/wifi_hal_wpa_sta_test.cpp        |   0
 .../wifi_hal/unittest/wifi_hal_wpa_sta_test.h |   0
 {utils => wifi/utils}/inc/wifi_common_util.h  |   0
 {utils => wifi/utils}/inc/wifi_hisysevent.h   |   0
 {utils => wifi/utils}/src/BUILD.gn            |   7 +-
 .../utils}/src/wifi_common_util.cpp           |   0
 {utils => wifi/utils}/src/wifi_hisysevent.cpp |   0
 wifi.gni => wifi/wifi.gni                     |   8 +-
 836 files changed, 1779 insertions(+), 1416 deletions(-)
 delete mode 100644 bundle.json
 rename LICENSE => dhcp/LICENSE (100%)
 create mode 100644 dhcp/bundle.json
 create mode 100644 dhcp/dhcp.gni
 rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/include/dhcp_define.h (100%)
 create mode 100644 dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h
 rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_client_service.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_result_notify.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_server_service.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage/mgr_service => dhcp/interfaces/innerkits/native_cpp}/interfaces/i_dhcp_service.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/BUILD.gn (56%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_api.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_client.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_define.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_function.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_ipv4.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_options.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/include/dhcp_socket.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_api.cpp (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_client.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_function.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_ipv4.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_main.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_options.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_client/src/dhcp_socket.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/BUILD.gn (87%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/etc/dhcpd.conf.sample (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/etc/dhcpd_mini.conf (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/address_utils.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/common_util.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_address_pool.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_argument.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_binding.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_config.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_define.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_ipv4.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_logger.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_message.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_option.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/dhcp_server.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/include/hash_table.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/address_utils.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/common_util.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_address_pool.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_argument.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_binding.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_config.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_dhcpd.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_option.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/dhcp_server.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/dhcp_server/src/hash_table.c (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/BUILD.gn (58%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_client_service_impl.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_event_subscriber.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_func.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_server_service.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/include/dhcp_service.h (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_client_service_impl.cpp (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_event_subscriber.cpp (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_func.cpp (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_server_service.cpp (100%)
 rename {services/wifi_standard/wifi_framework/dhcp_manage => dhcp/services}/mgr_service/src/dhcp_service.cpp (99%)
 create mode 100644 dhcp/services/mgr_service/src/dhcp_service_api.cpp
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/BUILD.gn (67%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_client_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_function_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_ipv4_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_main_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_options_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/dhcp_socket_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/global_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/global_test.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_custom_func.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_custom_func.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_system_func.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_client/mock_system_func.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/BUILD.gn (60%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/address_utils_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/common_util_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_address_pool_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_argument_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_binding_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_config_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_message_sim.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_message_sim.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_option_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/dhcp_server_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/hash_table_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/system_func_mock.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/dhcp_server/unittest/system_func_mock.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/BUILD.gn (67%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_client_service_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_func_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_manage_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_result_notify.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_result_notify.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_server_service_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/dhcp_service_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/global_test.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/global_test.h (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/mock_system_func.cpp (100%)
 rename {tests/wifi_standard/wifi_framework/dhcp_manage => dhcp/tests/services}/mgr_service/mock_system_func.h (100%)
 delete mode 100644 services/wifi_standard/wifi_framework/BUILD.gn
 delete mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
 delete mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
 delete mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
 delete mode 100644 services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
 delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
 delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
 delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
 delete mode 100644 tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
 rename .gitattributes => wifi/.gitattributes (100%)
 create mode 100644 wifi/LICENSE
 rename README.md => wifi/README.md (100%)
 rename README_zh.md => wifi/README_zh.md (100%)
 rename {application => wifi/application}/wifi_direct_demo/README.md (100%)
 rename {application => wifi/application}/wifi_direct_demo/build.gradle (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/.gitignore (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/build.gradle (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/proguard-rules.pro (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/config.json (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/resources/base/element/string.json (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif (100%)
 rename {application => wifi/application}/wifi_direct_demo/entry/src/main/resources/base/media/icon.png (100%)
 rename {application => wifi/application}/wifi_direct_demo/figures/img.png (100%)
 rename {application => wifi/application}/wifi_direct_demo/gradle.properties (100%)
 rename {application => wifi/application}/wifi_direct_demo/gradlew (100%)
 rename {application => wifi/application}/wifi_direct_demo/gradlew.bat (100%)
 rename {application => wifi/application}/wifi_direct_demo/package.json (100%)
 rename {application => wifi/application}/wifi_direct_demo/settings.gradle (100%)
 create mode 100644 wifi/bundle.json
 rename {figures => wifi/figures}/en-us_image_0000001115710400.png (100%)
 rename {figures => wifi/figures}/zh-cn_image_0000001115710400.png (100%)
 rename hisysevent.yaml => wifi/hisysevent.yaml (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/station_info.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_device.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_device_config.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_error_code.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_event.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_hid2d.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_hotspot.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_hotspot_config.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_linked_info.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_p2p.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_p2p_config.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_c/wifi_scan_info.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/BUILD.gn (67%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_device.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_device.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_entry.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_event.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_event.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_hotspot.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_p2p.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_p2p.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_utils.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/napi/wifi_napi_utils.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/BUILD.gn (79%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_device.h (99%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/include/wifi_scan.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/define.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_logger.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp (100%)
 rename {interfaces => wifi/interfaces}/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h (100%)
 rename {interfaces => wifi/interfaces}/kits/jskits/@ohos.wifi.d.ts (100%)
 rename {interfaces => wifi/interfaces}/kits/jskits/@ohos.wifiext.d.ts (100%)
 rename {services => wifi/services}/wifi_standard/etc/init/BUILD.gn (96%)
 rename {services => wifi/services}/wifi_standard/etc/init/wifi_standard.cfg (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/BUILD.gn (88%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/client.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/common.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/context.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/evloop.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/hash_table.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/log.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/net.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/serial.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/include/server.h (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/client.c (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/context.c (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/evloop.c (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/hash_table.c (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/net.c (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/serial.c (100%)
 rename {services => wifi/services}/wifi_standard/ipc_framework/cRPC/src/server.c (100%)
 rename {services => wifi/services}/wifi_standard/sa_profile/1120.xml (100%)
 rename {services => wifi/services}/wifi_standard/sa_profile/1121.xml (100%)
 rename {services => wifi/services}/wifi_standard/sa_profile/1123.xml (100%)
 rename {services => wifi/services}/wifi_standard/sa_profile/1124.xml (100%)
 rename {services => wifi/services}/wifi_standard/sa_profile/BUILD.gn (90%)
 create mode 100644 wifi/services/wifi_standard/wifi_framework/BUILD.gn
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_settings.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/config/wifi_settings.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/include/permission_def.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/log_helper.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/log_helper.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/wifi_log.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/wifi_log_tags.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/log/wifi_logger.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/base_address.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/base_address.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/http_request.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/http_request.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/if_config.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/if_config.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ip_tools.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/mac_address.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/net_helper/network_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/common/utils/wifi_global_func.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/BUILD.gn (58%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/handler.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn (50%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h (100%)
 create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h (98%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp (99%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp (99%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp (99%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h (100%)
 create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h (100%)
 create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h (100%)
 create mode 100644 wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp (100%)
 rename {services => wifi/services}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/BUILD.gn (66%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/common/wifi_hal_common_func.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/common/wifi_hal_common_func.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/common/wifi_log.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/BUILD.gn (92%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/hostapd.conf (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/main.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_adapter.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_adapter.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_ap_interface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_ap_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_base_interface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_base_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_callback.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_callback.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_chip_interface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_chip_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_base.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_base.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_common.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_common.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_server.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_server.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_define.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c (99%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module_manage.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_module_manage.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_sta_interface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_sta_interface.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_struct.h (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c (100%)
 rename {services => wifi/services}/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn (74%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/context_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/net_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/BUILD.gn (59%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/common_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn (51%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn (61%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h (100%)
 create mode 100644 wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h (96%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h (91%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp (99%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp (100%)
 create mode 100644 wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp (100%)
 create mode 100644 wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp (100%)
 create mode 100644 wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h (99%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/BUILD.gn (56%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp (100%)
 rename {tests => wifi/tests}/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h (100%)
 rename {utils => wifi/utils}/inc/wifi_common_util.h (100%)
 rename {utils => wifi/utils}/inc/wifi_hisysevent.h (100%)
 rename {utils => wifi/utils}/src/BUILD.gn (90%)
 rename {utils => wifi/utils}/src/wifi_common_util.cpp (100%)
 rename {utils => wifi/utils}/src/wifi_hisysevent.cpp (100%)
 rename wifi.gni => wifi/wifi.gni (75%)

diff --git a/OAT.xml b/OAT.xml
index 7d561c541..7c2e5c790 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -21,8 +21,8 @@
     <oatconfig>
         <licensefile></licensefile>
         <policylist>
-			<policy name="projectPolicy" desc="">
-                <policyitem type="copyright" name="Copyright (c) 2022 Shenzhen Kaihong Digital" path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc=""/>
+            <policy name="projectPolicy" desc="">
+                <policyitem type="copyright" name="Shenzhen Kaihong Digital" path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc=""/>
             </policy>
         </policylist>
         <filefilterlist>
@@ -45,7 +45,6 @@
             <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
                 <filteritem type="filename" name="*.png" desc="Image for markdown doc"/>
             </filefilter>
-
         </filefilterlist>
         <licensematcherlist>
         </licensematcherlist>
diff --git a/bundle.json b/bundle.json
deleted file mode 100644
index fbbecf7be..000000000
--- a/bundle.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-    "name": "@ohos/communication_wifi",
-    "version": "3.1.0",
-    "description": "The WLAN module provides basic WLAN functions, peer-to-peer (P2P) connection, and WLAN notification, enabling your application to communicate with other devices through a WLAN.",
-    "homePage": "https://gitee.com/openharmony",
-    "license": "Apache License 2.0",
-    "repository": "https://gitee.com/openharmony/communication_wifi",
-    "domain": "os",
-    "language": "",
-    "publishAs": "code-segment",
-    "private": false,
-    "scripts": {},
-    "tags": [
-        "foundation"
-    ],
-    "keywords": [
-        "communication",
-        "wifi"
-    ],
-    "envs": [],
-    "dirs": [],
-    "author": {
-        "name": "",
-        "email": "",
-        "url": ""
-    },
-    "contributors": [
-        {
-            "name": "",
-            "email": "",
-            "url": ""
-        }
-    ],
-    "segment": {
-        "destPath": "foundation/communication/wifi"
-    },
-    "component": {
-        "name": "wifi_standard",
-        "subsystem": "communication",
-        "syscap": [
-            "SystemCapability.Communication.WiFi.STA",
-            "SystemCapability.Communication.WiFi.AP",
-            "SystemCapability.Communication.WiFi.P2P",
-            "SystemCapability.Communication.WiFi.Core",
-            "SystemCapability.Communication.WiFi.HotspotExt"
-        ],
-        "features": [
-            "wifi_standard_feature_with_p2p",
-            "wifi_standard_feature_with_ap_intf"
-        ],
-        "adapted_system_type": [
-            "standard"
-        ],
-        "rom": "",
-        "ram": "",
-        "deps": {
-            "components": [
-                "ipc",
-                "ces_standard",
-                "hiviewdfx_hilog_native",
-                "hisysevent_native",
-                "netmanager_base"
-            ],
-            "third_party": [
-                "wpa_supplicant",
-                "node",
-                "bounds_checking_function",
-                "googletest",
-                "openssl"
-            ]
-        },
-        "build": {
-            "sub_component": [
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework:wifi_manage",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework:dhcp_manage",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_hal:wifi_hal",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework:wifi_system_ability",
-                "//foundation/communication/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:dhcp_client_service",
-                "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server:dhcp_server",
-                "//foundation/communication/wifi/utils/src:wifi_utils",
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js",
-                "//foundation/communication/wifi/interfaces/innerkits/native_cpp/napi:wifi"
-            ],
-            "inner_kits": [
-                {
-                    "header" : {
-                        "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_c",
-                        "header_files": [
-                            "wifi_device.h",
-                            "wifi_hotspot.h",
-                            "wifi_p2p.h",
-                            "wifi_hid2d.h"
-                        ]
-                    },
-                    "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
-                },
-                {
-                    "header" : {
-                        "header_base": "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-                        "header_files": [
-                            "wifi_device.h",
-                            "wifi_hotspot.h",
-                            "wifi_p2p.h",
-                            "wifi_scan.h",
-                            "wifi_hid2d.h"
-                        ]
-                    },
-                    "name" : "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
-                }
-            ],
-            "test": [
-            ]
-        },
-        "hisysevent_config": [
-            "//foundation/communication/wifi/hisysevent.yaml"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/LICENSE b/dhcp/LICENSE
similarity index 100%
rename from LICENSE
rename to dhcp/LICENSE
diff --git a/dhcp/bundle.json b/dhcp/bundle.json
new file mode 100644
index 000000000..46e74f275
--- /dev/null
+++ b/dhcp/bundle.json
@@ -0,0 +1,78 @@
+{
+    "name": "@ohos/communication_wifi",
+    "version": "3.1.0",
+    "description": "The DHCP module provides DHCP client and DHCP service, used to obtain, assign and manage IP address.",
+    "homePage": "https://gitee.com/openharmony",
+    "license": "Apache License 2.0",
+    "repository": "https://gitee.com/openharmony/communication_wifi",
+    "domain": "os",
+    "language": "",
+    "publishAs": "code-segment",
+    "private": false,
+    "scripts": {},
+    "tags": [
+        "foundation"
+    ],
+    "keywords": [
+        "communication",
+        "dhcp"
+    ],
+    "envs": [],
+    "dirs": [],
+    "author": {
+        "name": "",
+        "email": "",
+        "url": ""
+    },
+    "contributors": [
+        {
+            "name": "",
+            "email": "",
+            "url": ""
+        }
+    ],
+    "segment": {
+        "destPath": "foundation/communication/wifi/dhcp"
+    },
+    "component": {
+        "name": "dhcp",
+        "subsystem": "communication",
+        "syscap": [
+        ],
+        "features": [
+        ],
+        "adapted_system_type": [
+            "standard"
+        ],
+        "rom": "",
+        "ram": "",
+        "deps": {
+            "components": [
+                "ipc",
+                "ces_standard",
+                "hiviewdfx_hilog_native",
+                "hisysevent_native"
+            ],
+            "third_party": [
+                "wpa_supplicant",
+                "node",
+                "bounds_checking_function",
+                "googletest",
+                "openssl"
+            ]
+        },
+        "build": {
+            "sub_component": [
+                "//foundation/communication/wifi/dhcp/services/mgr_service:dhcp_manager_service",
+                "//foundation/communication/wifi/dhcp/services/dhcp_client:dhcp_client_service",
+                "//foundation/communication/wifi/dhcp/services/dhcp_server:dhcp_server"
+            ],
+            "inner_kits": [
+            ],
+            "test": [
+            ]
+        },
+        "hisysevent_config": [
+        ]
+    }
+}
diff --git a/dhcp/dhcp.gni b/dhcp/dhcp.gni
new file mode 100644
index 000000000..49b97c33d
--- /dev/null
+++ b/dhcp/dhcp.gni
@@ -0,0 +1,19 @@
+# Copyright (c) 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.
+
+SUBSYSTEM_DIR = "//foundation/communication"
+WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi"
+DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp"
+
+declare_args() {
+}
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_define.h
rename to dhcp/interfaces/innerkits/native_cpp/include/dhcp_define.h
diff --git a/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h
new file mode 100644
index 000000000..ddeeb207a
--- /dev/null
+++ b/dhcp/interfaces/innerkits/native_cpp/include/dhcp_service_api.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef OHOS_DHCP_SERVICE_API_H
+#define OHOS_DHCP_SERVICE_API_H
+
+#include "i_dhcp_service.h"
+
+namespace OHOS {
+namespace Wifi {
+class DhcpServiceApi {
+public:
+    static std::unique_ptr<IDhcpService> GetInstance();
+};
+}  // namespace Wifi
+}  // namespace OHOS
+#endif
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_client_service.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_client_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_client_service.h
rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_client_service.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_result_notify.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_result_notify.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_result_notify.h
rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_result_notify.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_server_service.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_server_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_server_service.h
rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_server_service.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_service.h b/dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces/i_dhcp_service.h
rename to dhcp/interfaces/innerkits/native_cpp/interfaces/i_dhcp_service.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn b/dhcp/services/dhcp_client/BUILD.gn
similarity index 56%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn
rename to dhcp/services/dhcp_client/BUILD.gn
index ab4100637..92ca02937 100644
--- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn
+++ b/dhcp/services/dhcp_client/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -13,24 +13,25 @@
 
 import("//build/ohos.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
 ohos_executable("dhcp_client_service") {
   install_enable = true
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_main.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c",
   ]
 
   include_dirs = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -52,6 +53,6 @@ ohos_executable("dhcp_client_service") {
   ]
   defines = []
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_api.h b/dhcp/services/dhcp_client/include/dhcp_api.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_api.h
rename to dhcp/services/dhcp_client/include/dhcp_api.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_client.h b/dhcp/services/dhcp_client/include/dhcp_client.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_client.h
rename to dhcp/services/dhcp_client/include/dhcp_client.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_define.h b/dhcp/services/dhcp_client/include/dhcp_define.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_define.h
rename to dhcp/services/dhcp_client/include/dhcp_define.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_function.h b/dhcp/services/dhcp_client/include/dhcp_function.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_function.h
rename to dhcp/services/dhcp_client/include/dhcp_function.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_ipv4.h b/dhcp/services/dhcp_client/include/dhcp_ipv4.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_ipv4.h
rename to dhcp/services/dhcp_client/include/dhcp_ipv4.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_options.h b/dhcp/services/dhcp_client/include/dhcp_options.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_options.h
rename to dhcp/services/dhcp_client/include/dhcp_options.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_socket.h b/dhcp/services/dhcp_client/include/dhcp_socket.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include/dhcp_socket.h
rename to dhcp/services/dhcp_client/include/dhcp_socket.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp b/dhcp/services/dhcp_client/src/dhcp_api.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp
rename to dhcp/services/dhcp_client/src/dhcp_api.cpp
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c b/dhcp/services/dhcp_client/src/dhcp_client.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c
rename to dhcp/services/dhcp_client/src/dhcp_client.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c b/dhcp/services/dhcp_client/src/dhcp_function.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c
rename to dhcp/services/dhcp_client/src/dhcp_function.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c b/dhcp/services/dhcp_client/src/dhcp_ipv4.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c
rename to dhcp/services/dhcp_client/src/dhcp_ipv4.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c b/dhcp/services/dhcp_client/src/dhcp_main.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_main.c
rename to dhcp/services/dhcp_client/src/dhcp_main.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c b/dhcp/services/dhcp_client/src/dhcp_options.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c
rename to dhcp/services/dhcp_client/src/dhcp_options.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c b/dhcp/services/dhcp_client/src/dhcp_socket.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c
rename to dhcp/services/dhcp_client/src/dhcp_socket.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/BUILD.gn b/dhcp/services/dhcp_server/BUILD.gn
similarity index 87%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/BUILD.gn
rename to dhcp/services/dhcp_server/BUILD.gn
index 111d95e4e..d2c83b024 100644
--- a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/BUILD.gn
+++ b/dhcp/services/dhcp_server/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,6 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
+
 ohos_executable("dhcp_server") {
   install_enable = true
   dhcp_hilog_enable = true
@@ -31,7 +33,7 @@ ohos_executable("dhcp_server") {
   include_dirs = [
     "include",
     "include/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
     "//utils/native/base/include",
   ]
 
@@ -45,6 +47,6 @@ ohos_executable("dhcp_server") {
     defines += [ "DHCP_HILOG_ENABLE" ]
   }
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd.conf.sample b/dhcp/services/dhcp_server/etc/dhcpd.conf.sample
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd.conf.sample
rename to dhcp/services/dhcp_server/etc/dhcpd.conf.sample
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd_mini.conf b/dhcp/services/dhcp_server/etc/dhcpd_mini.conf
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/etc/dhcpd_mini.conf
rename to dhcp/services/dhcp_server/etc/dhcpd_mini.conf
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/address_utils.h b/dhcp/services/dhcp_server/include/address_utils.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/address_utils.h
rename to dhcp/services/dhcp_server/include/address_utils.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/common_util.h b/dhcp/services/dhcp_server/include/common_util.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/common_util.h
rename to dhcp/services/dhcp_server/include/common_util.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_address_pool.h b/dhcp/services/dhcp_server/include/dhcp_address_pool.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_address_pool.h
rename to dhcp/services/dhcp_server/include/dhcp_address_pool.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h b/dhcp/services/dhcp_server/include/dhcp_argument.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_argument.h
rename to dhcp/services/dhcp_server/include/dhcp_argument.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_binding.h b/dhcp/services/dhcp_server/include/dhcp_binding.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_binding.h
rename to dhcp/services/dhcp_server/include/dhcp_binding.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_config.h b/dhcp/services/dhcp_server/include/dhcp_config.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_config.h
rename to dhcp/services/dhcp_server/include/dhcp_config.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h b/dhcp/services/dhcp_server/include/dhcp_define.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_define.h
rename to dhcp/services/dhcp_server/include/dhcp_define.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_ipv4.h b/dhcp/services/dhcp_server/include/dhcp_ipv4.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_ipv4.h
rename to dhcp/services/dhcp_server/include/dhcp_ipv4.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_logger.h b/dhcp/services/dhcp_server/include/dhcp_logger.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_logger.h
rename to dhcp/services/dhcp_server/include/dhcp_logger.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_message.h b/dhcp/services/dhcp_server/include/dhcp_message.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_message.h
rename to dhcp/services/dhcp_server/include/dhcp_message.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_option.h b/dhcp/services/dhcp_server/include/dhcp_option.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_option.h
rename to dhcp/services/dhcp_server/include/dhcp_option.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h b/dhcp/services/dhcp_server/include/dhcp_server.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/dhcp_server.h
rename to dhcp/services/dhcp_server/include/dhcp_server.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/hash_table.h b/dhcp/services/dhcp_server/include/hash_table.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include/hash_table.h
rename to dhcp/services/dhcp_server/include/hash_table.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c b/dhcp/services/dhcp_server/src/address_utils.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c
rename to dhcp/services/dhcp_server/src/address_utils.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c b/dhcp/services/dhcp_server/src/common_util.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c
rename to dhcp/services/dhcp_server/src/common_util.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c b/dhcp/services/dhcp_server/src/dhcp_address_pool.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c
rename to dhcp/services/dhcp_server/src/dhcp_address_pool.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c b/dhcp/services/dhcp_server/src/dhcp_argument.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c
rename to dhcp/services/dhcp_server/src/dhcp_argument.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c b/dhcp/services/dhcp_server/src/dhcp_binding.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c
rename to dhcp/services/dhcp_server/src/dhcp_binding.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c b/dhcp/services/dhcp_server/src/dhcp_config.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c
rename to dhcp/services/dhcp_server/src/dhcp_config.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c b/dhcp/services/dhcp_server/src/dhcp_dhcpd.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_dhcpd.c
rename to dhcp/services/dhcp_server/src/dhcp_dhcpd.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c b/dhcp/services/dhcp_server/src/dhcp_option.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c
rename to dhcp/services/dhcp_server/src/dhcp_option.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c b/dhcp/services/dhcp_server/src/dhcp_server.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c
rename to dhcp/services/dhcp_server/src/dhcp_server.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c b/dhcp/services/dhcp_server/src/hash_table.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c
rename to dhcp/services/dhcp_server/src/hash_table.c
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn b/dhcp/services/mgr_service/BUILD.gn
similarity index 58%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn
rename to dhcp/services/mgr_service/BUILD.gn
index b68e530af..6938b61d2 100644
--- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn
+++ b/dhcp/services/mgr_service/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -13,23 +13,26 @@
 
 import("//build/ohos.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
 ohos_shared_library("dhcp_manager_service") {
   install_enable = true
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service_api.cpp",
   ]
 
   include_dirs = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -55,6 +58,6 @@ ohos_shared_library("dhcp_manager_service") {
     "-Wl,-E",
   ]
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h b/dhcp/services/mgr_service/include/dhcp_client_service_impl.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_client_service_impl.h
rename to dhcp/services/mgr_service/include/dhcp_client_service_impl.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_event_subscriber.h b/dhcp/services/mgr_service/include/dhcp_event_subscriber.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_event_subscriber.h
rename to dhcp/services/mgr_service/include/dhcp_event_subscriber.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_func.h b/dhcp/services/mgr_service/include/dhcp_func.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_func.h
rename to dhcp/services/mgr_service/include/dhcp_func.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h b/dhcp/services/mgr_service/include/dhcp_server_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_server_service.h
rename to dhcp/services/mgr_service/include/dhcp_server_service.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_service.h b/dhcp/services/mgr_service/include/dhcp_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include/dhcp_service.h
rename to dhcp/services/mgr_service/include/dhcp_service.h
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp b/dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp
rename to dhcp/services/mgr_service/src/dhcp_client_service_impl.cpp
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp b/dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp
rename to dhcp/services/mgr_service/src/dhcp_event_subscriber.cpp
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp b/dhcp/services/mgr_service/src/dhcp_func.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp
rename to dhcp/services/mgr_service/src/dhcp_func.cpp
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp b/dhcp/services/mgr_service/src/dhcp_server_service.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp
rename to dhcp/services/mgr_service/src/dhcp_server_service.cpp
diff --git a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp b/dhcp/services/mgr_service/src/dhcp_service.cpp
similarity index 99%
rename from services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp
rename to dhcp/services/mgr_service/src/dhcp_service.cpp
index e93f707b4..ad667f9b3 100644
--- a/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp
+++ b/dhcp/services/mgr_service/src/dhcp_service.cpp
@@ -212,4 +212,4 @@ int DhcpService::InitServerService()
     return DHCP_OPT_SUCCESS;
 }
 }  // namespace Wifi
-}  // namespace OHOS
\ No newline at end of file
+}  // namespace OHOS
diff --git a/dhcp/services/mgr_service/src/dhcp_service_api.cpp b/dhcp/services/mgr_service/src/dhcp_service_api.cpp
new file mode 100644
index 000000000..9e878d96f
--- /dev/null
+++ b/dhcp/services/mgr_service/src/dhcp_service_api.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 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.
+ */
+
+#include "dhcp_service_api.h"
+#include "dhcp_service.h"
+#include "wifi_logger.h"
+
+DEFINE_WIFILOG_DHCP_LABEL("DhcpServiceApi");
+
+namespace OHOS {
+namespace Wifi {
+std::unique_ptr<IDhcpService> DhcpServiceApi::GetInstance()
+{
+    std::unique_ptr<IDhcpService> service = std::unique_ptr<DhcpService>();
+    if (service == nullptr) {
+        WIFI_LOGI("DhcpApi GetInstance is null");
+    }
+    return service;
+}
+
+}  // namespace Wifi
+}  // namespace OHOS
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn b/dhcp/tests/services/dhcp_client/BUILD.gn
similarity index 67%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn
rename to dhcp/tests/services/dhcp_client/BUILD.gn
index ee7b983a9..9968ec30b 100644
--- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/BUILD.gn
+++ b/dhcp/tests/services/dhcp_client/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -13,29 +13,29 @@
 
 import("//build/test.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
-SUBSYSTEM_DIR = "//foundation/communication"
 module_output_path = "wifi_standard/dhcp_client_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/test",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
   ]
 }
 
 ohos_unittest("dhcp_client_unittest") {
   module_out_path = module_output_path
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_api.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_client.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_function.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_ipv4.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_options.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/src/dhcp_socket.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_api.cpp",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_client.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_function.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_ipv4.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_options.c",
+    "$DHCP_ROOT_DIR/services/dhcp_client/src/dhcp_socket.c",
     "dhcp_client_test.cpp",
     "dhcp_function_test.cpp",
     "dhcp_ipv4_test.cpp",
@@ -49,9 +49,9 @@ ohos_unittest("dhcp_client_unittest") {
 
   include_dirs = [
     "//third_party/googletest/googlemock/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/test",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/dhcp_client/test",
+    "$DHCP_ROOT_DIR/services/dhcp_client/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -94,7 +94,7 @@ ohos_unittest("dhcp_client_unittest") {
   ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
   testonly = true
 }
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_client_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_client_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_client_test.cpp
rename to dhcp/tests/services/dhcp_client/dhcp_client_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_function_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_function_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_function_test.cpp
rename to dhcp/tests/services/dhcp_client/dhcp_function_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_ipv4_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_ipv4_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_ipv4_test.cpp
rename to dhcp/tests/services/dhcp_client/dhcp_ipv4_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_main_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_main_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_main_test.cpp
rename to dhcp/tests/services/dhcp_client/dhcp_main_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_options_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_options_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_options_test.cpp
rename to dhcp/tests/services/dhcp_client/dhcp_options_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_socket_test.cpp b/dhcp/tests/services/dhcp_client/dhcp_socket_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/dhcp_socket_test.cpp
rename to dhcp/tests/services/dhcp_client/dhcp_socket_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.cpp b/dhcp/tests/services/dhcp_client/global_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.cpp
rename to dhcp/tests/services/dhcp_client/global_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.h b/dhcp/tests/services/dhcp_client/global_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/global_test.h
rename to dhcp/tests/services/dhcp_client/global_test.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.cpp b/dhcp/tests/services/dhcp_client/mock_custom_func.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.cpp
rename to dhcp/tests/services/dhcp_client/mock_custom_func.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.h b/dhcp/tests/services/dhcp_client/mock_custom_func.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_custom_func.h
rename to dhcp/tests/services/dhcp_client/mock_custom_func.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.cpp b/dhcp/tests/services/dhcp_client/mock_system_func.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.cpp
rename to dhcp/tests/services/dhcp_client/mock_system_func.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.h b/dhcp/tests/services/dhcp_client/mock_system_func.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_client/mock_system_func.h
rename to dhcp/tests/services/dhcp_client/mock_system_func.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn b/dhcp/tests/services/dhcp_server/unittest/BUILD.gn
similarity index 60%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn
rename to dhcp/tests/services/dhcp_server/unittest/BUILD.gn
index 91f42af58..7ab896135 100644
--- a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/BUILD.gn
+++ b/dhcp/tests/services/dhcp_server/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,15 +12,15 @@
 # limitations under the License.
 
 import("//build/test.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
-module_output_path = "wifi_standard/dhcp_server_test"
+module_output_path = "dhcp/dhcp_server_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include",
+    "$DHCP_ROOT_DIR/services/dhcp_server/include",
   ]
 }
 
@@ -28,15 +28,15 @@ ohos_unittest("dhcp_server_unittest") {
   module_out_path = module_output_path
   dhcp_hilog_enable = true
   sources = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/address_utils.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/common_util.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_address_pool.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_argument.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_binding.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_config.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_option.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/dhcp_server.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/src/hash_table.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/address_utils.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/common_util.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_address_pool.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_argument.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_binding.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_config.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_option.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/dhcp_server.c",
+    "$DHCP_ROOT_DIR/services/dhcp_server/src/hash_table.c",
     "address_utils_test.cpp",
     "common_util_test.cpp",
     "dhcp_address_pool_test.cpp",
@@ -54,7 +54,7 @@ ohos_unittest("dhcp_server_unittest") {
     "//utils/native/base/include",
     "//third_party/googletest/googlemock/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/include",
+    "$DHCP_ROOT_DIR/services/dhcp_server/include",
   ]
 
   defines = [ "__OHOS__" ]
@@ -85,7 +85,7 @@ ohos_unittest("dhcp_server_unittest") {
     defines += [ "DHCP_HILOG_ENABLE" ]
   }
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
   testonly = true
 }
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp b/dhcp/tests/services/dhcp_server/unittest/address_utils_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/address_utils_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/address_utils_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp b/dhcp/tests/services/dhcp_server/unittest/common_util_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/common_util_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/common_util_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_address_pool_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_address_pool_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_address_pool_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_argument_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_argument_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_argument_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_binding_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_binding_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_binding_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_binding_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_config_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_config_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_config_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_config_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h b/dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_message_sim.h
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_message_sim.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_option_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_option_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_option_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp b/dhcp/tests/services/dhcp_server/unittest/dhcp_server_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/dhcp_server_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/dhcp_server_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp b/dhcp/tests/services/dhcp_server/unittest/hash_table_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/hash_table_test.cpp
rename to dhcp/tests/services/dhcp_server/unittest/hash_table_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp b/dhcp/tests/services/dhcp_server/unittest/system_func_mock.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.cpp
rename to dhcp/tests/services/dhcp_server/unittest/system_func_mock.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h b/dhcp/tests/services/dhcp_server/unittest/system_func_mock.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/dhcp_server/unittest/system_func_mock.h
rename to dhcp/tests/services/dhcp_server/unittest/system_func_mock.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn b/dhcp/tests/services/mgr_service/BUILD.gn
similarity index 67%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn
rename to dhcp/tests/services/mgr_service/BUILD.gn
index 1b427f6f6..53f8c7206 100644
--- a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/BUILD.gn
+++ b/dhcp/tests/services/mgr_service/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -13,10 +13,10 @@
 
 import("//build/test.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/dhcp/dhcp.gni")
 
 ################################################################################
 
-SUBSYSTEM_DIR = "//foundation/communication"
 module_output_path = "wifi_standard/dhcp_manage_test"
 even_path = "//base/notification/ces_standard"
 
@@ -24,18 +24,18 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/test",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
   ]
 }
 
 ohos_unittest("dhcp_manage_unittest") {
   module_out_path = module_output_path
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_client_service_impl.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_event_subscriber.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_server_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/src/dhcp_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_client_service_impl.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_event_subscriber.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_func.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_server_service.cpp",
+    "$DHCP_ROOT_DIR/services/mgr_service/src/dhcp_service.cpp",
     "dhcp_client_service_test.cpp",
     "dhcp_func_test.cpp",
     "dhcp_manage_test.cpp",
@@ -48,10 +48,11 @@ ohos_unittest("dhcp_manage_unittest") {
 
   include_dirs = [
     "//third_party/googletest/googlemock/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/test",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
+    "$DHCP_ROOT_DIR/services/mgr_service/test",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
     "//utils/native/base/include",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
@@ -97,7 +98,7 @@ ohos_unittest("dhcp_manage_unittest") {
   ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "dhcp"
   subsystem_name = "communication"
 }
 
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_client_service_test.cpp b/dhcp/tests/services/mgr_service/dhcp_client_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_client_service_test.cpp
rename to dhcp/tests/services/mgr_service/dhcp_client_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_func_test.cpp b/dhcp/tests/services/mgr_service/dhcp_func_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_func_test.cpp
rename to dhcp/tests/services/mgr_service/dhcp_func_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_manage_test.cpp b/dhcp/tests/services/mgr_service/dhcp_manage_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_manage_test.cpp
rename to dhcp/tests/services/mgr_service/dhcp_manage_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.cpp b/dhcp/tests/services/mgr_service/dhcp_result_notify.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.cpp
rename to dhcp/tests/services/mgr_service/dhcp_result_notify.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.h b/dhcp/tests/services/mgr_service/dhcp_result_notify.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_result_notify.h
rename to dhcp/tests/services/mgr_service/dhcp_result_notify.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_server_service_test.cpp b/dhcp/tests/services/mgr_service/dhcp_server_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_server_service_test.cpp
rename to dhcp/tests/services/mgr_service/dhcp_server_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_service_test.cpp b/dhcp/tests/services/mgr_service/dhcp_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/dhcp_service_test.cpp
rename to dhcp/tests/services/mgr_service/dhcp_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.cpp b/dhcp/tests/services/mgr_service/global_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.cpp
rename to dhcp/tests/services/mgr_service/global_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.h b/dhcp/tests/services/mgr_service/global_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/global_test.h
rename to dhcp/tests/services/mgr_service/global_test.h
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.cpp b/dhcp/tests/services/mgr_service/mock_system_func.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.cpp
rename to dhcp/tests/services/mgr_service/mock_system_func.cpp
diff --git a/tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.h b/dhcp/tests/services/mgr_service/mock_system_func.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/dhcp_manage/mgr_service/mock_system_func.h
rename to dhcp/tests/services/mgr_service/mock_system_func.h
diff --git a/services/wifi_standard/wifi_framework/BUILD.gn b/services/wifi_standard/wifi_framework/BUILD.gn
deleted file mode 100644
index fe2de5aab..000000000
--- a/services/wifi_standard/wifi_framework/BUILD.gn
+++ /dev/null
@@ -1,43 +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.
-
-import("//build/ohos.gni")
-
-group("wifi_system_ability") {
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability",
-  ]
-}
-
-group("wifi_manage") {
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service",
-  ]
-}
-
-group("dhcp_manage") {
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_client:dhcp_client_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/dhcp_server:dhcp_server",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-  ]
-}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
deleted file mode 100644
index a34de40ca..000000000
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
+++ /dev/null
@@ -1,83 +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.
-
-import("//build/ohos.gni")
-import("//foundation/communication/wifi/wifi.gni")
-
-ohos_shared_library("wifi_ap_service") {
-  install_enable = true
-  sources = [
-    "../common/handler.cpp",
-    "../common/internal_message.cpp",
-    "../common/message_queue.cpp",
-    "../common/state.cpp",
-    "../common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
-    "ap_config_use.cpp",
-    "ap_idle_state.cpp",
-    "ap_interface.cpp",
-    "ap_monitor.cpp",
-    "ap_root_state.cpp",
-    "ap_service.cpp",
-    "ap_started_state.cpp",
-    "ap_state_machine.cpp",
-    "ap_stations_manager.cpp",
-    "wifi_ap_nat_manager.cpp",
-  ]
-
-  include_dirs = [
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface",
-    "//utils/native/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-  ]
-
-  cflags_cc = [
-    "-std=c++17",
-    "-Wall",
-  ]
-
-  ldflags = [
-    "-fPIC",
-    "-Wl,-E",
-  ]
-
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
-
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//utils/native/base:utils",
-  ]
-
-  defines = [ "AP_INTF=\"$wifi_standard_feature_with_ap_intf\"" ]
-
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
deleted file mode 100644
index 703232f6d..000000000
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
+++ /dev/null
@@ -1,117 +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")
-
-ohos_shared_library("wifi_p2p_service") {
-  install_enable = true
-  sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp",
-    "authorizing_negotiation_request_state.cpp",
-    "group_formed_state.cpp",
-    "group_negotiation_state.cpp",
-    "invitation_received_state.cpp",
-    "invitation_request_state.cpp",
-    "p2p_default_state.cpp",
-    "p2p_disabled_state.cpp",
-    "p2p_disabling_state.cpp",
-    "p2p_enabled_state.cpp",
-    "p2p_enabling_state.cpp",
-    "p2p_group_formation_state.cpp",
-    "p2p_group_join_state.cpp",
-    "p2p_group_operating_state.cpp",
-    "p2p_idle_state.cpp",
-    "p2p_interface.cpp",
-    "p2p_inviting_state.cpp",
-    "p2p_monitor.cpp",
-    "p2p_state_machine.cpp",
-    "provision_discovery_state.cpp",
-    "wifi_p2p_device_manager.cpp",
-    "wifi_p2p_dns_sd_service_info.cpp",
-    "wifi_p2p_dns_sd_service_request.cpp",
-    "wifi_p2p_dns_sd_service_response.cpp",
-    "wifi_p2p_dns_txt_record.cpp",
-    "wifi_p2p_group_info_proxy.cpp",
-    "wifi_p2p_group_manager.cpp",
-    "wifi_p2p_service.cpp",
-    "wifi_p2p_service_manager.cpp",
-    "wifi_p2p_service_request_list.cpp",
-    "wifi_p2p_service_response_list.cpp",
-    "wifi_p2p_temp_disc_event.cpp",
-    "wifi_p2p_upnp_service_info.cpp",
-    "wifi_p2p_upnp_service_request.cpp",
-    "wifi_p2p_upnp_service_response.cpp",
-  ]
-
-  include_dirs = [
-    "./",
-    "//utils/native/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-  ]
-
-  cflags_cc = [
-    "-std=c++17",
-    "-Wall",
-  ]
-
-  ldflags = [
-    "-fPIC",
-    "-Wl,-E",
-  ]
-
-  defines = [ "AP_NOT_DIRECT_USE_DHCP" ]
-  if (product_name == "rk3568") {
-    defines += [ "PRODUCT_RK" ]
-  }
-
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
-    "netmanager_base:net_conn_manager_if",
-  ]
-
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//utils/native/base:utils",
-  ]
-
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
deleted file mode 100644
index caa661a47..000000000
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
+++ /dev/null
@@ -1,76 +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.
-
-import("//build/ohos.gni")
-
-ohos_shared_library("wifi_scan_service") {
-  install_enable = true
-  sources = [
-    "../common/handler.cpp",
-    "../common/internal_message.cpp",
-    "../common/message_queue.cpp",
-    "../common/state.cpp",
-    "../common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "scan_interface.cpp",
-    "scan_monitor.cpp",
-    "scan_service.cpp",
-    "scan_state_machine.cpp",
-  ]
-
-  include_dirs = [
-    "//utils/native/base/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/hardware/libhardware/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/frameworks/native/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libutils/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/base/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/libbase/include",
-  ]
-
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//utils/native/base:utils",
-  ]
-
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
-  cflags_cc = [
-    "-std=c++17",
-    "-fno-rtti",
-  ]
-
-  ldflags = [
-    "-fPIC",
-    "-Wl,-E",
-  ]
-
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
deleted file mode 100644
index 402f902a3..000000000
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
+++ /dev/null
@@ -1,92 +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")
-
-ohos_shared_library("wifi_sta_service") {
-  install_enable = true
-  sources = [
-    "../common/handler.cpp",
-    "../common/internal_message.cpp",
-    "../common/message_queue.cpp",
-    "../common/state.cpp",
-    "../common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "sta_auto_connect_service.cpp",
-    "sta_interface.cpp",
-    "sta_monitor.cpp",
-    "sta_network_check.cpp",
-    "sta_saved_device_appraisal.cpp",
-    "sta_service.cpp",
-    "sta_state_machine.cpp",
-  ]
-  include_dirs = [
-    "//foundation/communication/wifi/services/wifi_standard/sdk/include",
-    "//utils/native/base/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/hardware/libhardware/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/frameworks/native/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libutils/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/base/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/libbase/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
-    "//foundation/communication/wifi/utils/inc",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-  ]
-
-  cflags_cc = [
-    "-std=c++17",
-    "-fno-rtti",
-  ]
-
-  ldflags = [
-    "-fPIC",
-    "-Wl,-E",
-  ]
-
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
-    "//utils/native/base:utils",
-  ]
-
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
-    "netmanager_base:net_conn_manager_if",
-  ]
-
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
deleted file mode 100644
index ff6825762..000000000
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
+++ /dev/null
@@ -1,109 +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/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication"
-config("module_private_config") {
-  visibility = [ ":*" ]
-  include_dirs = [
-    "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-  ]
-}
-ohos_unittest("WifiApServiceTest") {
-  module_out_path = "wifi_standard/ap_test"
-  sources = [
-    "./Mock/mock_network_interface.cpp",
-    "./Mock/mock_system_interface.cpp",
-    "./Mock/mock_wifi_ap_hal_interface.cpp",
-    "./Mock/mock_wifi_settings.cpp",
-    "./Mock/operator_overload.cpp",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp",
-    "ap_config_use_test.cpp",
-    "ap_idle_state_test.cpp",
-    "ap_monitor_test.cpp",
-    "ap_root_state_test.cpp",
-    "ap_service_test.cpp",
-    "ap_started_state_test.cpp",
-    "ap_state_machine_test.cpp",
-    "ap_stations_manager_test.cpp",
-    "global_test.cpp",
-    "wifi_ap_nat_manager_test.cpp",
-    "wifi_ap_test.cpp",
-  ]
-  include_dirs = [
-    "./",
-    "../",
-    "./Mock/",
-    "//utils/native/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//third_party/googletest/googlemock/include",
-    "//third_party/googletest/googletest/include",
-  ]
-  ldflags = [
-    "-fPIC",
-    "-Wl,-E",
-    "-Wl,--wrap=system",
-    "--coverage",
-  ]
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-    "//third_party/googletest:gmock_main",
-    "//utils/native/base:utils",
-  ]
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
-group("unittest") {
-  testonly = true
-  deps = []
-  deps += [ ":WifiApServiceTest" ]
-}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
deleted file mode 100644
index 1240eaf66..000000000
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
+++ /dev/null
@@ -1,162 +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/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication"
-config("module_private_config") {
-  visibility = [ ":*" ]
-  include_dirs = [
-    "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test",
-  ]
-}
-
-ohos_unittest("wifi_p2p_test") {
-  module_out_path = "wifi_standard/p2p_test"
-  sources = [
-    "./Mock/mock_wifi_p2p_hal_interface.cpp",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp",
-    "authorizing_negotiation_request_state_test.cpp",
-    "global_test.cpp",
-    "group_formed_state_test.cpp",
-    "group_negotiation_state_test.cpp",
-    "invitation_recelved_state_test.cpp",
-    "invitation_request_state_test.cpp",
-    "p2p_default_state_test.cpp",
-    "p2p_disabled_state_test.cpp",
-    "p2p_disabling_state_test.cpp",
-    "p2p_enabled_state_test.cpp",
-    "p2p_enabling_state_test.cpp",
-    "p2p_group_formation_state_test.cpp",
-    "p2p_group_join_state_test.cpp",
-    "p2p_group_operating_state_test.cpp",
-    "p2p_idle_state_test.cpp",
-    "p2p_inviting_state_test.cpp",
-    "p2p_monitor_test.cpp",
-    "p2p_state_machine_test.cpp",
-    "provision_discovery_state_test.cpp",
-    "wifi_p2p_device_manager_test.cpp",
-    "wifi_p2p_dns_sd_service_info_test.cpp",
-    "wifi_p2p_dns_sd_service_request_test.cpp",
-    "wifi_p2p_dns_sd_service_response_test.cpp",
-    "wifi_p2p_group_info_proxy_test.cpp",
-    "wifi_p2p_group_manager_test.cpp",
-    "wifi_p2p_service_manager_test.cpp",
-    "wifi_p2p_service_request_list_test.cpp",
-    "wifi_p2p_service_response_list_test.cpp",
-    "wifi_p2p_service_test.cpp",
-    "wifi_p2p_test_entry.cpp",
-    "wifi_p2p_upnp_service_info_test.cpp",
-    "wifi_p2p_upnp_service_request_test.cpp",
-    "wifi_p2p_upnp_service_response_test.cpp",
-  ]
-
-  include_dirs = [
-    "./",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
-    "./Mock",
-    "//utils/native/base/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//third_party/googletest/googlemock/include",
-    "//third_party/googletest/googletest/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-  ]
-
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//third_party/googletest:gmock_main",
-    "//utils/native/base:utils",
-  ]
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
-    "netmanager_base:net_conn_manager_if",
-  ]
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
-
-group("unittest") {
-  testonly = true
-  deps = []
-  deps += [ ":wifi_p2p_test" ]
-}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
deleted file mode 100644
index ab4f861f1..000000000
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
+++ /dev/null
@@ -1,101 +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.
-
-import("//build/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication"
-module_output_path = "wifi_standard/scan_test"
-
-config("module_private_config") {
-  visibility = [ ":*" ]
-  include_dirs = [
-    "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-  ]
-}
-
-ohos_unittest("wifi_scan_unittest") {
-  module_out_path = module_output_path
-  sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp",
-    "Mock/mock_scan_service.cpp",
-    "Mock/mock_scan_state_machine.cpp",
-    "Mock/mock_wifi_manager.cpp",
-    "Mock/mock_wifi_settings.cpp",
-    "Mock/mock_wifi_sta_hal_interface.cpp",
-    "Mock/mock_wifi_supplicant_hal_interface.cpp",
-    "global_test.cpp",
-    "scan_interface_test.cpp",
-    "scan_monitor_test.cpp",
-    "scan_service_test.cpp",
-    "scan_state_machine_test.cpp",
-    "wifi_scan_test.cpp",
-  ]
-
-  include_dirs = [
-    "//utils/native/base/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/sdk/include",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-    "//foundation/communication/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/hardware/libhardware/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/frameworks/native/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libutils/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/base/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/libbase/include",
-    "//foundation/communication/wifi/services/wifi_standard/depends/include/system/core/libnetutils/include/netutils",
-    "//third_party/googletest/googlemock/include",
-    "//third_party/googletest/googletest/include",
-  ]
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//third_party/googletest:gmock_main",
-    "//utils/native/base:utils",
-  ]
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
-
-group("unittest") {
-  testonly = true
-  deps = [ ":wifi_scan_unittest" ]
-}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
deleted file mode 100644
index ad38308ca..000000000
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
+++ /dev/null
@@ -1,127 +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/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication"
-module_output_path = "wifi_standard/sta_test"
-
-defines = []
-defines += [ "OHOS_WIFI_STA_TEST" ]
-
-config("module_private_config") {
-  visibility = [ ":*" ]
-  include_dirs = [
-    "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-  ]
-}
-
-ohos_unittest("wifi_sta_unittest") {
-  module_out_path = module_output_path
-  sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp",
-    "Mock/mock_dhcp_service.cpp",
-    "Mock/mock_if_config.cpp",
-    "Mock/mock_mac_address.cpp",
-    "Mock/mock_sta_auto_connect_service.cpp",
-    "Mock/mock_sta_network_check.cpp",
-    "Mock/mock_sta_state_machine.cpp",
-    "Mock/mock_wifi_chip_hal_interface.cpp",
-    "Mock/mock_wifi_manager.cpp",
-    "Mock/mock_wifi_settings.cpp",
-    "Mock/mock_wifi_sta_hal_interface.cpp",
-    "Mock/mock_wifi_supplicant_hal_interface.cpp",
-    "global_test.cpp",
-    "sta_auto_connect_service_test.cpp",
-    "sta_interface_test.cpp",
-    "sta_monitor_test.cpp",
-    "sta_network_check_test.cpp",
-    "sta_saved_device_appraisal_test.cpp",
-    "sta_service_test.cpp",
-    "sta_state_machine_test.cpp",
-    "wifi_sta_test.cpp",
-  ]
-
-  include_dirs = [
-    "./",
-    "./Mock",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/interface",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//third_party/googletest/googlemock/include",
-    "//third_party/googletest/googletest/include",
-    "//base/notification/ces_standard/cesfwk/kits/native/include",
-    "//utils/native/base/include",
-    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
-    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/ace/ace_engine/frameworks/base/utils",
-    "//foundation/ace/ace_engine/frameworks",
-    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/",
-    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/",
-    "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/",
-    "//foundation/communication/wifi/utils/inc",
-  ]
-
-  deps = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service:dhcp_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
-    "//third_party/googletest:gmock_main",
-    "//utils/native/base:utils",
-  ]
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
-    "netmanager_base:net_conn_manager_if",
-  ]
-  part_name = "wifi_standard"
-  subsystem_name = "communication"
-}
-
-group("unittest") {
-  testonly = true
-  deps = [ ":wifi_sta_unittest" ]
-}
diff --git a/.gitattributes b/wifi/.gitattributes
similarity index 100%
rename from .gitattributes
rename to wifi/.gitattributes
diff --git a/wifi/LICENSE b/wifi/LICENSE
new file mode 100644
index 000000000..4947287f7
--- /dev/null
+++ b/wifi/LICENSE
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/README.md b/wifi/README.md
similarity index 100%
rename from README.md
rename to wifi/README.md
diff --git a/README_zh.md b/wifi/README_zh.md
similarity index 100%
rename from README_zh.md
rename to wifi/README_zh.md
diff --git a/application/wifi_direct_demo/README.md b/wifi/application/wifi_direct_demo/README.md
similarity index 100%
rename from application/wifi_direct_demo/README.md
rename to wifi/application/wifi_direct_demo/README.md
diff --git a/application/wifi_direct_demo/build.gradle b/wifi/application/wifi_direct_demo/build.gradle
similarity index 100%
rename from application/wifi_direct_demo/build.gradle
rename to wifi/application/wifi_direct_demo/build.gradle
diff --git a/application/wifi_direct_demo/entry/.gitignore b/wifi/application/wifi_direct_demo/entry/.gitignore
similarity index 100%
rename from application/wifi_direct_demo/entry/.gitignore
rename to wifi/application/wifi_direct_demo/entry/.gitignore
diff --git a/application/wifi_direct_demo/entry/build.gradle b/wifi/application/wifi_direct_demo/entry/build.gradle
similarity index 100%
rename from application/wifi_direct_demo/entry/build.gradle
rename to wifi/application/wifi_direct_demo/entry/build.gradle
diff --git a/application/wifi_direct_demo/entry/proguard-rules.pro b/wifi/application/wifi_direct_demo/entry/proguard-rules.pro
similarity index 100%
rename from application/wifi_direct_demo/entry/proguard-rules.pro
rename to wifi/application/wifi_direct_demo/entry/proguard-rules.pro
diff --git a/application/wifi_direct_demo/entry/src/main/config.json b/wifi/application/wifi_direct_demo/entry/src/main/config.json
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/config.json
rename to wifi/application/wifi_direct_demo/entry/src/main/config.json
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/app.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/LogUtil.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/common/StorageUtil.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/BaseModel.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiEntity.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/model/wifiModeImpl/WifiModel.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/customPromptDialog.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/component/dialog/inputComponent.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/pages/index.ets
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_phone.svg
diff --git a/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg b/wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg
rename to wifi/application/wifi_direct_demo/entry/src/main/ets/MainAbility/res/image/ic_right.svg
diff --git a/application/wifi_direct_demo/entry/src/main/resources/base/element/string.json b/wifi/application/wifi_direct_demo/entry/src/main/resources/base/element/string.json
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/resources/base/element/string.json
rename to wifi/application/wifi_direct_demo/entry/src/main/resources/base/element/string.json
diff --git a/application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif b/wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif
rename to wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/ic_loading.gif
diff --git a/application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png b/wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png
similarity index 100%
rename from application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png
rename to wifi/application/wifi_direct_demo/entry/src/main/resources/base/media/icon.png
diff --git a/application/wifi_direct_demo/figures/img.png b/wifi/application/wifi_direct_demo/figures/img.png
similarity index 100%
rename from application/wifi_direct_demo/figures/img.png
rename to wifi/application/wifi_direct_demo/figures/img.png
diff --git a/application/wifi_direct_demo/gradle.properties b/wifi/application/wifi_direct_demo/gradle.properties
similarity index 100%
rename from application/wifi_direct_demo/gradle.properties
rename to wifi/application/wifi_direct_demo/gradle.properties
diff --git a/application/wifi_direct_demo/gradlew b/wifi/application/wifi_direct_demo/gradlew
similarity index 100%
rename from application/wifi_direct_demo/gradlew
rename to wifi/application/wifi_direct_demo/gradlew
diff --git a/application/wifi_direct_demo/gradlew.bat b/wifi/application/wifi_direct_demo/gradlew.bat
similarity index 100%
rename from application/wifi_direct_demo/gradlew.bat
rename to wifi/application/wifi_direct_demo/gradlew.bat
diff --git a/application/wifi_direct_demo/package.json b/wifi/application/wifi_direct_demo/package.json
similarity index 100%
rename from application/wifi_direct_demo/package.json
rename to wifi/application/wifi_direct_demo/package.json
diff --git a/application/wifi_direct_demo/settings.gradle b/wifi/application/wifi_direct_demo/settings.gradle
similarity index 100%
rename from application/wifi_direct_demo/settings.gradle
rename to wifi/application/wifi_direct_demo/settings.gradle
diff --git a/wifi/bundle.json b/wifi/bundle.json
new file mode 100644
index 000000000..e56d3ba30
--- /dev/null
+++ b/wifi/bundle.json
@@ -0,0 +1,127 @@
+{
+    "name": "@ohos/communication_wifi",
+    "version": "3.1.0",
+    "description": "The WLAN module provides basic WLAN functions, peer-to-peer (P2P) connection, and WLAN notification, enabling your application to communicate with other devices through a WLAN.",
+    "homePage": "https://gitee.com/openharmony",
+    "license": "Apache License 2.0",
+    "repository": "https://gitee.com/openharmony/communication_wifi",
+    "domain": "os",
+    "language": "",
+    "publishAs": "code-segment",
+    "private": false,
+    "scripts": {},
+    "tags": [
+        "foundation"
+    ],
+    "keywords": [
+        "communication",
+        "wifi"
+    ],
+    "envs": [],
+    "dirs": [],
+    "author": {
+        "name": "",
+        "email": "",
+        "url": ""
+    },
+    "contributors": [
+        {
+            "name": "",
+            "email": "",
+            "url": ""
+        }
+    ],
+    "segment": {
+        "destPath": "foundation/communication/wifi/wifi"
+    },
+    "component": {
+        "name": "wifi",
+        "subsystem": "communication",
+        "syscap": [
+            "SystemCapability.Communication.WiFi.STA",
+            "SystemCapability.Communication.WiFi.AP",
+            "SystemCapability.Communication.WiFi.P2P",
+            "SystemCapability.Communication.WiFi.Core",
+            "SystemCapability.Communication.WiFi.HotspotExt"
+        ],
+        "features": [
+            "wifi_feature_with_p2p",
+            "wifi_feature_with_ap_intf"
+        ],
+        "adapted_system_type": [
+            "standard"
+        ],
+        "rom": "",
+        "ram": "",
+        "deps": {
+            "components": [
+                "ipc",
+                "ces_standard",
+                "hiviewdfx_hilog_native",
+                "hisysevent_native",
+                "netmanager_base"
+            ],
+            "third_party": [
+                "wpa_supplicant",
+                "node",
+                "bounds_checking_function",
+                "googletest",
+                "openssl"
+            ]
+        },
+        "build": {
+            "sub_component": [
+                "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_manage",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_hal:wifi_hal",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework:wifi_system_ability",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/sa_profile:wifi_standard_sa_profile",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service",
+                "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service",
+                "//foundation/communication/wifi/wifi/utils/src:wifi_utils",
+                "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/napi:wifi_native_js",
+                "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/napi:wifi"
+            ],
+            "inner_kits": [
+                {
+                    "header" : {
+                        "header_base": "//foundation/communication/wifi/wifi/interfaces/innerkits/native_c",
+                        "header_files": [
+                            "wifi_device.h",
+                            "wifi_hotspot.h",
+                            "wifi_p2p.h",
+                            "wifi_hid2d.h"
+                        ]
+                    },
+                    "name" : "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
+                },
+                {
+                    "header" : {
+                        "header_base": "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
+                        "header_files": [
+                            "wifi_device.h",
+                            "wifi_hotspot.h",
+                            "wifi_p2p.h",
+                            "wifi_scan.h",
+                            "wifi_hid2d.h"
+                        ]
+                    },
+                    "name" : "//foundation/communication/wifi/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk"
+                }
+            ],
+            "test": [
+            ]
+        },
+        "hisysevent_config": [
+            "//foundation/communication/wifi/wifi/hisysevent.yaml"
+        ]
+    }
+}
diff --git a/figures/en-us_image_0000001115710400.png b/wifi/figures/en-us_image_0000001115710400.png
similarity index 100%
rename from figures/en-us_image_0000001115710400.png
rename to wifi/figures/en-us_image_0000001115710400.png
diff --git a/figures/zh-cn_image_0000001115710400.png b/wifi/figures/zh-cn_image_0000001115710400.png
similarity index 100%
rename from figures/zh-cn_image_0000001115710400.png
rename to wifi/figures/zh-cn_image_0000001115710400.png
diff --git a/hisysevent.yaml b/wifi/hisysevent.yaml
similarity index 100%
rename from hisysevent.yaml
rename to wifi/hisysevent.yaml
diff --git a/interfaces/innerkits/native_c/station_info.h b/wifi/interfaces/innerkits/native_c/station_info.h
similarity index 100%
rename from interfaces/innerkits/native_c/station_info.h
rename to wifi/interfaces/innerkits/native_c/station_info.h
diff --git a/interfaces/innerkits/native_c/wifi_device.h b/wifi/interfaces/innerkits/native_c/wifi_device.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_device.h
rename to wifi/interfaces/innerkits/native_c/wifi_device.h
diff --git a/interfaces/innerkits/native_c/wifi_device_config.h b/wifi/interfaces/innerkits/native_c/wifi_device_config.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_device_config.h
rename to wifi/interfaces/innerkits/native_c/wifi_device_config.h
diff --git a/interfaces/innerkits/native_c/wifi_error_code.h b/wifi/interfaces/innerkits/native_c/wifi_error_code.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_error_code.h
rename to wifi/interfaces/innerkits/native_c/wifi_error_code.h
diff --git a/interfaces/innerkits/native_c/wifi_event.h b/wifi/interfaces/innerkits/native_c/wifi_event.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_event.h
rename to wifi/interfaces/innerkits/native_c/wifi_event.h
diff --git a/interfaces/innerkits/native_c/wifi_hid2d.h b/wifi/interfaces/innerkits/native_c/wifi_hid2d.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_hid2d.h
rename to wifi/interfaces/innerkits/native_c/wifi_hid2d.h
diff --git a/interfaces/innerkits/native_c/wifi_hotspot.h b/wifi/interfaces/innerkits/native_c/wifi_hotspot.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_hotspot.h
rename to wifi/interfaces/innerkits/native_c/wifi_hotspot.h
diff --git a/interfaces/innerkits/native_c/wifi_hotspot_config.h b/wifi/interfaces/innerkits/native_c/wifi_hotspot_config.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_hotspot_config.h
rename to wifi/interfaces/innerkits/native_c/wifi_hotspot_config.h
diff --git a/interfaces/innerkits/native_c/wifi_linked_info.h b/wifi/interfaces/innerkits/native_c/wifi_linked_info.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_linked_info.h
rename to wifi/interfaces/innerkits/native_c/wifi_linked_info.h
diff --git a/interfaces/innerkits/native_c/wifi_p2p.h b/wifi/interfaces/innerkits/native_c/wifi_p2p.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_p2p.h
rename to wifi/interfaces/innerkits/native_c/wifi_p2p.h
diff --git a/interfaces/innerkits/native_c/wifi_p2p_config.h b/wifi/interfaces/innerkits/native_c/wifi_p2p_config.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_p2p_config.h
rename to wifi/interfaces/innerkits/native_c/wifi_p2p_config.h
diff --git a/interfaces/innerkits/native_c/wifi_scan_info.h b/wifi/interfaces/innerkits/native_c/wifi_scan_info.h
similarity index 100%
rename from interfaces/innerkits/native_c/wifi_scan_info.h
rename to wifi/interfaces/innerkits/native_c/wifi_scan_info.h
diff --git a/interfaces/innerkits/native_cpp/napi/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn
similarity index 67%
rename from interfaces/innerkits/native_cpp/napi/BUILD.gn
rename to wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn
index e3692359e..dd1e5d01f 100644
--- a/interfaces/innerkits/native_cpp/napi/BUILD.gn
+++ b/wifi/interfaces/innerkits/native_cpp/napi/BUILD.gn
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ohos_shared_library("wifi") {
   install_enable = true
@@ -19,13 +20,13 @@ ohos_shared_library("wifi") {
     "//third_party/node/src",
     "//native_engine",
     "//utils/native/base/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
     "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context",
-    "//foundation/communication/wifi/utils/inc",
+    "$WIFI_ROOT_DIR/utils/inc",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
   ]
 
@@ -38,18 +39,18 @@ ohos_shared_library("wifi") {
     "wifi_napi_utils.cpp",
   ]
   deps = [
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
     "//foundation/ace/napi:ace_napi",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//utils/native/base:utils",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
 
   relative_install_dir = "module"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 
@@ -59,13 +60,13 @@ ohos_shared_library("wifi_native_js") {
     "//third_party/node/src",
     "//native_engine",
     "//utils/native/base/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
     "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context",
-    "//foundation/communication/wifi/utils/inc",
+    "$WIFI_ROOT_DIR/utils/inc",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
   ]
 
@@ -78,11 +79,11 @@ ohos_shared_library("wifi_native_js") {
     "wifi_napi_utils.cpp",
   ]
   deps = [
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
     "//foundation/ace/napi:ace_napi",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard:wifi_sdk",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//utils/native/base:utils",
   ]
 
@@ -91,6 +92,6 @@ ohos_shared_library("wifi_native_js") {
   external_deps = [ "ipc:ipc_core" ]
 
   relative_install_dir = "module"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.cpp
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_device.h
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_device.h
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_entry.cpp
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.cpp
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_event.h
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_event.h
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.cpp
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_hotspot.h
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.cpp
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_p2p.h
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.cpp
diff --git a/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h b/wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h
rename to wifi/interfaces/innerkits/native_cpp/napi/wifi_napi_utils.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn
similarity index 79%
rename from interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn
index 5123f740e..a9cf4f6e0 100644
--- a/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn
+++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/BUILD.gn
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ################################################################################
 
@@ -23,15 +24,16 @@ config("wifi_sdk_header") {
     "//foundation/ace/ace_engine/frameworks/base/utils",
     "//foundation/ace/ace_engine/frameworks",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/",
     "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/interfaces/innerkits",
-    "//foundation/communication/wifi/utils/inc",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits",
+    "$WIFI_ROOT_DIR/utils/inc",
   ]
 }
 
@@ -50,7 +52,7 @@ config("wifi_sdk_config") {
 }
 
 ohos_source_set("wifi_device_proxy_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "src/wifi_device_impl.cpp",
     "src/wifi_device_proxy.cpp",
@@ -65,7 +67,7 @@ ohos_source_set("wifi_device_proxy_impl") {
 }
 
 ohos_source_set("wifi_hotspot_proxy_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "src/wifi_hotspot_impl.cpp",
     "src/wifi_hotspot_proxy.cpp",
@@ -80,7 +82,7 @@ ohos_source_set("wifi_hotspot_proxy_impl") {
 }
 
 ohos_source_set("wifi_scan_proxy_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "src/wifi_scan_impl.cpp",
     "src/wifi_scan_proxy.cpp",
@@ -95,7 +97,7 @@ ohos_source_set("wifi_scan_proxy_impl") {
 }
 
 ohos_source_set("wifi_p2p_proxy_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "src/wifi_p2p_impl.cpp",
     "src/wifi_p2p_proxy.cpp",
@@ -111,7 +113,6 @@ ohos_source_set("wifi_p2p_proxy_impl") {
 
 ohos_shared_library("wifi_sdk") {
   install_enable = true
-
   sources = [
     "c_adapter/wifi_c_device.cpp",
     "c_adapter/wifi_c_event.cpp",
@@ -137,12 +138,12 @@ ohos_shared_library("wifi_sdk") {
     ":wifi_hotspot_proxy_impl",
     ":wifi_p2p_proxy_impl",
     ":wifi_scan_proxy_impl",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//base/notification/ces_standard/frameworks/core:cesfwk_core",
     "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits",
     "//foundation/aafwk/standard/interfaces/innerkits/want:want",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//third_party/bounds_checking_function:libsec_static",
     "//utils/native/base:utils",
@@ -165,6 +166,6 @@ ohos_shared_library("wifi_sdk") {
     ":wifi_sdk_header",
   ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_device.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_event.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hid2d.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_hotspot.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_p2p.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/c_adapter/wifi_c_utils.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h
similarity index 99%
rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h
index 95874b232..275f1553c 100644
--- a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h
+++ b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_device.h
@@ -271,4 +271,4 @@ public:
 };
 }  // namespace Wifi
 }  // namespace OHOS
-#endif
\ No newline at end of file
+#endif
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hid2d.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_hotspot.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_p2p.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/include/wifi_scan.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/define.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_device_callback.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_hotspot_callback.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_p2p_callback.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/i_wifi_scan_callback.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_ap_msg.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_errcode.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_hid2d_msg.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_msg.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_p2p_msg.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces/wifi_scan_msg.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_callback_stub.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_impl.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_device_proxy.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_callback_stub.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_impl.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hotspot_proxy.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_logger.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_callback_stub.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_impl.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_proxy.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_callback_stub.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_impl.h
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.cpp
diff --git a/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h b/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h
similarity index 100%
rename from interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h
rename to wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_scan_proxy.h
diff --git a/interfaces/kits/jskits/@ohos.wifi.d.ts b/wifi/interfaces/kits/jskits/@ohos.wifi.d.ts
similarity index 100%
rename from interfaces/kits/jskits/@ohos.wifi.d.ts
rename to wifi/interfaces/kits/jskits/@ohos.wifi.d.ts
diff --git a/interfaces/kits/jskits/@ohos.wifiext.d.ts b/wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts
similarity index 100%
rename from interfaces/kits/jskits/@ohos.wifiext.d.ts
rename to wifi/interfaces/kits/jskits/@ohos.wifiext.d.ts
diff --git a/services/wifi_standard/etc/init/BUILD.gn b/wifi/services/wifi_standard/etc/init/BUILD.gn
similarity index 96%
rename from services/wifi_standard/etc/init/BUILD.gn
rename to wifi/services/wifi_standard/etc/init/BUILD.gn
index 26badebad..7fb5b20fe 100644
--- a/services/wifi_standard/etc/init/BUILD.gn
+++ b/wifi/services/wifi_standard/etc/init/BUILD.gn
@@ -20,6 +20,6 @@ group("etc") {
 ohos_prebuilt_etc("wifi_standard.cfg") {
   source = "wifi_standard.cfg"
   relative_install_dir = "init"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/etc/init/wifi_standard.cfg b/wifi/services/wifi_standard/etc/init/wifi_standard.cfg
similarity index 100%
rename from services/wifi_standard/etc/init/wifi_standard.cfg
rename to wifi/services/wifi_standard/etc/init/wifi_standard.cfg
diff --git a/services/wifi_standard/ipc_framework/cRPC/BUILD.gn b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn
similarity index 88%
rename from services/wifi_standard/ipc_framework/cRPC/BUILD.gn
rename to wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn
index ffc2fe0df..e69d4040d 100644
--- a/services/wifi_standard/ipc_framework/cRPC/BUILD.gn
+++ b/wifi/services/wifi_standard/ipc_framework/cRPC/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ohos_static_library("crpc_server") {
   sources = [
@@ -34,7 +35,7 @@ ohos_static_library("crpc_server") {
     "//utils/native/base:utils",
   ]
   subsystem_name = "communication"
-  part_name = "wifi_standard"
+  part_name = "wifi"
 }
 
 ohos_static_library("crpc_client") {
@@ -48,7 +49,7 @@ ohos_static_library("crpc_client") {
     "include",
     "//utils/native/base/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
   ]
   cflags_cc = [ "-fno-rtti" ]
   deps = [
@@ -56,7 +57,7 @@ ohos_static_library("crpc_client") {
     "//utils/native/base:utils",
   ]
   subsystem_name = "communication"
-  part_name = "wifi_standard"
+  part_name = "wifi"
 }
 
 group("ipc_framework") {
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/client.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/client.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/client.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/common.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/common.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/common.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/common.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/context.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/context.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/context.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/evloop.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/evloop.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/evloop.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/hash_table.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/hash_table.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/log.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/log.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/log.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/net.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/net.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/net.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/serial.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/serial.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/serial.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/include/server.h b/wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/include/server.h
rename to wifi/services/wifi_standard/ipc_framework/cRPC/include/server.h
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/client.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/client.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/client.c
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/context.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/context.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/context.c
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/evloop.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/evloop.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/evloop.c
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/hash_table.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/net.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/net.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/net.c
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/serial.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/serial.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/serial.c
diff --git a/services/wifi_standard/ipc_framework/cRPC/src/server.c b/wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c
similarity index 100%
rename from services/wifi_standard/ipc_framework/cRPC/src/server.c
rename to wifi/services/wifi_standard/ipc_framework/cRPC/src/server.c
diff --git a/services/wifi_standard/sa_profile/1120.xml b/wifi/services/wifi_standard/sa_profile/1120.xml
similarity index 100%
rename from services/wifi_standard/sa_profile/1120.xml
rename to wifi/services/wifi_standard/sa_profile/1120.xml
diff --git a/services/wifi_standard/sa_profile/1121.xml b/wifi/services/wifi_standard/sa_profile/1121.xml
similarity index 100%
rename from services/wifi_standard/sa_profile/1121.xml
rename to wifi/services/wifi_standard/sa_profile/1121.xml
diff --git a/services/wifi_standard/sa_profile/1123.xml b/wifi/services/wifi_standard/sa_profile/1123.xml
similarity index 100%
rename from services/wifi_standard/sa_profile/1123.xml
rename to wifi/services/wifi_standard/sa_profile/1123.xml
diff --git a/services/wifi_standard/sa_profile/1124.xml b/wifi/services/wifi_standard/sa_profile/1124.xml
similarity index 100%
rename from services/wifi_standard/sa_profile/1124.xml
rename to wifi/services/wifi_standard/sa_profile/1124.xml
diff --git a/services/wifi_standard/sa_profile/BUILD.gn b/wifi/services/wifi_standard/sa_profile/BUILD.gn
similarity index 90%
rename from services/wifi_standard/sa_profile/BUILD.gn
rename to wifi/services/wifi_standard/sa_profile/BUILD.gn
index 8cf6218fb..35c2b0cd6 100644
--- a/services/wifi_standard/sa_profile/BUILD.gn
+++ b/wifi/services/wifi_standard/sa_profile/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -20,5 +20,5 @@ ohos_sa_profile("wifi_standard_sa_profile") {
     "1123.xml",
     "1124.xml",
   ]
-  part_name = "wifi_standard"
+  part_name = "wifi"
 }
diff --git a/wifi/services/wifi_standard/wifi_framework/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/BUILD.gn
new file mode 100644
index 000000000..64cb67a18
--- /dev/null
+++ b/wifi/services/wifi_standard/wifi_framework/BUILD.gn
@@ -0,0 +1,36 @@
+# 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("//foundation/communication/wifi/wifi/wifi.gni")
+
+group("wifi_system_ability") {
+  deps = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/sa_profile:wifi_standard_sa_profile",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_device_ability",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_hotspot_ability",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_p2p_ability",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_scan_ability",
+  ]
+}
+
+group("wifi_manage") {
+  deps = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap:wifi_ap_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p:wifi_p2p_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan:wifi_scan_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta:wifi_sta_service",
+  ]
+}
diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h
rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_country_freqs.h
diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h
rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_impl.h
diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp
diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h
rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.h
diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp
diff --git a/services/wifi_standard/wifi_framework/common/config/wifi_settings.h b/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/config/wifi_settings.h
rename to wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.h
diff --git a/services/wifi_standard/wifi_framework/common/include/permission_def.h b/wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/include/permission_def.h
rename to wifi/services/wifi_standard/wifi_framework/common/include/permission_def.h
diff --git a/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h b/wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h
rename to wifi/services/wifi_standard/wifi_framework/common/include/wifi_internal_msg.h
diff --git a/services/wifi_standard/wifi_framework/common/log/log_helper.c b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/log/log_helper.c
rename to wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c
diff --git a/services/wifi_standard/wifi_framework/common/log/log_helper.h b/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/log/log_helper.h
rename to wifi/services/wifi_standard/wifi_framework/common/log/log_helper.h
diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_log.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/log/wifi_log.h
rename to wifi/services/wifi_standard/wifi_framework/common/log/wifi_log.h
diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h
rename to wifi/services/wifi_standard/wifi_framework/common/log/wifi_log_tags.h
diff --git a/services/wifi_standard/wifi_framework/common/log/wifi_logger.h b/wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/log/wifi_logger.h
rename to wifi/services/wifi_standard/wifi_framework/common/log/wifi_logger.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/base_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/base_address.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/http_request.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/http_request.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/if_config.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/if_config.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/mac_address.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.h
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp b/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h b/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/net_helper/network_interface.h
rename to wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.h
diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp
diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h
rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.h
diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp
rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp
diff --git a/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h b/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h
rename to wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
similarity index 58%
rename from services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
index df64b0541..9e6c25a02 100644
--- a/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
 import("//build/ohos/sa_profile/sa_profile.gni")
 import("//build/ohos_var.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
-import("//foundation/communication/wifi/wifi.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ################################################################################
 
@@ -26,24 +26,25 @@ config("wifi_manager_service_header") {
     "//foundation/ace/ace_engine/frameworks/base/utils",
     "//foundation/ace/ace_engine/frameworks",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/dhcp_manage/mgr_service/interfaces",
-    "//foundation/communication/wifi/utils/inc",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$WIFI_ROOT_DIR/utils/inc",
     "${aafwk_path}/interfaces/innerkits/want/include",
     "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content",
     "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include",
@@ -73,7 +74,7 @@ config("wifi_manager_service_config") {
 }
 
 ohos_source_set("wifi_scan_service_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "wifi_scan_callback_proxy.cpp",
     "wifi_scan_death_recipient.cpp",
@@ -88,7 +89,7 @@ ohos_source_set("wifi_scan_service_impl") {
   external_deps = [ "ipc:ipc_core" ]
 }
 ohos_source_set("wifi_device_service_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "wifi_device_callback_proxy.cpp",
     "wifi_device_death_recipient.cpp",
@@ -102,7 +103,7 @@ ohos_source_set("wifi_device_service_impl") {
     ":wifi_manager_service_header",
   ]
 
-  if (wifi_standard_feature_with_p2p) {
+  if (wifi_feature_with_p2p) {
     defines = [ "WIFI_SUPPORT_P2P" ]
   }
 
@@ -110,7 +111,7 @@ ohos_source_set("wifi_device_service_impl") {
   external_deps = [ "ipc:ipc_core" ]
 }
 ohos_source_set("wifi_hotspot_service_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
     "wifi_hotspot_callback_proxy.cpp",
     "wifi_hotspot_death_recipient.cpp",
@@ -125,11 +126,11 @@ ohos_source_set("wifi_hotspot_service_impl") {
   external_deps = [ "ipc:ipc_core" ]
 }
 ohos_source_set("wifi_p2p_service_impl") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
     "wifi_hid2d_cfg.cpp",
     "wifi_hid2d_service_utils.cpp",
     "wifi_p2p_callback_proxy.cpp",
@@ -152,19 +153,19 @@ ohos_source_set("wifi_p2p_service_impl") {
 ohos_shared_library("wifi_manager_service") {
   install_enable = true
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp",
     "wifi_auth_center.cpp",
     "wifi_config_center.cpp",
     "wifi_dumper.cpp",
@@ -175,13 +176,13 @@ ohos_shared_library("wifi_manager_service") {
   ]
 
   deps = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/etc/init:etc",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "${aafwk_path}/interfaces/innerkits/base:base",
     "${aafwk_path}/interfaces/innerkits/want:want",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//foundation/communication/netmanager_base/services/netmanagernative:netsys_native_manager",
-    "//foundation/communication/wifi/services/wifi_standard/etc/init:etc",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
@@ -195,7 +196,7 @@ ohos_shared_library("wifi_manager_service") {
     "netmanager_base:net_conn_manager_if",
   ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 ohos_shared_library("wifi_device_ability") {
@@ -203,15 +204,15 @@ ohos_shared_library("wifi_device_ability") {
   deps = [
     ":wifi_device_service_impl",
     ":wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 ohos_shared_library("wifi_scan_ability") {
@@ -219,14 +220,14 @@ ohos_shared_library("wifi_scan_ability") {
   deps = [
     ":wifi_manager_service",
     ":wifi_scan_service_impl",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 ohos_shared_library("wifi_hotspot_ability") {
@@ -234,14 +235,14 @@ ohos_shared_library("wifi_hotspot_ability") {
   deps = [
     ":wifi_hotspot_service_impl",
     ":wifi_manager_service",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 ohos_shared_library("wifi_p2p_ability") {
@@ -249,13 +250,13 @@ ohos_shared_library("wifi_p2p_ability") {
   deps = [
     ":wifi_manager_service",
     ":wifi_p2p_service_impl",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/handler.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/handler.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/handler.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn
similarity index 50%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn
index 08e90689b..42c04af80 100644
--- a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/BUILD.gn
@@ -12,22 +12,23 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 config("wifi_fw_common_header") {
   include_dirs = [
     "idl_interface",
     "//utils/native/base/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/sdk/include",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/config",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/interface",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
   ]
 }
 
@@ -46,8 +47,8 @@ config("wifi_idl_cxx_config") {
 }
 
 ohos_source_set("wifi_utils") {
-  part_name = "wifi_standard"
-  sources = [ "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ]
+  part_name = "wifi"
+  sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp" ]
 
   configs = [
     ":wifi_idl_cxx_config",
@@ -56,15 +57,15 @@ ohos_source_set("wifi_utils") {
 }
 
 ohos_source_set("net_helper") {
-  part_name = "wifi_standard"
+  part_name = "wifi"
   sources = [
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
   ]
 
   configs = [
@@ -74,8 +75,8 @@ ohos_source_set("net_helper") {
 }
 
 ohos_source_set("log_helper") {
-  part_name = "wifi_standard"
-  sources = [ "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log/log_helper.c" ]
+  part_name = "wifi"
+  sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c" ]
 
   configs = [ ":wifi_fw_common_header" ]
 }
@@ -83,8 +84,8 @@ ohos_source_set("log_helper") {
 ohos_shared_library("wifi_idl_client") {
   install_enable = true
   sources = [
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
     "idl_interface/i_wifi.c",
     "idl_interface/i_wifi_chip.c",
     "idl_interface/i_wifi_hotspot_iface.c",
@@ -109,7 +110,7 @@ ohos_shared_library("wifi_idl_client") {
     ":log_helper",
     ":net_helper",
     ":wifi_utils",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client",
     "//utils/native/base:utils",
   ]
 
@@ -124,6 +125,6 @@ ohos_shared_library("wifi_idl_client") {
     "-Wl,-E",
   ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_event_p2p_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_struct.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/supplicant_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_error_no.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_define.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_struct.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_event_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_scan_param.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_request.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.h
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
new file mode 100644
index 000000000..7be235784
--- /dev/null
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
@@ -0,0 +1,86 @@
+# 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("//foundation/communication/wifi/wifi/wifi.gni")
+
+ohos_shared_library("wifi_ap_service") {
+  install_enable = true
+  sources = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
+    "../common/handler.cpp",
+    "../common/internal_message.cpp",
+    "../common/message_queue.cpp",
+    "../common/state.cpp",
+    "../common/state_machine.cpp",
+    "ap_config_use.cpp",
+    "ap_idle_state.cpp",
+    "ap_interface.cpp",
+    "ap_monitor.cpp",
+    "ap_root_state.cpp",
+    "ap_service.cpp",
+    "ap_started_state.cpp",
+    "ap_state_machine.cpp",
+    "ap_stations_manager.cpp",
+    "wifi_ap_nat_manager.cpp",
+  ]
+
+  include_dirs = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface",
+    "//utils/native/base/include",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$WIFI_ROOT_DIR/utils/inc",
+  ]
+
+  cflags_cc = [
+    "-std=c++17",
+    "-Wall",
+  ]
+
+  ldflags = [
+    "-fPIC",
+    "-Wl,-E",
+  ]
+
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+
+  deps = [
+    "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
+    "//utils/native/base:utils",
+  ]
+
+  defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ]
+
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h
similarity index 98%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h
index 3a832bf77..54c7c5417 100644
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_define.h
@@ -54,4 +54,4 @@ enum class ApStatemachineEvent {
 using HandlerMethod = void(ApStatemachineEvent, int, int, const std::any &);
 }
 } // namespace OHOS
-#endif /* OHOS_AP_DEFINE_H */
\ No newline at end of file
+#endif /* OHOS_AP_DEFINE_H */
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_macro.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp
similarity index 99%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp
index a3b9277a6..8d6e28a33 100644
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp
@@ -132,4 +132,4 @@ void ApMonitor::UnregisterHandler(const std::string &iface)
     }
 }
 }  // namespace Wifi
-}  // namespace OHOS
\ No newline at end of file
+}  // namespace OHOS
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp
similarity index 99%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp
index 29f4b02b2..1c01a7e3c 100644
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp
@@ -343,4 +343,4 @@ void ApStartedState::ProcessCmdDisconnectStation(InternalMessage &msg) const
     m_ApStateMachine.m_ApStationsManager.DisConnectStation(staInfo);
 }
 }  // namespace Wifi
-}  // namespace OHOS
\ No newline at end of file
+}  // namespace OHOS
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp
similarity index 99%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp
index 4fa82b555..6c2cd08b6 100644
--- a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp
@@ -170,4 +170,4 @@ void ApStateMachine::RegisterEventHandler()
     m_ApStationsManager.RegisterEventHandler(std::bind(&ApStateMachine::BroadCastStationChange, this, _1, _2));
 }
 }  // namespace Wifi
-}  // namespace OHOS
\ No newline at end of file
+}  // namespace OHOS
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/i_ap_service_callbacks.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_callback_proxy.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_death_recipient.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_dumper.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_cfg.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_callback_proxy.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_death_recipient.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_service_impl.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_hotspot_stub.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.h
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
new file mode 100644
index 000000000..945fc1e3b
--- /dev/null
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/BUILD.gn
@@ -0,0 +1,119 @@
+# 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("//foundation/communication/wifi/wifi/wifi.gni")
+
+ohos_shared_library("wifi_p2p_service") {
+  install_enable = true
+  sources = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp",
+    "authorizing_negotiation_request_state.cpp",
+    "group_formed_state.cpp",
+    "group_negotiation_state.cpp",
+    "invitation_received_state.cpp",
+    "invitation_request_state.cpp",
+    "p2p_default_state.cpp",
+    "p2p_disabled_state.cpp",
+    "p2p_disabling_state.cpp",
+    "p2p_enabled_state.cpp",
+    "p2p_enabling_state.cpp",
+    "p2p_group_formation_state.cpp",
+    "p2p_group_join_state.cpp",
+    "p2p_group_operating_state.cpp",
+    "p2p_idle_state.cpp",
+    "p2p_interface.cpp",
+    "p2p_inviting_state.cpp",
+    "p2p_monitor.cpp",
+    "p2p_state_machine.cpp",
+    "provision_discovery_state.cpp",
+    "wifi_p2p_device_manager.cpp",
+    "wifi_p2p_dns_sd_service_info.cpp",
+    "wifi_p2p_dns_sd_service_request.cpp",
+    "wifi_p2p_dns_sd_service_response.cpp",
+    "wifi_p2p_dns_txt_record.cpp",
+    "wifi_p2p_group_info_proxy.cpp",
+    "wifi_p2p_group_manager.cpp",
+    "wifi_p2p_service.cpp",
+    "wifi_p2p_service_manager.cpp",
+    "wifi_p2p_service_request_list.cpp",
+    "wifi_p2p_service_response_list.cpp",
+    "wifi_p2p_temp_disc_event.cpp",
+    "wifi_p2p_upnp_service_info.cpp",
+    "wifi_p2p_upnp_service_request.cpp",
+    "wifi_p2p_upnp_service_response.cpp",
+  ]
+
+  include_dirs = [
+    "./",
+    "//utils/native/base/include",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+  ]
+
+  cflags_cc = [
+    "-std=c++17",
+    "-Wall",
+  ]
+
+  ldflags = [
+    "-fPIC",
+    "-Wl,-E",
+  ]
+
+  defines = [ "AP_NOT_DIRECT_USE_DHCP" ]
+  if (product_name == "rk3568") {
+    defines += [ "PRODUCT_RK" ]
+  }
+
+  external_deps = [
+    "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
+    "netmanager_base:net_conn_manager_if",
+  ]
+
+  deps = [
+    "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "//utils/native/base:utils",
+  ]
+
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/abstract_ui.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/ip2p_service_callbacks.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_define.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_macro.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_callback_proxy.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_death_recipient.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_service_impl.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p_stub.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_protect_manager.h
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
new file mode 100644
index 000000000..509ec195b
--- /dev/null
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
@@ -0,0 +1,77 @@
+# 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("//foundation/communication/wifi/wifi/wifi.gni")
+
+ohos_shared_library("wifi_scan_service") {
+  install_enable = true
+  sources = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "../common/handler.cpp",
+    "../common/internal_message.cpp",
+    "../common/message_queue.cpp",
+    "../common/state.cpp",
+    "../common/state_machine.cpp",
+    "scan_interface.cpp",
+    "scan_monitor.cpp",
+    "scan_service.cpp",
+    "scan_state_machine.cpp",
+  ]
+
+  include_dirs = [
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include",
+  ]
+
+  deps = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "//utils/native/base:utils",
+  ]
+
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  cflags_cc = [
+    "-std=c++17",
+    "-fno-rtti",
+  ]
+
+  ldflags = [
+    "-fPIC",
+    "-Wl,-E",
+  ]
+
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/iscan_service_callbacks.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_common.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_callback_proxy.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_death_recipient.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_service_impl.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan_stub.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.h
diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
new file mode 100644
index 000000000..f4d819693
--- /dev/null
+++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
@@ -0,0 +1,94 @@
+# 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("//foundation/communication/wifi/wifi/wifi.gni")
+
+ohos_shared_library("wifi_sta_service") {
+  install_enable = true
+  sources = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "../common/handler.cpp",
+    "../common/internal_message.cpp",
+    "../common/message_queue.cpp",
+    "../common/state.cpp",
+    "../common/state_machine.cpp",
+    "sta_auto_connect_service.cpp",
+    "sta_interface.cpp",
+    "sta_monitor.cpp",
+    "sta_network_check.cpp",
+    "sta_saved_device_appraisal.cpp",
+    "sta_service.cpp",
+    "sta_state_machine.cpp",
+  ]
+  include_dirs = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include",
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
+    "$WIFI_ROOT_DIR/utils/inc",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+  ]
+
+  cflags_cc = [
+    "-std=c++17",
+    "-fno-rtti",
+  ]
+
+  ldflags = [
+    "-fPIC",
+    "-Wl,-E",
+  ]
+
+  deps = [
+    "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
+    "//utils/native/base:utils",
+  ]
+
+  external_deps = [
+    "hiviewdfx_hilog_native:libhilog",
+    "netmanager_base:net_conn_manager_if",
+  ]
+
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/ista_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_define.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_device_appraisal.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_callback.h
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp
diff --git a/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h
similarity index 100%
rename from services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h
rename to wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.h
diff --git a/services/wifi_standard/wifi_hal/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/BUILD.gn
similarity index 66%
rename from services/wifi_standard/wifi_hal/BUILD.gn
rename to wifi/services/wifi_standard/wifi_hal/BUILD.gn
index f420d6c0e..f101142bd 100644
--- a/services/wifi_standard/wifi_hal/BUILD.gn
+++ b/wifi/services/wifi_standard/wifi_hal/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import("//foundation/communication/wifi/wifi.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ohos_executable("wifi_hal_service") {
   install_enable = true
@@ -45,14 +45,14 @@ ohos_executable("wifi_hal_service") {
 
   include_dirs = [
     "//utils/native/base/include",
-    "//foundation/communication/wifi/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_hal",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_hal/common",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
     "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/",
     "//third_party/bounds_checking_function/include/",
@@ -61,21 +61,21 @@ ohos_executable("wifi_hal_service") {
   ]
 
   deps = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/etc/init:etc",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//drivers/peripheral/wlan/hal:wifi_hal",
-    "//foundation/communication/wifi/services//wifi_standard/wifi_hal/etc/init:etc",
-    "//foundation/communication/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_server",
     "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_client",
     "//utils/native/base:utils",
   ]
 
   cflags_cc = [ "-fno-rtti" ]
-  defines = [ "AP_INTF=\"$wifi_standard_feature_with_ap_intf\"" ]
+  defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ]
   if (product_name == "rk3568") {
     defines += [ "PRODUCT_RK" ]
   }
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 
diff --git a/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c
rename to wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c
diff --git a/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h b/wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h
rename to wifi/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.h
diff --git a/services/wifi_standard/wifi_hal/common/wifi_log.h b/wifi/services/wifi_standard/wifi_hal/common/wifi_log.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/common/wifi_log.h
rename to wifi/services/wifi_standard/wifi_hal/common/wifi_log.h
diff --git a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn b/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn
similarity index 92%
rename from services/wifi_standard/wifi_hal/etc/init/BUILD.gn
rename to wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn
index ce46f1a7b..5618b7462 100644
--- a/services/wifi_standard/wifi_hal/etc/init/BUILD.gn
+++ b/wifi/services/wifi_standard/wifi_hal/etc/init/BUILD.gn
@@ -25,14 +25,14 @@ group("etc") {
 ohos_prebuilt_etc("wifi_hal_service.cfg") {
   source = "wifi_hal_service.cfg"
   relative_install_dir = "init"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 
 ohos_prebuilt_etc("wpa_supplicant.conf") {
   source = "wpa_supplicant.conf"
   relative_install_dir = "wifi"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 
@@ -42,13 +42,13 @@ ohos_prebuilt_etc("hostapd.conf") {
     source = "default_conf/hostapd.conf"
   }
   relative_install_dir = "wifi"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
 
 ohos_prebuilt_etc("p2p_supplicant.conf") {
   source = "p2p_supplicant.conf"
   relative_install_dir = "wifi"
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf
similarity index 100%
rename from services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf
rename to wifi/services/wifi_standard/wifi_hal/etc/init/default_conf/hostapd.conf
diff --git a/services/wifi_standard/wifi_hal/etc/init/hostapd.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/hostapd.conf
similarity index 100%
rename from services/wifi_standard/wifi_hal/etc/init/hostapd.conf
rename to wifi/services/wifi_standard/wifi_hal/etc/init/hostapd.conf
diff --git a/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf
similarity index 100%
rename from services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf
rename to wifi/services/wifi_standard/wifi_hal/etc/init/p2p_supplicant.conf
diff --git a/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg b/wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg
similarity index 100%
rename from services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg
rename to wifi/services/wifi_standard/wifi_hal/etc/init/wifi_hal_service.cfg
diff --git a/services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf b/wifi/services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf
similarity index 100%
rename from services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf
rename to wifi/services/wifi_standard/wifi_hal/etc/init/wpa_supplicant.conf
diff --git a/services/wifi_standard/wifi_hal/main.c b/wifi/services/wifi_standard/wifi_hal/main.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/main.c
rename to wifi/services/wifi_standard/wifi_hal/main.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_adapter.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_adapter.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_adapter.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_adapter.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_adapter.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_base_interface.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_base_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_base_interface.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_base_interface.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_callback.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_callback.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_callback.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_callback.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_define.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_define.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_define.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c
similarity index 99%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c
index b1680ac85..27ac14f5a 100644
--- a/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c
+++ b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c
@@ -702,4 +702,4 @@ void ReleaseHostapdDev(void)
         free(g_hostapdHalDev);
         g_hostapdHalDev = NULL;
     }
-}
\ No newline at end of file
+}
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module_manage.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_module_manage.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_module_manage.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_p2p_struct.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_struct.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_struct.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_struct.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_struct.h
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c b/wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c
diff --git a/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h b/wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h
similarity index 100%
rename from services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h
rename to wifi/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.h
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn
similarity index 74%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn
index 696728043..a2e45a038 100644
--- a/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn
+++ b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,24 +12,24 @@
 # limitations under the License.
 
 import("//build/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
+import("//foundation/communication/wifi/wifi/wifi.gni")
 module_output_path = "wifi_standard/crpc_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/tests/wifi_standard/ipc_framework/cRPC/unittest",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/ipc_framework/cRPC/unittest",
   ]
 }
 
 ohos_unittest("crpc_unittest") {
   module_out_path = module_output_path
   sources = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/context.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/net.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/src/serial.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/context.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/hash_table.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/net.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/src/serial.c",
     "context_test.cpp",
     "hash_table_test.cpp",
     "net_test.cpp",
@@ -38,7 +38,7 @@ ohos_unittest("crpc_unittest") {
   ]
 
   include_dirs = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
   ]
 
@@ -54,7 +54,7 @@ ohos_unittest("crpc_unittest") {
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
   testonly = true
 }
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.cpp
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/context_test.h
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.cpp
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/hash_table_test.h
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.cpp
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/net_test.h
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/rpc_test_main.cpp
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.cpp
diff --git a/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h b/wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h
similarity index 100%
rename from tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h
rename to wifi/tests/wifi_standard/ipc_framework/cRPC/unittest/serial_test.h
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn
similarity index 59%
rename from tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn
index 81d472a37..6339ee7d5 100644
--- a/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn
+++ b/wifi/tests/wifi_standard/wifi_framework/common/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,30 +12,30 @@
 # limitations under the License.
 
 import("//build/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
+import("//foundation/communication/wifi/wifi/wifi.gni")
 module_output_path = "wifi_standard/common_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_framework/common/unittest",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/common/unittest",
   ]
 }
 
 ohos_unittest("common_unittest") {
   module_out_path = module_output_path
   sources = [
-    "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
     "common_test.cpp",
     "wifi_config_file_test.cpp",
     "wifi_global_func_test.cpp",
@@ -46,12 +46,12 @@ ohos_unittest("common_unittest") {
 
   include_dirs = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config",
-    "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
   ]
 
   deps = [ "//utils/native/base:utils" ]
@@ -64,7 +64,7 @@ ohos_unittest("common_unittest") {
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
   testonly = true
 }
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/common_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_config_file_test.h
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_global_func_test.h
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_ip_tools_test.h
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_log_helper_test.h
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/common/unittest/wifi_network_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn
similarity index 51%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn
index 188a0375d..4bef43629 100644
--- a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,39 +12,39 @@
 # limitations under the License.
 
 import("//build/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
+import("//foundation/communication/wifi/wifi/wifi.gni")
 module_output_path = "wifi_standard/idl_client_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest",
   ]
 }
 
 ohos_unittest("idl_client_unittest") {
   module_out_path = module_output_path
   sources = [
-    "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_chip.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_hotspot_iface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_iface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_p2p_iface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_public_func.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_sta_iface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface/i_wifi_supplicant_iface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_ap_hal_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_base_hal_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_chip_hal_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_client.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_idl_inner_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_p2p_hal_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_sta_hal_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/wifi_supplicant_hal_interface.cpp",
     "idl_client_test_main.cpp",
     "wifi_ap_hal_interface_test.cpp",
     "wifi_base_hal_interface_test.cpp",
@@ -57,22 +57,22 @@ ohos_unittest("idl_client_unittest") {
   ]
 
   include_dirs = [
-    "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
     "//utils/native/base/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
   ]
 
   deps = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client",
     "//utils/native/base:utils",
   ]
 
@@ -84,7 +84,7 @@ ohos_unittest("idl_client_unittest") {
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
   testonly = true
 }
@@ -92,34 +92,34 @@ ohos_unittest("idl_client_unittest") {
 ohos_unittest("mock_wifi_hal_service") {
   module_out_path = module_output_path
   sources = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/main.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/main.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c",
     "mock_wifi_hal_service.c",
   ]
 
   include_dirs = [
     "//utils/native/base/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
   ]
 
   deps = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//utils/native/base:utils",
   ]
@@ -128,7 +128,7 @@ ohos_unittest("mock_wifi_hal_service") {
 
   defines = []
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
   testonly = true
 }
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/idl_client_test_main.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/mock_wifi_hal_service.c
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_ap_hal_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_base_hal_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_chip_hal_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_client_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_idl_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_p2p_hal_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_sta_hal_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/idl_client/unittest/wifi_supplicant_hal_interface_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
similarity index 61%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
index 74fabcaba..3e5a200ad 100644
--- a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -13,34 +13,34 @@
 
 import("//build/test.gni")
 import("//foundation/appexecfwk/standard/appexecfwk.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ################################################################################
 
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
 module_output_path = "wifi_standard/manager_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_framework/wifi_manage/unittest",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/unittest",
   ]
 }
 
 ohos_unittest("manager_unittest") {
   module_out_path = module_output_path
   sources = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_common_event_helper.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_helper.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_permission_utils.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_auth_center.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_config_center.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_internal_event_dispatcher.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_manager.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_net_agent.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_service_manager.cpp",
     "wifi_auth_center_test.cpp",
     "wifi_config_center_test.cpp",
     "wifi_internal_event_dispatcher_test.cpp",
@@ -50,22 +50,22 @@ ohos_unittest("manager_unittest") {
   ]
 
   include_dirs = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/net_helper",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/utils",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/log",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/common/config",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware",
-    "$SUBSYSTEM_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
     "//utils/native/base/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
@@ -79,15 +79,15 @@ ohos_unittest("manager_unittest") {
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
     "//base/security/access_token/interfaces/innerkits/accesstoken/include",
     "//foundation/communication/netmanager_base/services/netmanagernative/include/netsys",
-    "//foundation/communication/wifi/utils/inc",
+    "$WIFI_ROOT_DIR/utils/inc",
   ]
 
   deps = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
     "${aafwk_path}/interfaces/innerkits/base:base",
     "${aafwk_path}/interfaces/innerkits/want:want",
-    "//foundation/communication/wifi/utils/src:wifi_utils",
     "//utils/native/base:utils",
   ]
 
@@ -105,7 +105,7 @@ ohos_unittest("manager_unittest") {
   ]
   configs = [ ":module_private_config" ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
   testonly = true
 }
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_auth_center_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_config_center_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_internal_event_dispatcher_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manage_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_manager_service_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_mock_p2p_service.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_service_manager_test.h
diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
new file mode 100644
index 000000000..cbe49b8fe
--- /dev/null
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/BUILD.gn
@@ -0,0 +1,113 @@
+# 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/test.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
+config("module_private_config") {
+  visibility = [ ":*" ]
+  include_dirs = [
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+  ]
+}
+ohos_unittest("WifiApServiceTest") {
+  module_out_path = "wifi_standard/ap_test"
+  sources = [
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager.cpp",
+    "./Mock/mock_network_interface.cpp",
+    "./Mock/mock_system_interface.cpp",
+    "./Mock/mock_wifi_ap_hal_interface.cpp",
+    "./Mock/mock_wifi_settings.cpp",
+    "./Mock/operator_overload.cpp",
+    "ap_config_use_test.cpp",
+    "ap_idle_state_test.cpp",
+    "ap_monitor_test.cpp",
+    "ap_root_state_test.cpp",
+    "ap_service_test.cpp",
+    "ap_started_state_test.cpp",
+    "ap_state_machine_test.cpp",
+    "ap_stations_manager_test.cpp",
+    "global_test.cpp",
+    "wifi_ap_nat_manager_test.cpp",
+    "wifi_ap_test.cpp",
+  ]
+  include_dirs = [
+    "./",
+    "../",
+    "./Mock/",
+    "//utils/native/base/include",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/utils/inc",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "//third_party/googletest/googlemock/include",
+    "//third_party/googletest/googletest/include",
+  ]
+  ldflags = [
+    "-fPIC",
+    "-Wl,-E",
+    "-Wl,--wrap=system",
+    "--coverage",
+  ]
+  deps = [
+    "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
+    "//third_party/googletest:gmock_main",
+    "//utils/native/base:utils",
+  ]
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ]
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
+group("unittest") {
+  testonly = true
+  deps = []
+  deps += [ ":WifiApServiceTest" ]
+}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h
similarity index 96%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h
index 5484ac371..97c07dc4e 100644
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_config_use.h
@@ -32,7 +32,9 @@ public:
     MOCK_CONST_METHOD1(IsValid5GHz, bool(int freq));
     MOCK_CONST_METHOD2(CheckBandChannel, void(HotspotConfig &apConfig, const ChannelsTable &validChanTable));
     MOCK_CONST_METHOD1(TransformFrequencyIntoChannel, int(int freq));
+private:
+    using ApConfigUse::CheckBandChannel;
 };
 } // namespace Wifi
 } // namespace OHOS
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_idle_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_monitor.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_root_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_service.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_started_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_state_machine.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_ap_stations_manager.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_network_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_pendant.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_system_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_ap_nat_manager.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h
similarity index 91%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h
index 436c9040c..6a6baea90 100644
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/mock_wifi_settings.h
@@ -51,6 +51,8 @@ public:
     virtual int GetValidChannels(ChannelsTable &channelsInfo) = 0;
     virtual int ClearValidChannels() = 0;
     virtual int GetApMaxConnNum() = 0;
+    virtual int SyncHotspotConfig() = 0;
+    virtual int SetDefaultFrequenciesByCountryBand(const BandType band, std::vector<int> &frequencies) = 0;
 };
 
 class WifiSettings : public MockWifiSettings {
@@ -76,7 +78,9 @@ public:
     MOCK_METHOD1(GetValidChannels, int(ChannelsTable &channelsInfo));
     MOCK_METHOD0(ClearValidChannels, int());
     MOCK_METHOD0(GetApMaxConnNum, int());
+    MOCK_METHOD0(SyncHotspotConfig, int());
+    MOCK_METHOD2(SetDefaultFrequenciesByCountryBand, int(const BandType band, std::vector<int> &frequencies));
 };
 } /* namespace Wifi */
 } /* namespace OHOS */
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/Mock/operator_overload.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_config_use_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_idle_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_monitor_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_root_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp
similarity index 99%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp
index 401da0a19..3ec187086 100644
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state_test.cpp
@@ -492,4 +492,4 @@ HWTEST_F(ApStartedState_test, ExecuteStateMsg_FAILED, TestSize.Level1)
     EXPECT_FALSE(pApStartedState->ExecuteStateMsg(nullptr));
 }
 } // namespace Wifi
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_state_machine_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_stations_manager_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/global_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_nat_manager_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_ap/wifi_ap_test.cpp
diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
new file mode 100644
index 000000000..4dbeb6c66
--- /dev/null
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/BUILD.gn
@@ -0,0 +1,163 @@
+# 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/test.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
+config("module_private_config") {
+  visibility = [ ":*" ]
+  include_dirs = [
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test",
+  ]
+}
+
+ohos_unittest("wifi_p2p_test") {
+  module_out_path = "wifi_standard/p2p_test"
+  sources = [
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_hid2d_msg.cpp",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/src/wifi_p2p_msg.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_config_file_spec.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config/wifi_settings.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/dhcpd_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/if_config.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils/wifi_global_func.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/wifi_broadcast_helper.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_hid2d_service_utils.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/authorizing_negotiation_request_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_formed_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/group_negotiation_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_received_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/invitation_request_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_default_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabled_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_disabling_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabled_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_enabling_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_formation_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_join_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_group_operating_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_idle_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_inviting_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_monitor.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/p2p_state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/provision_discovery_state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_device_manager.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_info.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_request.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_sd_service_response.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_dns_txt_record.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_info_proxy.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_group_manager.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_manager.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_request_list.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_service_response_list.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_temp_disc_event.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_info.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_request.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/wifi_p2p_upnp_service_response.cpp",
+    "./Mock/mock_wifi_p2p_hal_interface.cpp",
+    "authorizing_negotiation_request_state_test.cpp",
+    "global_test.cpp",
+    "group_formed_state_test.cpp",
+    "group_negotiation_state_test.cpp",
+    "invitation_recelved_state_test.cpp",
+    "invitation_request_state_test.cpp",
+    "p2p_default_state_test.cpp",
+    "p2p_disabled_state_test.cpp",
+    "p2p_disabling_state_test.cpp",
+    "p2p_enabled_state_test.cpp",
+    "p2p_enabling_state_test.cpp",
+    "p2p_group_formation_state_test.cpp",
+    "p2p_group_join_state_test.cpp",
+    "p2p_group_operating_state_test.cpp",
+    "p2p_idle_state_test.cpp",
+    "p2p_inviting_state_test.cpp",
+    "p2p_monitor_test.cpp",
+    "p2p_state_machine_test.cpp",
+    "provision_discovery_state_test.cpp",
+    "wifi_p2p_device_manager_test.cpp",
+    "wifi_p2p_dns_sd_service_info_test.cpp",
+    "wifi_p2p_dns_sd_service_request_test.cpp",
+    "wifi_p2p_dns_sd_service_response_test.cpp",
+    "wifi_p2p_group_info_proxy_test.cpp",
+    "wifi_p2p_group_manager_test.cpp",
+    "wifi_p2p_service_manager_test.cpp",
+    "wifi_p2p_service_request_list_test.cpp",
+    "wifi_p2p_service_response_list_test.cpp",
+    "wifi_p2p_service_test.cpp",
+    "wifi_p2p_test_entry.cpp",
+    "wifi_p2p_upnp_service_info_test.cpp",
+    "wifi_p2p_upnp_service_request_test.cpp",
+    "wifi_p2p_upnp_service_response_test.cpp",
+  ]
+
+  include_dirs = [
+    "./",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
+    "./Mock",
+    "//utils/native/base/include",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "//third_party/googletest/googlemock/include",
+    "//third_party/googletest/googletest/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+  ]
+
+  deps = [
+    "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "//third_party/googletest:gmock_main",
+    "//utils/native/base:utils",
+  ]
+  external_deps = [
+    "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
+    "netmanager_base:net_conn_manager_if",
+  ]
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
+
+group("unittest") {
+  testonly = true
+  deps = []
+  deps += [ ":wifi_p2p_test" ]
+}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_authorizing_negotiation_request_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_formed_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_group_negotiation_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_recelved_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_invitation_request_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_default_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabled_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_disabling_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabled_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_enabling_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_formation_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_join_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_group_operating_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_idle_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_inviting_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_monitor.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_p2p_state_machine.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_provision_discovery_state.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_device_manager.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_p2p_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/Mock/mock_wifi_settings.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/authorizing_negotiation_request_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/global_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_formed_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/group_negotiation_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_recelved_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/invitation_request_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/mock_p2p_pendant.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_default_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabled_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_disabling_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabled_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_enabling_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_formation_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_join_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_group_operating_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_idle_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_inviting_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_monitor_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/p2p_state_machine_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/provision_discovery_state_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_device_manager_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_info_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_request_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_dns_sd_service_response_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_info_proxy_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_group_manager_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_manager_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_request_list_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_response_list_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_test_entry.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_info_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_request_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_p2p/test/wifi_p2p_upnp_service_response_test.cpp
diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
new file mode 100644
index 000000000..673ae37d9
--- /dev/null
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn
@@ -0,0 +1,101 @@
+# 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/test.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
+module_output_path = "wifi_standard/scan_test"
+
+config("module_private_config") {
+  visibility = [ ":*" ]
+  include_dirs = [
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+  ]
+}
+
+ohos_unittest("wifi_scan_unittest") {
+  module_out_path = module_output_path
+  sources = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/base_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv4_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ipv6_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/mac_address.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/network_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine.cpp",
+    "Mock/mock_scan_service.cpp",
+    "Mock/mock_scan_state_machine.cpp",
+    "Mock/mock_wifi_manager.cpp",
+    "Mock/mock_wifi_settings.cpp",
+    "Mock/mock_wifi_sta_hal_interface.cpp",
+    "Mock/mock_wifi_supplicant_hal_interface.cpp",
+    "global_test.cpp",
+    "scan_interface_test.cpp",
+    "scan_monitor_test.cpp",
+    "scan_service_test.cpp",
+    "scan_state_machine_test.cpp",
+    "wifi_scan_test.cpp",
+  ]
+
+  include_dirs = [
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/sdk/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/hardware/libhardware/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/frameworks/native/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libutils/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/base/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/libbase/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/depends/include/system/core/libnetutils/include/netutils",
+    "//third_party/googletest/googlemock/include",
+    "//third_party/googletest/googletest/include",
+  ]
+  deps = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "//third_party/googletest:gmock_main",
+    "//utils/native/base:utils",
+  ]
+  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
+
+group("unittest") {
+  testonly = true
+  deps = [ ":wifi_scan_unittest" ]
+}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_service.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_scan_state_machine.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_manager.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_sta_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_supplicant_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/global_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_monitor_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_state_machine_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_scan/wifi_scan_test.cpp
diff --git a/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
new file mode 100644
index 000000000..baf4e7a41
--- /dev/null
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn
@@ -0,0 +1,128 @@
+# 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/test.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
+module_output_path = "wifi_standard/sta_test"
+
+defines = []
+defines += [ "OHOS_WIFI_STA_TEST" ]
+
+config("module_private_config") {
+  visibility = [ ":*" ]
+  include_dirs = [
+    "//utils/native/base/include",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+  ]
+}
+
+ohos_unittest("wifi_sta_unittest") {
+  module_out_path = module_output_path
+  sources = [
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log/log_helper.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/http_request.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper/ip_tools.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/handler.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/internal_message.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/message_queue.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common/state_machine.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp",
+    "Mock/mock_dhcp_service.cpp",
+    "Mock/mock_if_config.cpp",
+    "Mock/mock_mac_address.cpp",
+    "Mock/mock_sta_auto_connect_service.cpp",
+    "Mock/mock_sta_network_check.cpp",
+    "Mock/mock_sta_state_machine.cpp",
+    "Mock/mock_wifi_chip_hal_interface.cpp",
+    "Mock/mock_wifi_manager.cpp",
+    "Mock/mock_wifi_settings.cpp",
+    "Mock/mock_wifi_sta_hal_interface.cpp",
+    "Mock/mock_wifi_supplicant_hal_interface.cpp",
+    "global_test.cpp",
+    "sta_auto_connect_service_test.cpp",
+    "sta_interface_test.cpp",
+    "sta_monitor_test.cpp",
+    "sta_network_check_test.cpp",
+    "sta_saved_device_appraisal_test.cpp",
+    "sta_service_test.cpp",
+    "sta_state_machine_test.cpp",
+    "wifi_sta_test.cpp",
+  ]
+
+  include_dirs = [
+    "./",
+    "./Mock",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/net_conf",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/include",
+    "$WIFI_ROOT_DIR/interfaces/innerkits/native_cpp/wifi_standard/interfaces",
+    "$WIFI_ROOT_DIR/services/wifi_standard/interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/net_helper",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/config",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/utils",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client/idl_interface",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_aware",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_scan",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$DHCP_ROOT_DIR/services/mgr_service/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/include",
+    "$DHCP_ROOT_DIR/interfaces/innerkits/native_cpp/interfaces",
+    "//third_party/googletest/googlemock/include",
+    "//third_party/googletest/googletest/include",
+    "//base/notification/ces_standard/cesfwk/kits/native/include",
+    "//utils/native/base/include",
+    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
+    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
+    "//foundation/ace/ace_engine/frameworks/base/utils",
+    "//foundation/ace/ace_engine/frameworks",
+    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk/",
+    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/",
+    "//foundation/aafwk/aafwk_lite/interfaces/kits/want_lite/",
+    "$WIFI_ROOT_DIR/utils/inc",
+  ]
+
+  deps = [
+    "$DHCP_ROOT_DIR/services/mgr_service:dhcp_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/idl_client:wifi_idl_client",
+    "$WIFI_ROOT_DIR/utils/src:wifi_utils",
+    "//third_party/googletest:gmock_main",
+    "//utils/native/base:utils",
+  ]
+  external_deps = [
+    "hiviewdfx_hilog_native:libhilog",
+    "netmanager_base:net_conn_manager_if",
+  ]
+  part_name = "wifi"
+  subsystem_name = "communication"
+}
+
+group("unittest") {
+  testonly = true
+  deps = [ ":wifi_sta_unittest" ]
+}
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_device_appraisal.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_dhcp_service.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_if_config.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_mac_address.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_auto_connect_service.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_monitor.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_network_check.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_service.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_sta_state_machine.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_chip_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_manager.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h
similarity index 99%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h
index eb1aa29b2..d0fff62f8 100644
--- a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h
+++ b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_settings.h
@@ -118,4 +118,4 @@ public:
 }  // namespace OHOS
 }  // namespace Wifi
 
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_sta_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_wifi_supplicant_hal_interface.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/global_test.h
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_auto_connect_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_monitor_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_network_check_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_saved_device_appraisal_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine_test.cpp
diff --git a/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp b/wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp
rename to wifi/tests/wifi_standard/wifi_framework/wifi_manage/wifi_sta/wifi_sta_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/BUILD.gn b/wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn
similarity index 56%
rename from tests/wifi_standard/wifi_hal/unittest/BUILD.gn
rename to wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn
index fd62c0c9b..fb1a94f05 100644
--- a/tests/wifi_standard/wifi_hal/unittest/BUILD.gn
+++ b/wifi/tests/wifi_standard/wifi_hal/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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
@@ -12,43 +12,43 @@
 # limitations under the License.
 
 import("//build/test.gni")
-SUBSYSTEM_DIR = "//foundation/communication/wifi"
+import("//foundation/communication/wifi/wifi/wifi.gni")
 module_output_path = "wifi_standard/wifi_hal_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/tests/wifi_standard/wifi_hal/unittest",
+    "$WIFI_ROOT_DIR/tests/wifi_standard/wifi_hal/unittest",
   ]
 }
 
 ohos_unittest("wifi_hal_unittest") {
   module_out_path = module_output_path
   sources = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common/wifi_hal_common_func.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_adapter.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_ap_interface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_base_interface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_callback.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_chip_interface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_ap.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_base.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_chip.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_common.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_p2p.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_server.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_sta.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_crpc_supplicant.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal/wifi_hostapd_hal.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_common.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wifi_wpa_hal.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal/wifi_p2p_hal.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal/wifi_supplicant_hal.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module_manage.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_p2p_interface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_sta_interface.c",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_vendor_interface.c",
     "mock_wpa_ctrl.cpp",
     "wifi_hal_ap_interface_test.cpp",
     "wifi_hal_base_interface_test.cpp",
@@ -65,13 +65,13 @@ ohos_unittest("wifi_hal_unittest") {
 
   include_dirs = [
     "//utils/native/base/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC/include",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/hostapd_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_sta_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/wifi_hal_module/wpa_supplicant_hal/wpa_p2p_hal",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
     "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard/src/",
     "//third_party/bounds_checking_function/include/",
@@ -80,7 +80,7 @@ ohos_unittest("wifi_hal_unittest") {
   ]
 
   deps = [
-    "$SUBSYSTEM_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server",
+    "$WIFI_ROOT_DIR/services/wifi_standard/ipc_framework/cRPC:crpc_server",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//drivers/peripheral/wlan/hal:wifi_hal",
     "//utils/native/base:utils",
@@ -93,8 +93,9 @@ ohos_unittest("wifi_hal_unittest") {
 
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
   configs = [ ":module_private_config" ]
+  defines = [ "AP_INTF=\"$wifi_feature_with_ap_intf\"" ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
   testonly = true
 }
@@ -109,13 +110,13 @@ ohos_shared_library("WifiHalVendorTest") {
   include_dirs = [
     "//utils/native/base/include",
     "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal",
-    "$SUBSYSTEM_DIR/services/wifi_standard/wifi_hal/common",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_hal/common",
   ]
   deps = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
     "//utils/native/base:utils",
   ]
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h b/wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/mock_wpa_ctrl.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_adapter_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_ap_interface_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_base_interface_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_chip_interface_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_add_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_crpc_server_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_hostapd_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_p2p_interface_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_sta_interface_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor.conf
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_vendor_interface_test.c
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_p2p_test.h
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.cpp
diff --git a/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h b/wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h
similarity index 100%
rename from tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h
rename to wifi/tests/wifi_standard/wifi_hal/unittest/wifi_hal_wpa_sta_test.h
diff --git a/utils/inc/wifi_common_util.h b/wifi/utils/inc/wifi_common_util.h
similarity index 100%
rename from utils/inc/wifi_common_util.h
rename to wifi/utils/inc/wifi_common_util.h
diff --git a/utils/inc/wifi_hisysevent.h b/wifi/utils/inc/wifi_hisysevent.h
similarity index 100%
rename from utils/inc/wifi_hisysevent.h
rename to wifi/utils/inc/wifi_hisysevent.h
diff --git a/utils/src/BUILD.gn b/wifi/utils/src/BUILD.gn
similarity index 90%
rename from utils/src/BUILD.gn
rename to wifi/utils/src/BUILD.gn
index d7e133d94..d92439616 100644
--- a/utils/src/BUILD.gn
+++ b/wifi/utils/src/BUILD.gn
@@ -12,13 +12,14 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/communication/wifi/wifi/wifi.gni")
 
 ohos_shared_library("wifi_utils") {
   install_enable = true
   include_dirs = [
-    "//foundation/communication/wifi/utils/inc",
+    "$WIFI_ROOT_DIR/utils/inc",
     "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
-    "//foundation/communication/wifi/services/wifi_standard/wifi_framework/common/log",
+    "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/common/log",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/",
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr/",
   ]
@@ -52,6 +53,6 @@ ohos_shared_library("wifi_utils") {
     "-Wl,-E",
   ]
 
-  part_name = "wifi_standard"
+  part_name = "wifi"
   subsystem_name = "communication"
 }
diff --git a/utils/src/wifi_common_util.cpp b/wifi/utils/src/wifi_common_util.cpp
similarity index 100%
rename from utils/src/wifi_common_util.cpp
rename to wifi/utils/src/wifi_common_util.cpp
diff --git a/utils/src/wifi_hisysevent.cpp b/wifi/utils/src/wifi_hisysevent.cpp
similarity index 100%
rename from utils/src/wifi_hisysevent.cpp
rename to wifi/utils/src/wifi_hisysevent.cpp
diff --git a/wifi.gni b/wifi/wifi.gni
similarity index 75%
rename from wifi.gni
rename to wifi/wifi.gni
index b89364c8b..18350aa1c 100644
--- a/wifi.gni
+++ b/wifi/wifi.gni
@@ -11,7 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+SUBSYSTEM_DIR = "//foundation/communication"
+WIFI_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/wifi"
+DHCP_ROOT_DIR = "$SUBSYSTEM_DIR/wifi/dhcp"
+
 declare_args() {
-  wifi_standard_feature_with_p2p = true
-  wifi_standard_feature_with_ap_intf = "wlan0"
+  wifi_feature_with_p2p = true
+  wifi_feature_with_ap_intf = "wlan0"
 }