diff --git a/BUILD.gn b/BUILD.gn
index 9dd538cb9bdd6f1725ca6e3644a5dbd0e6ec7cce..9023cf7d31438d5dddc673f8aee75a665422f279 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -14,12 +14,9 @@
 import("//build/ohos.gni")
 import("//build/ohos/ace/ace.gni")
 import("//build/ohos_var.gni")
+import("//build/templates/bpf/ohos_bpf_config.gni")
 import("//foundation/arkui/ace_engine/ace_config.gni")
-if (sdk_build_public) {
-  import("//out/sdk-public/public_interface/sdk-js/interface_config.gni")
-} else {
-  import("//interface/sdk-js/interface_config.gni")
-}
+import("//interface/sdk-js/interface_config.gni")
 
 ets_loader_lib_dir =
     get_label_info(":build_ets_loader_library", "target_out_dir") + "/lib"
@@ -38,6 +35,8 @@ ets_sysResource = get_label_info(":build_ets_sysResource", "target_out_dir") +
                   "/sysResource.js"
 ets_loader_kit_configs_dir = get_label_info(":build_ets_loader_library",
                                             "target_out_dir") + "/kit_configs"
+ets_component_dep = "//interface/sdk-js:ets_component"
+ets_component_out_dir = get_label_info(ets_component_dep, "target_out_dir")
 
 action("build_ets_loader_library") {
   deps = [
@@ -45,6 +44,10 @@ action("build_ets_loader_library") {
     ":form_components",
     ":install_arkguard_tsc",
     ":server",
+    "//interface/sdk-js:bundle_arkts",
+    "//interface/sdk-js:bundle_kits",
+    "//interface/sdk-js:ets_component",
+    "//interface/sdk-js:ets_internal_api",
   ]
   script = "build_ets_loader_library.py"
   depfile = "$target_gen_dir/$target_name.d"
@@ -63,19 +66,11 @@ action("build_ets_loader_library") {
   } else {
     _ace_config_dir = "//prebuilts/ace-toolkit/ets-loader/compiler"
   }
-  _declarations_file_dir = "//interface/sdk-js/api/@internal/component/ets"
-  _kit_configs_file_dir = "//interface/sdk-js/kits"
-  _kit_apis_file_dir = "//interface/sdk-js/api"
-  _arkts_apis_file_dir = "//interface/sdk-js/arkts"
-  isPublic = "false"
-  if (sdk_build_public) {
-    _declarations_file_dir =
-        "//out/sdk-public/public_interface/sdk-js/api/@internal/component/ets"
-    _kit_configs_file_dir = "//out/sdk-public/public_interface/sdk-js/kits"
-    _kit_apis_file_dir = "//out/sdk-public/public_interface/sdk-js/api"
-    _arkts_apis_file_dir = "//out/sdk-public/public_interface/sdk-js/arkts"
-    isPublic = "true"
-  }
+  _declarations_file_dir = ets_component_out_dir + "/${sdk_type}/ets_component"
+  _kit_configs_file_dir = ets_component_out_dir + "/${sdk_type}/bundle_kits"
+  _kit_apis_file_dir =
+      root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets"
+  _arkts_apis_file_dir = ets_component_out_dir + "/${sdk_type}/bundle_arkts"
 
   _babel_js = _ace_config_dir + "/node_modules/@babel/cli/bin/babel.js"
   _babel_config_js = _ace_config_dir + "/babel.config.js"
@@ -139,7 +134,7 @@ action("build_ets_loader_library") {
     "--arkts-apis-file-dir",
     rebase_path(_arkts_apis_file_dir, root_build_dir),
     "--build-public-sdk",
-    isPublic,
+    "${sdk_build_public}",
   ]
 }
 
@@ -329,20 +324,15 @@ ohos_copy("ets_loader_ark_codegen") {
 }
 
 ohos_copy("ohos_declaration_ets_ark") {
-  deps = []
-  if (sdk_build_public) {
-    deps += [ "//out/sdk-public/public_interface/sdk-js:ohos_declaration_ets" ]
-  } else {
-    deps += [ "//interface/sdk-js:ohos_declaration_ets" ]
-  }
+  deps = [ "//interface/sdk-js:ohos_declaration_ets" ]
 
-  sources = [ root_out_dir + "/ohos_declaration/ohos_declaration_ets" ]
+  sources =
+      [ root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" ]
 
   outputs = [ target_out_dir + "/../api" ]
 }
 
-ohos_copy("ets_loader_ark_hap") {
-  sources = common_api_src
+group("ets_loader_ark_hap") {
   deps = [
     ":ets_loader_ark",
     ":ets_loader_ark_codegen",
@@ -353,8 +343,6 @@ ohos_copy("ets_loader_ark_hap") {
     ":ets_loader_ark_server",
     ":ohos_declaration_ets_ark",
   ]
-  outputs = [ target_out_dir + "/../../developtools/api/{{source_file_part}}" ]
-  module_install_name = ""
 }
 
 typescript_dir = get_label_info("//third_party/typescript:build_typescript",
diff --git a/compiler/build_declarations_file.js b/compiler/build_declarations_file.js
index 695d29691348bc209161fa10c44d8d2b6fa23db0..d3f4782eb3e18da4a43d9a202a66d8c89cdf0975 100644
--- a/compiler/build_declarations_file.js
+++ b/compiler/build_declarations_file.js
@@ -36,8 +36,8 @@ const addTSAttributeSet = ['AlphabetIndexer', 'Animator', 'Badge', 'Blank', 'But
 generateTargetFile(process.argv[2], process.argv[3]);
 function generateTargetFile(filePath, output) {
   const files = [];
-  const globalTsFile = path.resolve(filePath, '../../ets/global.d.ts');
-  const featureAbilityPath = path.resolve(filePath, '../../../common/full/featureability.d.ts');
+  const globalTsFile = path.resolve(filePath, '../ets_internal_api/global.d.ts');
+  const featureAbilityPath = path.resolve(filePath, '../internal_full/featureability.d.ts');
   const middleTsFile = path.resolve(filePath, 'middle_class.d.ts');
   if (fs.existsSync(globalTsFile)) {
     files.push(globalTsFile);
diff --git a/compiler/build_kitConfigs_file.js b/compiler/build_kitConfigs_file.js
index cdbfce6a56a41c7615ab32e8d86865da25c2ece6..af72535e103be15f2c0c1ae37c6e726882e612ea 100644
--- a/compiler/build_kitConfigs_file.js
+++ b/compiler/build_kitConfigs_file.js
@@ -104,7 +104,7 @@ function readFile(dir, fileDir) {
     const status = fs.statSync(filePath);
     if (status.isDirectory()) {
       readFile(filePath, fileDir);
-    } else {
+    } else if (filePath.endsWith('.d.ts')) {
       fileDir.push(filePath);
     }
   });
@@ -115,12 +115,16 @@ function readSystemApis(dir, fileDir) {
   files.forEach(file => {
     const filePath = path.join(dir, file);
     const status = fs.statSync(filePath);
-    if (!status.isDirectory()) {
+    if (!status.isDirectory() && !hasSameApi(filePath)) {
       fileDir.push(file);
     }
   });
 }
 
+function hasSameApi(filePath) {
+  return filePath.endsWith('.d.ets') && fs.existsSync(filePath.replace('.d.ets', '.d.ts'));
+}
+
 function mkDir(filePath) {
   const parent = path.join(filePath, '..');
   if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) {