diff --git a/arkoala-arkts/libarkts/arktsconfig.json b/arkoala-arkts/libarkts/arktsconfig.json
index 73b2499d4770bcbd75d3ff78cc81c6c63ae9089f..4c428b783b152ca9ae3e7a1994a03b60c3ceca65 100644
--- a/arkoala-arkts/libarkts/arktsconfig.json
+++ b/arkoala-arkts/libarkts/arktsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "outDir": "./abc",
-        "baseUrl": "../node_modules/@panda/sdk/ets/stdlib",
+        "baseUrl": "../../incremental/tools/panda/node_modules/@panda/sdk/ets/stdlib",
         "paths": {
             "std": [
                 "./std"
diff --git a/arkoala-arkts/libarkts/native/meson_options.txt b/arkoala-arkts/libarkts/native/meson_options.txt
index d736cb5d3caf21be4e7c2e6a83b855a45dbd757f..0da91e9163fd0b447ab735a0352ee23bbf6f757e 100644
--- a/arkoala-arkts/libarkts/native/meson_options.txt
+++ b/arkoala-arkts/libarkts/native/meson_options.txt
@@ -1,6 +1,6 @@
 option('node_modules_dir', type : 'string', value : '../../node_modules/',
     description : 'path to node_modules')
-option('panda_sdk_dir', type : 'string', value : '../../node_modules/@panda/sdk/',
+option('panda_sdk_dir', type : 'string', value : '../../../incremental/tools/panda/node_modules/@panda/sdk/',
     description : 'path to panda sdk')
 option('interop_src_dir', type : 'string', value : '../../../interop/src/cpp/',
     description : 'path to interop')
diff --git a/arkoala-arkts/libarkts/native/src/bridges.cc b/arkoala-arkts/libarkts/native/src/bridges.cc
index 93a0a1c2796a403870d5aed261a69ef74bc406c8..1cfcbc022f2f04e72b73ae9d107d675d074b6ab5 100644
--- a/arkoala-arkts/libarkts/native/src/bridges.cc
+++ b/arkoala-arkts/libarkts/native/src/bridges.cc
@@ -502,14 +502,6 @@ KNativePointer impl_ScriptFunctionSignature(KNativePointer contextPtr, KNativePo
 }
 KOALA_INTEROP_2(ScriptFunctionSignature, KNativePointer, KNativePointer, KNativePointer)
 
-KNativePointer impl_ScriptFunctionIrSignature(KNativePointer contextPtr, KNativePointer nodePtr) {
-    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
-    auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
-
-    return GetImpl()->ScriptFunctionIrSignature(context, node);
-}
-KOALA_INTEROP_2(ScriptFunctionIrSignature, KNativePointer, KNativePointer, KNativePointer)
-
 KInt impl_ScriptFunctionFlagsConst(KNativePointer contextPtr, KNativePointer nodePtr) {
     auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
     auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
diff --git a/arkoala-arkts/libarkts/native/src/common.cc b/arkoala-arkts/libarkts/native/src/common.cc
index 9359998661bd48ccd09ddfe67b44b33c1e81ce03..cd93cfc62785d19eb0fba680fe36d537622becd5 100644
--- a/arkoala-arkts/libarkts/native/src/common.cc
+++ b/arkoala-arkts/libarkts/native/src/common.cc
@@ -39,7 +39,7 @@ static es2panda_Impl *impl = nullptr;
     #define LIB_SUFFIX ".so"
 #endif
 
-const char* libpath = "../node_modules/@panda/sdk/" PLUGIN_DIR "/lib/" LIB_PREFIX "es2panda-public" LIB_SUFFIX;
+const char* libpath = "../../incremental/tools/panda/node_modules/@panda/sdk/" PLUGIN_DIR "/lib/" LIB_PREFIX "es2panda-public" LIB_SUFFIX;
 
 es2panda_Impl *GetImpl() {
     if (impl) {
diff --git a/arkoala-arkts/libarkts/package.json b/arkoala-arkts/libarkts/package.json
index 749e73f9b1017ccd27fdd03b038c842c4fa8db2f..f72484a52e74db64d00c9114b5586a26d6ec419e 100644
--- a/arkoala-arkts/libarkts/package.json
+++ b/arkoala-arkts/libarkts/package.json
@@ -12,7 +12,7 @@
     "dependencies": {
     },
     "scripts": {
-        "panda:sdk:install": "npm install --prefix .. --no-save @panda/sdk@next",
+        "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install",
         "compile:koala:interop": "npm run --prefix ../../interop compile",
         "compile:meson": "cd native && meson setup build && meson compile -C build",
         "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda.node ./build/native/build",
@@ -25,7 +25,7 @@
         "mocha": "TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
         "test": "npm run compile:native && npm run mocha",
 
-        "run:abc": "node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=node_modules/@panda/sdk/ets/etsstdlib.abc ./generated/main.abc ETSGLOBAL::main",
+        "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./generated/main.abc ETSGLOBAL::main",
 
         "compile:playground": "cd playground && meson setup build && meson compile -C build",
         "run:playground": "npm run compile:playground && ./playground/build/playground.out"
diff --git a/arkoala-arkts/libarkts/playground/meson_options.txt b/arkoala-arkts/libarkts/playground/meson_options.txt
index 7087fc465404a2e3bbe2e326f465a862f82940b7..438cc37a430cad357339a85c8f6d1d9fc64eaf34 100644
--- a/arkoala-arkts/libarkts/playground/meson_options.txt
+++ b/arkoala-arkts/libarkts/playground/meson_options.txt
@@ -1,4 +1,4 @@
-option('panda_sdk_dir', type : 'string', value : '../../node_modules/@panda/sdk/',
+option('panda_sdk_dir', type : 'string', value : '../../../incremental/tools/panda/node_modules/@panda/sdk/',
     description : 'path to panda sdk')
 option('interop_src_dir', type : 'string', value : '../../../interop/src/cpp/',
     description : 'path to interop_src')
diff --git a/arkoala-arkts/libarkts/playground/src/playground.cc b/arkoala-arkts/libarkts/playground/src/playground.cc
index 0ed406401d665ca16be725d0e82e1905ac7c7cb7..ae8f4f7ab4144a59e563a289703ae4aad6444e76 100644
--- a/arkoala-arkts/libarkts/playground/src/playground.cc
+++ b/arkoala-arkts/libarkts/playground/src/playground.cc
@@ -9,7 +9,7 @@
     #define PLUGIN_DIR "linux_arm64_host_tools"
 #endif
 
-const char* libpath = "../node_modules/@panda/sdk/" PLUGIN_DIR "/lib/libes2panda-public.so";
+const char* libpath = "../../incremental/tools/panda/node_modules/@panda/sdk/" PLUGIN_DIR "/lib/libes2panda-public.so";
 
 static es2panda_Impl *impl = nullptr;
 
diff --git a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts b/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts
index 3f80d9f856dbc2baef60ea8b11ba60b68053e9d8..a2c2c756e0688512e399b88ec8d5274867a6dc39 100644
--- a/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts
+++ b/arkoala-arkts/libarkts/src/Es2pandaNativeModule.ts
@@ -134,9 +134,6 @@ export class Es2pandaNativeModule {
     _ScriptFunctionSetIdent(context: KPtr, ast: KPtr, id: KPtr): KPtr {
         throw new Error("Not implemented")
     }
-    _ScriptFunctionIrSignature(context: KPtr, ast: KPtr): KPtr {
-        throw new Error("Not implemented")
-    }
     _ScriptFunctionSetSignature(context: KPtr, ast: KPtr, signature: KPtr): KPtr {
         throw new Error("Not implemented")
     }
diff --git a/arkoala-arkts/libarkts/src/arkts-api/static/enums.ts b/arkoala-arkts/libarkts/src/arkts-api/static/enums.ts
index af5f1983e42d139c8613bd8d327ace024174d1a8..b457171d80dd8f4ddc71d4e4ad3cf59ca5844598 100644
--- a/arkoala-arkts/libarkts/src/arkts-api/static/enums.ts
+++ b/arkoala-arkts/libarkts/src/arkts-api/static/enums.ts
@@ -62,6 +62,7 @@ export enum Es2pandaContextState {
     ES2PANDA_STATE_ERROR = 7,
 };
 
+
 export enum Es2pandaAstNodeType {
     AST_NODE_TYPE_ARROW_FUNCTION_EXPRESSION,
     AST_NODE_TYPE_ANNOTATION_DECLARATION,
@@ -112,8 +113,6 @@ export enum Es2pandaAstNodeType {
     AST_NODE_TYPE_META_PROPERTY_EXPRESSION,
     AST_NODE_TYPE_METHOD_DEFINITION,
     AST_NODE_TYPE_NAMED_TYPE,
-    AST_NODE_TYPE_NAMESPACE_DECLARATION,
-    AST_NODE_TYPE_NAMESPACE_DEFINITION,
     AST_NODE_TYPE_NEW_EXPRESSION,
     AST_NODE_TYPE_NULL_LITERAL,
     AST_NODE_TYPE_UNDEFINED_LITERAL,
@@ -146,7 +145,7 @@ export enum Es2pandaAstNodeType {
     AST_NODE_TYPE_ETS_IMPORT_DECLARATION,
     AST_NODE_TYPE_ETS_PARAMETER_EXPRESSION,
     AST_NODE_TYPE_ETS_TUPLE,
-    AST_NODE_TYPE_ETS_SCRIPT,
+    AST_NODE_TYPE_ETS_MODULE,
     AST_NODE_TYPE_SUPER_EXPRESSION,
     AST_NODE_TYPE_STRUCT_DECLARATION,
     AST_NODE_TYPE_SWITCH_CASE_STATEMENT,
@@ -220,6 +219,7 @@ export enum Es2pandaAstNodeType {
     AST_NODE_TYPE_YIELD_EXPRESSION,
     AST_NODE_TYPE_OPAQUE_TYPE_NODE,
     AST_NODE_TYPE_BLOCK_EXPRESSION,
+    AST_NODE_TYPE_ERROR_TYPE_NODE,
     AST_NODE_TYPE_ARRAY_EXPRESSION,
     AST_NODE_TYPE_ARRAY_PATTERN,
     AST_NODE_TYPE_ASSIGNMENT_EXPRESSION,
@@ -228,7 +228,7 @@ export enum Es2pandaAstNodeType {
     AST_NODE_TYPE_OBJECT_PATTERN,
     AST_NODE_TYPE_SPREAD_ELEMENT,
     AST_NODE_TYPE_REST_ELEMENT,
-};
+}
 
 export enum Es2pandaTokenType {
     TOKEN_TYPE_EOS,
diff --git a/arkoala-arkts/libarkts/src/arkts-api/types.ts b/arkoala-arkts/libarkts/src/arkts-api/types.ts
index 0659a24cab247f562b65b83ba7d64a6480c72732..9e5cbb47e2d87e3123202c677e74d80e2fdaf981 100644
--- a/arkoala-arkts/libarkts/src/arkts-api/types.ts
+++ b/arkoala-arkts/libarkts/src/arkts-api/types.ts
@@ -192,7 +192,7 @@ export class Context extends ArktsObject {
 
 export class EtsScript extends Node {
     constructor(peer: KPtr) {
-        assertValidPeer(peer, Es2pandaAstNodeType.AST_NODE_TYPE_ETS_SCRIPT)
+        assertValidPeer(peer, Es2pandaAstNodeType.AST_NODE_TYPE_ETS_MODULE)
         if (!global.es2panda._IsProgram(global.context, peer)) {
             throwError('peer expected to be Program')
         }
diff --git a/arkoala-arkts/libarkts/src/arkts-api/utilities/private.ts b/arkoala-arkts/libarkts/src/arkts-api/utilities/private.ts
index 12f6a1f7c1794036d20b8e3e6e6d5be4b33933b1..a1fcf9593d3a4b617666c8253ef84d91ea3d3066 100644
--- a/arkoala-arkts/libarkts/src/arkts-api/utilities/private.ts
+++ b/arkoala-arkts/libarkts/src/arkts-api/utilities/private.ts
@@ -27,7 +27,7 @@ import * as path from "node:path"
 
 export function classByPeer(peer: KNativePointer): arkts.Node {
     const constructors = new Map<Es2pandaAstNodeType, { new(peer: KNativePointer): arkts.Node }>([
-        [Es2pandaAstNodeType.AST_NODE_TYPE_ETS_SCRIPT, arkts.EtsScript],
+        [Es2pandaAstNodeType.AST_NODE_TYPE_ETS_MODULE, arkts.EtsScript],
         [Es2pandaAstNodeType.AST_NODE_TYPE_IDENTIFIER, arkts.Identifier],
         [Es2pandaAstNodeType.AST_NODE_TYPE_STRING_LITERAL, arkts.StringLiteral],
         [Es2pandaAstNodeType.AST_NODE_TYPE_NUMBER_LITERAL, arkts.NumberLiteral],
diff --git a/arkoala-arkts/libarkts/src/ts-api/utilities/private.ts b/arkoala-arkts/libarkts/src/ts-api/utilities/private.ts
index 1b786445fa5fd40c49cbf65c44bc6227456ff9ab..cb842698e10a49dcf5940c0b4b491a28c9826a5d 100644
--- a/arkoala-arkts/libarkts/src/ts-api/utilities/private.ts
+++ b/arkoala-arkts/libarkts/src/ts-api/utilities/private.ts
@@ -64,7 +64,7 @@ type kindTypes =
 export function classByEtsNode(node: arkts.Node) {
     const types =
         new Map<Es2pandaAstNodeType, kindTypes>([
-            [Es2pandaAstNodeType.AST_NODE_TYPE_ETS_SCRIPT, ts.SourceFile],
+            [Es2pandaAstNodeType.AST_NODE_TYPE_ETS_MODULE, ts.SourceFile],
             [Es2pandaAstNodeType.AST_NODE_TYPE_IDENTIFIER, ts.Identifier],
             [Es2pandaAstNodeType.AST_NODE_TYPE_STRING_LITERAL, ts.StringLiteral],
             [Es2pandaAstNodeType.AST_NODE_TYPE_NUMBER_LITERAL, ts.NumericLiteral],