diff --git a/native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunScript.java b/native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunScript.java
index b297470..83a20fe 100644
--- a/native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunScript.java
+++ b/native-cli/src/main/java/org/mule/weave/cli/pico/PicoRunScript.java
@@ -5,7 +5,7 @@
 import org.mule.weave.dwnative.cli.commands.RunWeaveCommand;
 import org.mule.weave.dwnative.cli.commands.WeaveModule;
 import org.mule.weave.dwnative.cli.commands.WeaveRunnerConfig;
-import org.mule.weave.v2.io.FileHelper;
+import org.mule.weave.v2.core.io.FileHelper;
 import org.mule.weave.v2.parser.ast.variables.NameIdentifier;
 import org.mule.weave.v2.utils.DataWeaveVersion;
 import picocli.CommandLine;
diff --git a/native-cli/src/main/java/org/mule/weave/cli/pico/PicoValidateScript.java b/native-cli/src/main/java/org/mule/weave/cli/pico/PicoValidateScript.java
index d22a902..e9e4208 100644
--- a/native-cli/src/main/java/org/mule/weave/cli/pico/PicoValidateScript.java
+++ b/native-cli/src/main/java/org/mule/weave/cli/pico/PicoValidateScript.java
@@ -5,7 +5,7 @@
 import org.mule.weave.dwnative.cli.commands.VerifyWeaveCommand;
 import org.mule.weave.dwnative.cli.commands.WeaveModule;
 import org.mule.weave.dwnative.cli.commands.WeaveVerifyConfig;
-import org.mule.weave.v2.io.FileHelper;
+import org.mule.weave.v2.core.io.FileHelper;
 import org.mule.weave.v2.parser.ast.variables.NameIdentifier;
 import org.mule.weave.v2.utils.DataWeaveVersion;
 import picocli.CommandLine;
diff --git a/native-cli/src/main/scala/org/mule/weave/dwnative/NativeRuntime.scala b/native-cli/src/main/scala/org/mule/weave/dwnative/NativeRuntime.scala
index cd46da6..ef4a12f 100644
--- a/native-cli/src/main/scala/org/mule/weave/dwnative/NativeRuntime.scala
+++ b/native-cli/src/main/scala/org/mule/weave/dwnative/NativeRuntime.scala
@@ -4,12 +4,12 @@ import io.netty.util.internal.PlatformDependent
 import org.mule.weave.dwnative.cli.Console
 import org.mule.weave.dwnative.initializer.NativeSystemModuleComponents
 import org.mule.weave.dwnative.utils.DataWeaveUtils
-import org.mule.weave.v2.exception.InvalidLocationException
+import org.mule.weave.v2.core.exception.InvalidLocationException
+import org.mule.weave.v2.core.io.service.CustomWorkingDirectoryService
+import org.mule.weave.v2.core.io.service.WorkingDirectoryService
 import org.mule.weave.v2.interpreted.CustomRuntimeModuleNodeCompiler
 import org.mule.weave.v2.interpreted.RuntimeModuleNodeCompiler
 import org.mule.weave.v2.interpreted.module.WeaveDataFormat
-import org.mule.weave.v2.io.service.CustomWorkingDirectoryService
-import org.mule.weave.v2.io.service.WorkingDirectoryService
 import org.mule.weave.v2.model.EvaluationContext
 import org.mule.weave.v2.model.ServiceManager
 import org.mule.weave.v2.model.service.{CharsetProviderService, DefaultSecurityManagerService, LoggingService, ProtocolUrlSourceProviderResolverService, ReadFunctionProtocolHandler, SecurityManagerService, UrlProtocolHandler, UrlSourceProviderResolverService, WeaveRuntimePrivilege}