diff --git a/BUILD.gn b/BUILD.gn
index f2393de6833f54adf89d568fcaf0c85aa9782a75..97c62f9840063d4827f8a9879a25f57c09b91337 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -17,7 +17,7 @@ group("accesstoken_build_module") {
   if (is_standard_system) {
     deps = [
       "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk",
-      "//base/security/access_token/interfaces/innerkits/atlib:libaccesstoken_lib",
+      "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
       "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
       "//base/security/access_token/interfaces/kits/accesstoken:libabilityaccessctrl",
       "//base/security/access_token/services/accesstokenmanager:accesstoken_manager_service",
@@ -42,7 +42,7 @@ group("accesstoken_build_module_test") {
   if (is_standard_system) {
     deps += [
       "//base/security/access_token/interfaces/innerkits/accesstoken/test:unittest",
-      "//base/security/access_token/interfaces/innerkits/atlib/test:unittest",
+      "//base/security/access_token/interfaces/innerkits/nativetoken/test:unittest",
       "//base/security/access_token/interfaces/innerkits/token_setproc/test:unittest",
       "//base/security/access_token/interfaces/innerkits/tokensync/test:unittest",
       "//base/security/access_token/services/accesstokenmanager/test:unittest",
diff --git a/README_zh.md b/README_zh.md
index 3553aebf06be1f03182ceb1085ce33e8c20dd9f7..23be5b3aff107affb9e6cb468b095a4b833101ab 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -28,7 +28,7 @@ ATM模块主要提供如下功能：
 ├── interfaces                  # 接口层
 │   └── innerkits               # 内部接口层
 │       ├── accesstoken         # Accesstoken内部接口代码存放目录
-│       ├── accesstoken_lib     # Accesstoken_lib内部接口代码存放目录
+│       ├── nativetoken         # nativetoken内部接口代码存放目录
 │       └── tokensync           # Accesstoken信息同步内部接口代码存放目录
 └── services                    # 服务层
     ├── accesstokenmanager      # Accesstoken管理服务代码存放目录
diff --git a/bundle.json b/bundle.json
old mode 100644
new mode 100755
index 98aaaa038136ee28d20e2597579c9fc1fc4ba114..a33458f1f099acfc803f918079ccd5c844c52e1e
--- a/bundle.json
+++ b/bundle.json
@@ -43,7 +43,7 @@
             "header_files": [
               "accesstoken_kit.h"
             ],
-            "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include"
+            "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/include"
           }
         }
       ],
diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn
index b11ba2978b77b8614641ec42e3bad5ef30db3581..1489a5df007902db148f0698fd0a354b95b84701 100644
--- a/frameworks/accesstoken/BUILD.gn
+++ b/frameworks/accesstoken/BUILD.gn
@@ -20,7 +20,7 @@ config("accesstoken_communication_adapter_cxx_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include",
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
   ]
 }
 
@@ -28,22 +28,21 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") {
   subsystem_name = "security"
   part_name = "access_token"
 
-  public_configs =
-      [ ":accesstoken_communication_adapter_cxx_public_config" ]
+  public_configs = [ ":accesstoken_communication_adapter_cxx_public_config" ]
 
   include_dirs = [
     "include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include",
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
     "//utils/native/base/include",
   ]
 
   sources = [
-    "src/permission_def_parcel.cpp",
-    "src/permission_state_full_parcel.cpp",
+    "src/hap_info_parcel.cpp",
     "src/hap_policy_parcel.cpp",
     "src/hap_token_info_parcel.cpp",
-    "src/hap_info_parcel.cpp",
-    "src/native_token_info_parcel.cpp"
+    "src/native_token_info_parcel.cpp",
+    "src/permission_def_parcel.cpp",
+    "src/permission_state_full_parcel.cpp",
   ]
 
   deps = [ "//utils/native/base:utils" ]
diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn
index b63c67b3c222d47a82255414167f29f5121f59f8..aad20da4291e8d3e68c8079673435811f72fdd02 100644
--- a/frameworks/common/BUILD.gn
+++ b/frameworks/common/BUILD.gn
@@ -18,7 +18,7 @@ import("//build/ohos.gni")
 ################################################################
 config("accesstoken_common_cxx_public_config") {
   visibility = [ ":*" ]
-  include_dirs = [ "main/cpp/include" ]
+  include_dirs = [ "include" ]
 }
 
 ohos_shared_library("accesstoken_common_cxx") {
@@ -31,17 +31,17 @@ ohos_shared_library("accesstoken_common_cxx") {
     "include",
     "//utils/system/safwk/native/include",
     "//third_party/mbedtls/include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include",
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
   ]
 
   sources = [
     "src/data_validator.cpp",
-    "src/random_mbedtls.cpp"
+    "src/random_mbedtls.cpp",
   ]
 
   deps = [
-    "//utils/native/base:utils",
     "//third_party/mbedtls:mbedtls_shared",
+    "//utils/native/base:utils",
   ]
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
 
diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn
index 1db9166532537b55f7f738c08900f3554c3747e8..2c353eec68bd0b100cf39b1c18503b677a2e630a 100644
--- a/interfaces/innerkits/accesstoken/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/BUILD.gn
@@ -18,7 +18,7 @@ import("//build/ohos.gni")
 ################################################################
 config("accesstoken") {
   visibility = [ ":*" ]
-  include_dirs = [ "main/cpp/include" ]
+  include_dirs = [ "include" ]
 }
 
 ohos_shared_library("libaccesstoken_sdk") {
@@ -31,17 +31,17 @@ ohos_shared_library("libaccesstoken_sdk") {
 
   include_dirs = [
     "//utils/native/base/include",
-    "main/cpp/include",
-    "main/cpp/src",
+    "include",
+    "src",
     "//base/security/access_token/frameworks/accesstoken/include",
     "//base/security/access_token/frameworks/common/include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include",
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
   ]
 
   sources = [
-    "main/cpp/src/accesstoken_kit.cpp",
-    "main/cpp/src/accesstoken_manager_client.cpp",
-    "main/cpp/src/accesstoken_manager_proxy.cpp",
+    "src/accesstoken_kit.cpp",
+    "src/accesstoken_manager_client.cpp",
+    "src/accesstoken_manager_proxy.cpp",
   ]
 
   deps = [
diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/include/access_token.h
rename to interfaces/innerkits/accesstoken/include/access_token.h
diff --git a/interfaces/innerkits/accesstoken/include/accesstoken.h b/interfaces/innerkits/accesstoken/include/accesstoken.h
new file mode 100755
index 0000000000000000000000000000000000000000..f0084d34728248555694e1f359ed659f7a6f43b2
--- /dev/null
+++ b/interfaces/innerkits/accesstoken/include/accesstoken.h
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+#ifndef INTERFACES_INNER_KITS_ACCESSTOKEN_H
+#define INTERFACES_INNER_KITS_ACCESSTOKEN_H
+
+namespace OHOS {
+namespace Security {
+namespace AccessToken {
+typedef unsigned int AccessTokenID;
+enum AccessTokenKitRet {
+    RET_FAILED = -1,
+    RET_SUCCESS = 0,
+};
+
+typedef enum TypePermissionState {
+    PERMISSION_DENIED = -1,
+    PERMISSION_GRANTED = 0,
+} PermissionState;
+} // namespace AccessToken
+} // namespace Security
+} // namespace OHOS
+
+#endif
diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/accesstoken_kit.h b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/include/accesstoken_kit.h
rename to interfaces/innerkits/accesstoken/include/accesstoken_kit.h
diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/hap_token_info.h b/interfaces/innerkits/accesstoken/include/hap_token_info.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/include/hap_token_info.h
rename to interfaces/innerkits/accesstoken/include/hap_token_info.h
diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/native_token_info.h b/interfaces/innerkits/accesstoken/include/native_token_info.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/include/native_token_info.h
rename to interfaces/innerkits/accesstoken/include/native_token_info.h
diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/permission_def.h b/interfaces/innerkits/accesstoken/include/permission_def.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/include/permission_def.h
rename to interfaces/innerkits/accesstoken/include/permission_def.h
diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/permission_state_full.h b/interfaces/innerkits/accesstoken/include/permission_state_full.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/include/permission_state_full.h
rename to interfaces/innerkits/accesstoken/include/permission_state_full.h
diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_kit.cpp
rename to interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.cpp
rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.h
rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h
diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.cpp
rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.h
rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn
index fed32567e96d179dfebb8307f1f7d826aec8fbc9..1a7965889b02799cf25c6e2153d843adbabd9985 100755
--- a/interfaces/innerkits/accesstoken/test/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/test/BUILD.gn
@@ -21,10 +21,10 @@ ohos_unittest("libaccesstoken_sdk_test") {
   include_dirs = [
     "//utils/native/base/include",
     "//third_party/googletest/include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include"
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
   ]
 
-  sources = [ "unittest/cpp/src/accesstoken_kit_test.cpp" ]
+  sources = [ "unittest/src/accesstoken_kit_test.cpp" ]
 
   cflags_cc = [ "-DHILOG_ENABLE" ]
 
diff --git a/interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
similarity index 100%
rename from interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.cpp
rename to interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
diff --git a/interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.h b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h
similarity index 100%
rename from interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.h
rename to interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h
diff --git a/interfaces/innerkits/atlib/BUILD.gn b/interfaces/innerkits/nativetoken/BUILD.gn
similarity index 89%
rename from interfaces/innerkits/atlib/BUILD.gn
rename to interfaces/innerkits/nativetoken/BUILD.gn
index b24aa1ff738ad6f26f26e808fd64d7469c337124..cfac0a9248e397ca2a5d9c889794a96ba1d9a83a 100644
--- a/interfaces/innerkits/atlib/BUILD.gn
+++ b/interfaces/innerkits/nativetoken/BUILD.gn
@@ -18,13 +18,13 @@ import("//build/ohos.gni")
 ################################################################
 config("accesstokenlib") {
   visibility = [ ":*" ]
-  include_dirs = [ "main/include" ]
+  include_dirs = [ "include" ]
 }
 
-ohos_shared_library("libaccesstoken_lib") {
+ohos_static_library("libnativetoken") {
   subsystem_name = "security"
   part_name = "access_token"
-  output_name = "libaccesstoken_lib"
+  output_name = "libnativetoken"
 
   public_configs = [ ":accesstokenlib" ]
 
@@ -34,14 +34,14 @@ ohos_shared_library("libaccesstoken_lib") {
   include_dirs = [
     "//utils/native/base/include",
     "//base/security/access_token/frameworks/common/include",
-    "main/include",
-    "main/src",
+    "include",
+    "src",
     "//third_party/cJSON",
     "//third_party/bounds_checking_function/include",
     "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/",
   ]
 
-  sources = [ "main/src/accesstoken_lib.c" ]
+  sources = [ "src/nativetoken.c" ]
 
   deps = [
     "//base/security/access_token/frameworks/common:accesstoken_common_cxx",
diff --git a/interfaces/innerkits/atlib/main/include/accesstoken_lib.h b/interfaces/innerkits/nativetoken/include/nativetoken.h
similarity index 92%
rename from interfaces/innerkits/atlib/main/include/accesstoken_lib.h
rename to interfaces/innerkits/nativetoken/include/nativetoken.h
index e28f4b5e6bec1496d41080ad7280368c6df234e1..e40462310a4974af4fce575a84336c4e6429bf1b 100644
--- a/interfaces/innerkits/atlib/main/include/accesstoken_lib.h
+++ b/interfaces/innerkits/nativetoken/include/nativetoken.h
@@ -23,10 +23,10 @@
 #include <sys/un.h>
 #include "cJSON.h"
 #include "securec.h"
-#include "accesstoken_log.h"
+#include "nativetoken_log.h"
 
-#ifndef ACCESSTOKEN_LIB_H
-#define ACCESSTOKEN_LIB_H
+#ifndef NATIVE_TOKEN_H
+#define NATIVE_TOKEN_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -92,4 +92,4 @@ extern char *GetFileBuff(const char *cfg);
 }
 #endif
 
-#endif // ACCESSTOKEN_LIB_H
+#endif // NATIVE_TOKEN_H
diff --git a/interfaces/innerkits/atlib/main/include/accesstokenlib_kit.h b/interfaces/innerkits/nativetoken/include/nativetoken_kit.h
similarity index 82%
rename from interfaces/innerkits/atlib/main/include/accesstokenlib_kit.h
rename to interfaces/innerkits/nativetoken/include/nativetoken_kit.h
index d0511410ec647e910583e879c222b8af494f8732..f03eff95bc354e4f00debcf60c6d9d423426d673 100644
--- a/interfaces/innerkits/atlib/main/include/accesstokenlib_kit.h
+++ b/interfaces/innerkits/nativetoken/include/nativetoken_kit.h
@@ -13,9 +13,10 @@
  * limitations under the License.
  */
 
-#ifndef INTERFACES_INNER_KITS_ACCESSTOKEN_LIB_H
-#define INTERFACES_INNER_KITS_ACCESSTOKEN_LIB_H
+#ifndef INTERFACES_INNER_KITS_NATIVE_TOKEN_H
+#define INTERFACES_INNER_KITS_NATIVE_TOKEN_H
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,4 +33,4 @@ extern uint64_t GetAccessTokenId(const char *processname, const char **dcap, int
 }
 #endif
 
-#endif // INTERFACES_INNER_KITS_ACCESSTOKEN_LIB_H
+#endif // INTERFACES_INNER_KITS_NATIVE_TOKEN_H
diff --git a/interfaces/innerkits/atlib/main/include/accesstoken_log.h b/interfaces/innerkits/nativetoken/include/nativetoken_log.h
similarity index 100%
rename from interfaces/innerkits/atlib/main/include/accesstoken_log.h
rename to interfaces/innerkits/nativetoken/include/nativetoken_log.h
diff --git a/interfaces/innerkits/atlib/main/src/accesstoken_lib.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
similarity index 99%
rename from interfaces/innerkits/atlib/main/src/accesstoken_lib.c
rename to interfaces/innerkits/nativetoken/src/nativetoken.c
index e227657be755480bacabed3a2316f0c201b9f541..74ab8c62b7251d650dd7ae4f6b94bdd74907ccab 100644
--- a/interfaces/innerkits/atlib/main/src/accesstoken_lib.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -12,8 +12,8 @@
  * See the License for the specific language governing ACCESSTOKENs and
  * limitations under the License.
  */
-#include "accesstoken_lib.h"
-#include "accesstokenlib_kit.h"
+#include "nativetoken.h"
+#include "nativetoken_kit.h"
 #include "parameter.h"
 #include "random.h"
 
diff --git a/interfaces/innerkits/atlib/test/BUILD.gn b/interfaces/innerkits/nativetoken/test/BUILD.gn
similarity index 79%
rename from interfaces/innerkits/atlib/test/BUILD.gn
rename to interfaces/innerkits/nativetoken/test/BUILD.gn
index 0ec2f8404452b134af7c8fb4e651992042ace131..25f2784d00e254d907bd51ac86c48975673d23d7 100644
--- a/interfaces/innerkits/atlib/test/BUILD.gn
+++ b/interfaces/innerkits/nativetoken/test/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/test.gni")
 
-ohos_unittest("libaccesstoken_lib_test") {
+ohos_unittest("libnativetoken_test") {
   subsystem_name = "security"
   part_name = "access_token"
   module_out_path = part_name + "/" + part_name
@@ -22,15 +22,15 @@ ohos_unittest("libaccesstoken_lib_test") {
     "//utils/native/base/include",
     "//third_party/cJSON",
     "//third_party/bounds_checking_function/include",
-    "//base/security/access_token/interfaces/innerkits/atlib/main/include",
+    "//base/security/access_token/interfaces/innerkits/nativetoken/include",
   ]
 
-  sources = [ "unittest/cpp/src/accesstokenlib_kit_test.cpp" ]
+  sources = [ "unittest/src/nativetoken_kit_test.cpp" ]
   cflags_cc = [ "-fexceptions" ]
   cflags_cc += [ "-pthread" ]
 
   deps = [
-    "//base/security/access_token/interfaces/innerkits/atlib:libaccesstoken_lib",
+    "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
     "//third_party/bounds_checking_function:libsec_static",
     "//third_party/cJSON:cjson_static",
     "//third_party/googletest:gmock",
@@ -41,5 +41,5 @@ ohos_unittest("libaccesstoken_lib_test") {
 
 group("unittest") {
   testonly = true
-  deps = [ ":libaccesstoken_lib_test" ]
+  deps = [ ":libnativetoken_test" ]
 }
diff --git a/interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp
similarity index 99%
rename from interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp
rename to interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp
index be80fe735ff2fd62d0d04c15d290d93580cd004f..ff107e66aa598e8a82d32ead0e0697cf4c6d746c 100644
--- a/interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp
+++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#include "accesstokenlib_kit_test.h"
+#include "nativetoken_kit_test.h"
 #include <pthread.h>
-#include "accesstoken_lib.h"
-#include "accesstokenlib_kit.h"
+#include "nativetoken.h"
+#include "nativetoken_kit.h"
 
 using namespace testing::ext;
 using namespace OHOS::Security;
diff --git a/interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.h b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h
similarity index 100%
rename from interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.h
rename to interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h
diff --git a/interfaces/innerkits/token_setproc/test/BUILD.gn b/interfaces/innerkits/token_setproc/test/BUILD.gn
index ce6cf8dd1065401ad081bda17d62a691f4fdfebe..9cac0ef6575dff6f3bcef74c713cdd852941cc81 100644
--- a/interfaces/innerkits/token_setproc/test/BUILD.gn
+++ b/interfaces/innerkits/token_setproc/test/BUILD.gn
@@ -22,7 +22,7 @@ ohos_unittest("libtoken_setproc_test") {
     "//base/security/access_token/interfaces/innerkits/token_setproc/include",
   ]
 
-  sources = [ "unittest/cpp/src/tokensetproc_kit_test.cpp" ]
+  sources = [ "unittest/src/tokensetproc_kit_test.cpp" ]
   cflags_cc = [ "-fexceptions" ]
 
   deps = [
diff --git a/interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.cpp b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp
similarity index 100%
rename from interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.cpp
rename to interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp
diff --git a/interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.h b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h
similarity index 100%
rename from interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.h
rename to interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h
diff --git a/interfaces/innerkits/tokensync/BUILD.gn b/interfaces/innerkits/tokensync/BUILD.gn
index 0fe7a79073e3f5b663afec7443584d4398f8846a..1d8ba9af6404f42ec11a6008cdb1904af986407c 100644
--- a/interfaces/innerkits/tokensync/BUILD.gn
+++ b/interfaces/innerkits/tokensync/BUILD.gn
@@ -18,7 +18,7 @@ import("//build/ohos.gni")
 ################################################################
 config("tokensync") {
   visibility = [ ":*" ]
-  include_dirs = [ "main/cpp/include" ]
+  include_dirs = [ "include" ]
 }
 
 ohos_shared_library("libtokensync_sdk") {
@@ -31,11 +31,12 @@ ohos_shared_library("libtokensync_sdk") {
 
   include_dirs = [
     "//utils/native/base/include",
-    "main/cpp/include",
-    "main/cpp/src",
+    "include",
+    "src",
     "//base/security/access_token/frameworks/tokensync/include",
     "//base/security/access_token/frameworks/common/include",
-    "//base/security/access_token/interfaces/innerkits/tokensync/main/cpp/include"
+    "//base/security/access_token/interfaces/innerkits/tokensync/include",
+
     #"//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include/permission",
   ]
 
@@ -43,9 +44,9 @@ ohos_shared_library("libtokensync_sdk") {
     #"main/cpp/src/permission/permission_kit.cpp",
     #"main/cpp/src/permission/permission_manager_client.cpp",
     #"main/cpp/src/permission/permission_manager_proxy.cpp",
-    "main/cpp/src/tokensync_kit.cpp",
-    "main/cpp/src/tokensync_manager_client.cpp",
-    "main/cpp/src/tokensync_manager_proxy.cpp",
+    "src/tokensync_kit.cpp",
+    "src/tokensync_manager_client.cpp",
+    "src/tokensync_manager_proxy.cpp",
   ]
 
   deps = [
diff --git a/interfaces/innerkits/tokensync/main/cpp/include/tokensync_kit.h b/interfaces/innerkits/tokensync/include/tokensync_kit.h
similarity index 100%
rename from interfaces/innerkits/tokensync/main/cpp/include/tokensync_kit.h
rename to interfaces/innerkits/tokensync/include/tokensync_kit.h
diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_kit.cpp b/interfaces/innerkits/tokensync/src/tokensync_kit.cpp
similarity index 100%
rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_kit.cpp
rename to interfaces/innerkits/tokensync/src/tokensync_kit.cpp
diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.cpp b/interfaces/innerkits/tokensync/src/tokensync_manager_client.cpp
similarity index 100%
rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.cpp
rename to interfaces/innerkits/tokensync/src/tokensync_manager_client.cpp
diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.h b/interfaces/innerkits/tokensync/src/tokensync_manager_client.h
similarity index 100%
rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.h
rename to interfaces/innerkits/tokensync/src/tokensync_manager_client.h
diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.cpp b/interfaces/innerkits/tokensync/src/tokensync_manager_proxy.cpp
similarity index 100%
rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.cpp
rename to interfaces/innerkits/tokensync/src/tokensync_manager_proxy.cpp
diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.h b/interfaces/innerkits/tokensync/src/tokensync_manager_proxy.h
similarity index 100%
rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.h
rename to interfaces/innerkits/tokensync/src/tokensync_manager_proxy.h
diff --git a/interfaces/innerkits/tokensync/test/BUILD.gn b/interfaces/innerkits/tokensync/test/BUILD.gn
index afbd3655fe10526155461090e03a6562d935f9f8..8675493384d825e1cf78a41ec932745d15213797 100644
--- a/interfaces/innerkits/tokensync/test/BUILD.gn
+++ b/interfaces/innerkits/tokensync/test/BUILD.gn
@@ -21,16 +21,17 @@ ohos_unittest("libtokensync_sdk_test") {
   include_dirs = [
     "//utils/native/base/include",
     "//third_party/googletest/include",
+
     #"//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include/permission/",
-    "//base/security/access_token/interfaces/innerkits/tokensync/main/cpp/include"
+    "//base/security/access_token/interfaces/innerkits/tokensync/include",
   ]
 
-  sources = [ "unittest/cpp/src/tokensync_kit_test.cpp" ]
+  sources = [ "unittest/src/tokensync_kit_test.cpp" ]
 
   cflags_cc = [ "-DHILOG_ENABLE" ]
 
   deps = [
-#"//base/security/permission/frameworks/permission_standard/permissioninfrastructure:permission_standard_infrastructure_cxx",
+    #"//base/security/permission/frameworks/permission_standard/permissioninfrastructure:permission_standard_infrastructure_cxx",
     "//base/security/access_token/interfaces/innerkits/tokensync:libtokensync_sdk",
     "//utils/native/base:utils",
   ]
diff --git a/interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.cpp b/interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.cpp
similarity index 100%
rename from interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.cpp
rename to interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.cpp
diff --git a/interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.h b/interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.h
similarity index 100%
rename from interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.h
rename to interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.h
diff --git a/interfaces/kits/accesstoken/BUILD.gn b/interfaces/kits/accesstoken/BUILD.gn
index d385180a64cfa5c45eb688338b5f08f333bc3e60..ac5b3afef1c11955e7381135be84594f9105b7b5 100644
--- a/interfaces/kits/accesstoken/BUILD.gn
+++ b/interfaces/kits/accesstoken/BUILD.gn
@@ -34,7 +34,7 @@ ohos_shared_library("libabilityaccessctrl") {
     "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
     "//base/security/access_token/frameworks/common/include",
     "//base/security/access_token/interfaces/kits/accesstoken/napi/include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include",
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
   ]
 
   sources = [ "//base/security/access_token/interfaces/kits/accesstoken/napi/src/napi_atmanager.cpp" ]
diff --git a/ohos.build b/ohos.build
index f87ae64db91df4d037205238260e02cdf985e38d..096603d4d29919fff549f544e400bbef8443fa56 100644
--- a/ohos.build
+++ b/ohos.build
@@ -13,7 +13,7 @@
             "header_files": [
               "accesstoken_kit.h"
             ],
-            "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include"
+            "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/include"
           }
         }
       ],
diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn
index a46905ab6ebf1a57413b7809738cb0b695e24a15..fc866172a92579b3b3766243805e979f1e828253 100644
--- a/services/accesstokenmanager/BUILD.gn
+++ b/services/accesstokenmanager/BUILD.gn
@@ -32,7 +32,7 @@ ohos_shared_library("accesstoken_manager_service") {
     "//utils/system/safwk/native/include",
     "//base/security/access_token/frameworks/common/include",
     "//base/security/access_token/frameworks/accesstoken/include",
-    "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include",
+    "//base/security/access_token/interfaces/innerkits/accesstoken/include",
     "//third_party/json/include",
     "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/",
   ]