diff --git a/src/main/java/io/iworkflow/core/Client.java b/src/main/java/io/iworkflow/core/Client.java
index 6369529..d601a64 100644
--- a/src/main/java/io/iworkflow/core/Client.java
+++ b/src/main/java/io/iworkflow/core/Client.java
@@ -1,6 +1,5 @@
 package io.iworkflow.core;
 
-import io.iworkflow.core.exceptions.ClientSideException;
 import io.iworkflow.core.mapper.StateMovementMapper;
 import io.iworkflow.core.persistence.PersistenceOptions;
 import io.iworkflow.gen.models.ErrorSubStatus;
diff --git a/src/main/java/io/iworkflow/core/exceptions/ClientSideException.java b/src/main/java/io/iworkflow/core/ClientSideException.java
similarity index 93%
rename from src/main/java/io/iworkflow/core/exceptions/ClientSideException.java
rename to src/main/java/io/iworkflow/core/ClientSideException.java
index e19d9ed..5b38889 100644
--- a/src/main/java/io/iworkflow/core/exceptions/ClientSideException.java
+++ b/src/main/java/io/iworkflow/core/ClientSideException.java
@@ -1,4 +1,4 @@
-package io.iworkflow.core.exceptions;
+package io.iworkflow.core;
 
 import feign.FeignException;
 import io.iworkflow.core.IwfHttpException;
diff --git a/src/main/java/io/iworkflow/core/IwfHttpException.java b/src/main/java/io/iworkflow/core/IwfHttpException.java
index 0697d67..7eb4115 100644
--- a/src/main/java/io/iworkflow/core/IwfHttpException.java
+++ b/src/main/java/io/iworkflow/core/IwfHttpException.java
@@ -1,7 +1,6 @@
 package io.iworkflow.core;
 
 import feign.FeignException;
-import io.iworkflow.core.exceptions.ClientSideException;
 import io.iworkflow.core.exceptions.LongPollTimeoutException;
 import io.iworkflow.core.exceptions.WorkflowAlreadyStartedException;
 import io.iworkflow.core.exceptions.WorkflowNotExistsOrOpenException;
diff --git a/src/main/java/io/iworkflow/core/exceptions/LongPollTimeoutException.java b/src/main/java/io/iworkflow/core/exceptions/LongPollTimeoutException.java
index 2447ea3..3094a89 100644
--- a/src/main/java/io/iworkflow/core/exceptions/LongPollTimeoutException.java
+++ b/src/main/java/io/iworkflow/core/exceptions/LongPollTimeoutException.java
@@ -1,5 +1,7 @@
 package io.iworkflow.core.exceptions;
 
+import io.iworkflow.core.ClientSideException;
+
 public class LongPollTimeoutException extends ClientSideException {
     public LongPollTimeoutException(
             final ClientSideException exception) {
diff --git a/src/main/java/io/iworkflow/core/exceptions/WorkflowAlreadyStartedException.java b/src/main/java/io/iworkflow/core/exceptions/WorkflowAlreadyStartedException.java
index 64f4a2c..cb3b95a 100644
--- a/src/main/java/io/iworkflow/core/exceptions/WorkflowAlreadyStartedException.java
+++ b/src/main/java/io/iworkflow/core/exceptions/WorkflowAlreadyStartedException.java
@@ -1,5 +1,7 @@
 package io.iworkflow.core.exceptions;
 
+import io.iworkflow.core.ClientSideException;
+
 public class WorkflowAlreadyStartedException extends ClientSideException {
     public WorkflowAlreadyStartedException(
             final ClientSideException exception) {
diff --git a/src/main/java/io/iworkflow/core/exceptions/WorkflowNotExistsOrOpenException.java b/src/main/java/io/iworkflow/core/exceptions/WorkflowNotExistsOrOpenException.java
index 4232631..7937db9 100644
--- a/src/main/java/io/iworkflow/core/exceptions/WorkflowNotExistsOrOpenException.java
+++ b/src/main/java/io/iworkflow/core/exceptions/WorkflowNotExistsOrOpenException.java
@@ -1,5 +1,7 @@
 package io.iworkflow.core.exceptions;
 
+import io.iworkflow.core.ClientSideException;
+
 public class WorkflowNotExistsOrOpenException extends ClientSideException {
     public WorkflowNotExistsOrOpenException(
             final ClientSideException exception) {
diff --git a/src/test/java/io/iworkflow/integ/RpcTest.java b/src/test/java/io/iworkflow/integ/RpcTest.java
index 207a204..75b3535 100644
--- a/src/test/java/io/iworkflow/integ/RpcTest.java
+++ b/src/test/java/io/iworkflow/integ/RpcTest.java
@@ -3,7 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.iworkflow.core.Client;
 import io.iworkflow.core.ClientOptions;
-import io.iworkflow.core.exceptions.ClientSideException;
+import io.iworkflow.core.ClientSideException;
 import io.iworkflow.core.ImmutableStopWorkflowOptions;
 import io.iworkflow.core.ImmutableWorkflowOptions;
 import io.iworkflow.gen.models.*;