diff --git a/BUILD.gn b/BUILD.gn
index 468f63366461ce0cbf08f788b27633b1fcc42973..45ca4f01824fd477bc1531c0783031cbfc3998ab 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,25 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-group("crypto_framework_lib") {
-  if (os_level == "standard") {
-    deps =
-        [ "//base/security/crypto_framework/frameworks:crypto_framework_lib" ]
-  }
-}
-
-group("crypto_openssl_plugin_lib") {
-  if (os_level == "standard") {
-    deps =
-        [ "//base/security/crypto_framework/plugin:crypto_openssl_plugin_lib" ]
-  }
-}
-
-group("cryptoframework_napi") {
+group("crypto_framework_component") {
   if (os_level == "standard") {
     deps = [
-      "//base/security/crypto_framework/frameworks/js/napi/certificate:cert_napi",
-      "//base/security/crypto_framework/frameworks/js/napi/crypto:cryptoframework_napi",
+      "frameworks:crypto_framework_lib",
+      "frameworks/js/napi/certificate:cert_napi",
+      "frameworks/js/napi/crypto:cryptoframework_napi",
+      "plugin:crypto_openssl_plugin_lib",
     ]
   }
 }
@@ -37,9 +25,7 @@ group("cryptoframework_napi") {
 group("crypto_framework_test") {
   testonly = true
   if (os_level == "standard") {
-    deps = [
-      "//base/security/crypto_framework/test/unittest:crypto_framework_test",
-    ]
+    deps = [ "test/unittest:crypto_framework_test" ]
   }
 }
 
diff --git a/bundle.json b/bundle.json
index 3ff987cfa52e012e141b7800dc4fe84189d6dd76..6ed02db51e1472317feeb5c133ed96a36838f6aa 100644
--- a/bundle.json
+++ b/bundle.json
@@ -32,11 +32,44 @@
       },
       "build": {
         "sub_component": [
-          "//base/security/crypto_framework:crypto_framework_lib",
-          "//base/security/crypto_framework:crypto_openssl_plugin_lib",
-          "//base/security/crypto_framework:cryptoframework_napi"
+          "//base/security/crypto_framework:crypto_framework_component"
+        ],
+        "inner_kits": [
+          {
+            "name": "//base/security/crypto_framework/frameworks:crypto_framework_lib",
+            "header": {
+              "header_files": [
+                "algorithm_parameter/algorithm_parameter.h",
+                "algorithm_parameter/detailed_ccm_params.h",
+                "algorithm_parameter/detailed_gcm_params.h",
+                "algorithm_parameter/detailed_iv_params.h",
+                "certificate/cert_chain_validator.h",
+                "certificate/certificate.h",
+                "certificate/crl.h",
+                "certificate/x509_certificate.h",
+                "certificate/x509_crl_entry.h",
+                "certificate/x509_crl.h",
+                "common/blob.h",
+                "common/object_base.h",
+                "common/result.h",
+                "crypto_operation/cipher.h",
+                "crypto_operation/key_agreement.h",
+                "crypto_operation/mac.h",
+                "crypto_operation/md.h",
+                "crypto_operation/signature.h",
+                "key/asy_key_generator.h",
+                "key/key_pair.h",
+                "key/key.h",
+                "key/pri_key.h",
+                "key/pub_key.h",
+                "key/sym_key_generator.h",
+                "key/sym_key.h",
+                "rand/rand.h"
+              ],
+              "header_base": "//base/security/crypto_framework/interfaces/innerkits"
+            }
+          }
         ],
-        "inner_kits": [],
         "test": [
             "//base/security/crypto_framework:crypto_framework_test",
             "//base/security/crypto_framework:crypto_framework_fuzztest"
diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn
index c8161803cc90eed2a57bc91675e809898c710b06..661361347517cbcd601c9b5daaeb5d5944c1aba6 100644
--- a/frameworks/BUILD.gn
+++ b/frameworks/BUILD.gn
@@ -53,8 +53,8 @@ ohos_shared_library("crypto_framework_lib") {
   ]
 
   deps = [
-    "//base/security/crypto_framework:crypto_openssl_plugin_lib",
-    "//base/security/crypto_framework/common:crypto_plugin_common",
+    "../common:crypto_plugin_common",
+    "../plugin:crypto_openssl_plugin_lib",
   ]
 
   external_deps = [
diff --git a/test/fuzztest/certificate/x509certificate_fuzzer/BUILD.gn b/test/fuzztest/certificate/x509certificate_fuzzer/BUILD.gn
index 8bcdd808a092d25ae4c55e724d345ed90f99231e..3a19b37ec6d44a1892ca25906c82cf57e628337c 100755
--- a/test/fuzztest/certificate/x509certificate_fuzzer/BUILD.gn
+++ b/test/fuzztest/certificate/x509certificate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("X509CertificateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "x509certificate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/certificate/x509crl_fuzzer/BUILD.gn b/test/fuzztest/certificate/x509crl_fuzzer/BUILD.gn
index 14f0842a8775ac33dedd9fe2dce5255e89d540d1..1efffe872acc79c9ae19a117398597806fcb08c0 100755
--- a/test/fuzztest/certificate/x509crl_fuzzer/BUILD.gn
+++ b/test/fuzztest/certificate/x509crl_fuzzer/BUILD.gn
@@ -42,14 +42,13 @@ ohos_fuzztest("X509CrlFuzzTest") {
   }
 
   deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//base/security/crypto_framework:crypto_openssl_plugin_lib",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/openssl:libcrypto_shared",
   ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn
index a96af87cdc7c2f09ab17fd25911ef5807970fae5..b72ab87775bc509f2891d31be09ff75fec0afb77 100755
--- a/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/crypto_operation/hcfciphercreate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("HcfCipherCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfciphercreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn
index 237352620ebd6b7d8f2ed194ad128a577180d99e..6c524bb310fcfbd4939098ee39dbc76a2c4885e1 100755
--- a/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/crypto_operation/hcfkeyagreementcreate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("HcfKeyAgreementCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfkeyagreementcreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn
index 40439ffee950477048a9dd83ae4c16855d5e109d..7355009268e234723b4e8218b24c6ec6dc8dec21 100755
--- a/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/crypto_operation/hcfmaccreate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("HcfMacCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfmaccreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn
index 53459317d09a01b07555963652e52f46b1bdad1d..0544d2d15985225104ac076295386bad762ee575 100755
--- a/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/crypto_operation/hcfmdcreate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("HcfMdCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfmdcreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn
index d3ec3436d62d5608d9c3dbf0be9eb204aa8407fb..419f7e3b88811f29a15d752efc783c4140b6f379 100755
--- a/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/crypto_operation/hcfsigncreate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("HcfSignCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfsigncreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn
index fd0cd8dce5518a2773a6f1f3673ae0974c151a8c..66c370a9cad200ddd64f97afc3c87907282a0bd6 100755
--- a/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/crypto_operation/hcfverifycreate_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("HcfVerifyCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfverifycreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn b/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn
index 551714b5c247a25fb40159c68caaabf57927bec1..7bf850e2b6e795953681ca4763355e655828ce23 100755
--- a/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn
+++ b/test/fuzztest/key/asykeygenerator_fuzzer/BUILD.gn
@@ -30,13 +30,11 @@ ohos_fuzztest("AsyKeyGeneratorFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "asykeygenerator_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn b/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn
index d22e67c121050e9dbbbcf0f5deda380371f0dc87..698bf9918233bce145d38866274e2ce4c82f6f84 100755
--- a/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn
+++ b/test/fuzztest/key/symkeygenerator_fuzzer/BUILD.gn
@@ -43,14 +43,13 @@ ohos_fuzztest("SymKeyGeneratorFuzzTest") {
   }
 
   deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//base/security/crypto_framework:crypto_openssl_plugin_lib",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/openssl:libcrypto_shared",
   ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn b/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn
index 43f6bd2ec78cbaa564ed1c9a4e26b1672f1fb1b5..597ca5e653a81536c9bf48ea27b15db9f663943f 100755
--- a/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn
+++ b/test/fuzztest/rand/hcfrandcreate_fuzzer/BUILD.gn
@@ -32,13 +32,11 @@ ohos_fuzztest("HcfRandCreateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "hcfrandcreate_fuzzer.cpp" ]
-  deps = [
-    "//base/security/crypto_framework:crypto_framework_lib",
-    "//third_party/bounds_checking_function:libsec_shared",
-  ]
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 
   external_deps = [
     "c_utils:utils",
+    "crypto_framework:crypto_framework_lib",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }