diff --git a/core/src/main/java/org/web3j/crypto/Bip44WalletUtils.java b/core/src/main/java/org/web3j/crypto/Bip44WalletUtils.java
index c0c3d39aa..a8fda16a2 100644
--- a/core/src/main/java/org/web3j/crypto/Bip44WalletUtils.java
+++ b/core/src/main/java/org/web3j/crypto/Bip44WalletUtils.java
@@ -15,6 +15,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import org.web3j.crypto.exception.CipherException;
+
 import static org.web3j.crypto.Bip32ECKeyPair.HARDENED_BIT;
 
 public class Bip44WalletUtils extends WalletUtils {
diff --git a/core/src/main/java/org/web3j/crypto/Wallet.java b/core/src/main/java/org/web3j/crypto/Wallet.java
index f4c15ea13..3f058daff 100644
--- a/core/src/main/java/org/web3j/crypto/Wallet.java
+++ b/core/src/main/java/org/web3j/crypto/Wallet.java
@@ -29,6 +29,7 @@
 import org.bouncycastle.crypto.generators.SCrypt;
 import org.bouncycastle.crypto.params.KeyParameter;
 
+import org.web3j.crypto.exception.CipherException;
 import org.web3j.utils.Numeric;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/core/src/main/java/org/web3j/crypto/WalletUtils.java b/core/src/main/java/org/web3j/crypto/WalletUtils.java
index e5ba08e31..0eae3cd8a 100644
--- a/core/src/main/java/org/web3j/crypto/WalletUtils.java
+++ b/core/src/main/java/org/web3j/crypto/WalletUtils.java
@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.web3j.crypto.exception.CipherException;
 import org.web3j.utils.Numeric;
 
 import static org.web3j.crypto.Hash.sha256;
diff --git a/crypto/src/main/java/org/web3j/crypto/CipherException.java b/crypto/src/main/java/org/web3j/crypto/exception/CipherException.java
similarity index 96%
rename from crypto/src/main/java/org/web3j/crypto/CipherException.java
rename to crypto/src/main/java/org/web3j/crypto/exception/CipherException.java
index 74ae94b53..4e9b32a60 100644
--- a/crypto/src/main/java/org/web3j/crypto/CipherException.java
+++ b/crypto/src/main/java/org/web3j/crypto/exception/CipherException.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.web3j.crypto;
+package org.web3j.crypto.exception;
 
 /** Cipher exception wrapper. */
 public class CipherException extends Exception {