diff --git a/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java b/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java
index 913a130..ef55e93 100644
--- a/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java
+++ b/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java
@@ -3,6 +3,7 @@ package net.lamgc.oracle.sentry;
 import com.google.common.base.Throwables;
 import net.lamgc.oracle.sentry.oci.account.OracleAccount;
 import net.lamgc.oracle.sentry.oci.account.OracleAccountManager;
+import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager;
 import net.lamgc.oracle.sentry.script.ScriptComponents;
 import net.lamgc.oracle.sentry.script.ScriptLoggerFactory;
 import net.lamgc.oracle.sentry.script.ScriptManager;
diff --git a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java
index d2b6181..2d2571c 100644
--- a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java
+++ b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java
@@ -8,7 +8,6 @@ import com.oracle.bmc.core.requests.InstanceActionRequest;
 import com.oracle.bmc.core.responses.GetImageResponse;
 import com.oracle.bmc.core.responses.GetInstanceResponse;
 import com.oracle.bmc.core.responses.InstanceActionResponse;
-import net.lamgc.oracle.sentry.ComputeInstanceManager;
 import net.lamgc.oracle.sentry.oci.account.OracleAccount;
 import net.lamgc.oracle.sentry.oci.compute.ssh.InstanceSsh;
 import net.lamgc.oracle.sentry.oci.compute.ssh.SshAuthInfo;
diff --git a/src/main/java/net/lamgc/oracle/sentry/ComputeInstanceManager.java b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstanceManager.java
similarity index 98%
rename from src/main/java/net/lamgc/oracle/sentry/ComputeInstanceManager.java
rename to src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstanceManager.java
index 58437f3..a9f7609 100644
--- a/src/main/java/net/lamgc/oracle/sentry/ComputeInstanceManager.java
+++ b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstanceManager.java
@@ -1,4 +1,4 @@
-package net.lamgc.oracle.sentry;
+package net.lamgc.oracle.sentry.oci.compute;
 
 import com.oracle.bmc.core.model.Instance;
 import com.oracle.bmc.core.requests.ListInstancesRequest;
@@ -7,7 +7,6 @@ import com.oracle.bmc.identity.model.Compartment;
 import com.oracle.bmc.identity.requests.ListCompartmentsRequest;
 import com.oracle.bmc.identity.responses.ListCompartmentsResponse;
 import net.lamgc.oracle.sentry.oci.account.OracleAccount;
-import net.lamgc.oracle.sentry.oci.compute.ComputeInstance;
 import net.lamgc.oracle.sentry.oci.compute.ssh.SshAuthIdentityProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java
index 0db9ba9..0742964 100644
--- a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java
+++ b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java
@@ -4,7 +4,7 @@ import com.google.common.reflect.TypeToken;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import net.lamgc.oracle.sentry.ComputeInstanceManager;
+import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager;
 import net.lamgc.oracle.sentry.oci.compute.ComputeInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java b/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java
index abee22f..e313a2b 100644
--- a/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java
+++ b/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java
@@ -1,6 +1,6 @@
 package net.lamgc.oracle.sentry.script;
 
-import net.lamgc.oracle.sentry.ComputeInstanceManager;
+import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager;
 import net.lamgc.oracle.sentry.oci.account.OracleAccountManager;
 import net.lamgc.oracle.sentry.script.tools.http.ScriptHttpClient;
 
diff --git a/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java b/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java
index c7f65e0..35b5f02 100644
--- a/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java
+++ b/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java
@@ -5,7 +5,7 @@ import com.oracle.bmc.core.ComputeClient;
 import com.oracle.bmc.core.model.Instance;
 import com.oracle.bmc.core.requests.GetInstanceRequest;
 import groovy.lang.Closure;
-import net.lamgc.oracle.sentry.ComputeInstanceManager;
+import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager;
 import net.lamgc.oracle.sentry.oci.compute.ComputeInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java b/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java
index 911935f..a419dad 100644
--- a/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java
+++ b/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java
@@ -1,6 +1,6 @@
 package net.lamgc.oracle.sentry.script;
 
-import net.lamgc.oracle.sentry.ComputeInstanceManager;
+import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager;
 import net.lamgc.oracle.sentry.oci.account.OracleAccountManager;
 import net.lamgc.oracle.sentry.script.tools.http.ScriptHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;