diff --git a/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java
index 51cd37a2..b2159ed8 100644
--- a/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java
+++ b/src/main/java/org/pgpainless/pgpainless/encryption_signing/EncryptionBuilderInterface.java
@@ -25,7 +25,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
-import org.pgpainless.pgpainless.SecretKeyNotFoundException;
+import org.pgpainless.pgpainless.exception.SecretKeyNotFoundException;
 import org.pgpainless.pgpainless.algorithm.CompressionAlgorithm;
 import org.pgpainless.pgpainless.algorithm.HashAlgorithm;
 import org.pgpainless.pgpainless.algorithm.SymmetricKeyAlgorithm;
diff --git a/src/main/java/org/pgpainless/pgpainless/PublicKeyNotFoundException.java b/src/main/java/org/pgpainless/pgpainless/exception/PublicKeyNotFoundException.java
similarity index 96%
rename from src/main/java/org/pgpainless/pgpainless/PublicKeyNotFoundException.java
rename to src/main/java/org/pgpainless/pgpainless/exception/PublicKeyNotFoundException.java
index 4a86f5f0..962c7d05 100644
--- a/src/main/java/org/pgpainless/pgpainless/PublicKeyNotFoundException.java
+++ b/src/main/java/org/pgpainless/pgpainless/exception/PublicKeyNotFoundException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.pgpainless;
+package org.pgpainless.pgpainless.exception;
 
 import org.bouncycastle.openpgp.PGPException;
 
diff --git a/src/main/java/org/pgpainless/pgpainless/SecretKeyNotFoundException.java b/src/main/java/org/pgpainless/pgpainless/exception/SecretKeyNotFoundException.java
similarity index 95%
rename from src/main/java/org/pgpainless/pgpainless/SecretKeyNotFoundException.java
rename to src/main/java/org/pgpainless/pgpainless/exception/SecretKeyNotFoundException.java
index 0b3d0f19..cd683f2b 100644
--- a/src/main/java/org/pgpainless/pgpainless/SecretKeyNotFoundException.java
+++ b/src/main/java/org/pgpainless/pgpainless/exception/SecretKeyNotFoundException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.pgpainless;
+package org.pgpainless.pgpainless.exception;
 
 public class SecretKeyNotFoundException extends Exception {
 
diff --git a/src/main/java/org/pgpainless/pgpainless/exception/package-info.java b/src/main/java/org/pgpainless/pgpainless/exception/package-info.java
new file mode 100644
index 00000000..c6772dc1
--- /dev/null
+++ b/src/main/java/org/pgpainless/pgpainless/exception/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on 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.
+ */
+/**
+ * Exceptions.
+ */
+package org.pgpainless.pgpainless.exception;