diff --git a/pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java b/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java
similarity index 99%
rename from pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java
rename to pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java
index 9d0963cc..0d6cfa7e 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless;
+package org.pgpainless.encryption_signing;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
@@ -35,12 +35,12 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.util.io.Streams;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.pgpainless.PGPainless;
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
 import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
 import org.pgpainless.decryption_verification.DecryptionStream;
 import org.pgpainless.decryption_verification.OpenPgpMetadata;
-import org.pgpainless.encryption_signing.EncryptionStream;
 import org.pgpainless.key.collection.PGPKeyRing;
 import org.pgpainless.key.generation.KeySpec;
 import org.pgpainless.key.generation.type.ElGamal_GENERAL;
diff --git a/pgpainless-core/src/test/java/org/pgpainless/LengthTest.java b/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/LengthTest.java
similarity index 98%
rename from pgpainless-core/src/test/java/org/pgpainless/LengthTest.java
rename to pgpainless-core/src/test/java/org/pgpainless/encryption_signing/LengthTest.java
index 57da01ae..aa335a2a 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/LengthTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/LengthTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless;
+package org.pgpainless.encryption_signing;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,6 +31,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.util.io.Streams;
 import org.junit.Ignore;
+import org.pgpainless.PGPainless;
 import org.pgpainless.key.TestKeys;
 import org.pgpainless.key.collection.PGPKeyRing;
 import org.pgpainless.key.generation.type.length.RsaLength;
diff --git a/pgpainless-core/src/test/java/org/pgpainless/BouncycastleExportSubkeys.java b/pgpainless-core/src/test/java/org/pgpainless/key/BouncycastleExportSubkeys.java
similarity index 99%
rename from pgpainless-core/src/test/java/org/pgpainless/BouncycastleExportSubkeys.java
rename to pgpainless-core/src/test/java/org/pgpainless/key/BouncycastleExportSubkeys.java
index 322f6858..51411b39 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/BouncycastleExportSubkeys.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/key/BouncycastleExportSubkeys.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless;
+package org.pgpainless.key;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyPair;
diff --git a/pgpainless-core/src/test/java/org/pgpainless/ProviderFactoryTest.java b/pgpainless-core/src/test/java/org/pgpainless/provider/ProviderFactoryTest.java
similarity index 92%
rename from pgpainless-core/src/test/java/org/pgpainless/ProviderFactoryTest.java
rename to pgpainless-core/src/test/java/org/pgpainless/provider/ProviderFactoryTest.java
index 985251b6..43e65bc5 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/ProviderFactoryTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/provider/ProviderFactoryTest.java
@@ -13,15 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless;
+package org.pgpainless.provider;
 
 import static junit.framework.TestCase.assertEquals;
 
 import java.security.Provider;
 
 import org.junit.Test;
-import org.pgpainless.provider.BouncyCastleProviderFactory;
-import org.pgpainless.provider.ProviderFactory;
 
 public class ProviderFactoryTest {
 
diff --git a/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/SymmetricEncryptionTest.java b/pgpainless-core/src/test/java/org/pgpainless/symmetric_encryption/SymmetricEncryptionTest.java
similarity index 98%
rename from pgpainless-core/src/test/java/org/pgpainless/encryption_signing/SymmetricEncryptionTest.java
rename to pgpainless-core/src/test/java/org/pgpainless/symmetric_encryption/SymmetricEncryptionTest.java
index 3c631c8e..6b24c58b 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/encryption_signing/SymmetricEncryptionTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/symmetric_encryption/SymmetricEncryptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.encryption_signing;
+package org.pgpainless.symmetric_encryption;
 
 import static org.junit.Assert.assertArrayEquals;
 
diff --git a/pgpainless-core/src/test/java/org/pgpainless/BCUtilTest.java b/pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java
similarity index 98%
rename from pgpainless-core/src/test/java/org/pgpainless/BCUtilTest.java
rename to pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java
index cc6e8a18..0c3a4547 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/BCUtilTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless;
+package org.pgpainless.util;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
@@ -36,11 +36,11 @@ import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.junit.Test;
+import org.pgpainless.PGPainless;
 import org.pgpainless.key.collection.PGPKeyRing;
 import org.pgpainless.key.generation.KeySpec;
 import org.pgpainless.key.generation.type.RSA_GENERAL;
 import org.pgpainless.key.generation.type.length.RsaLength;
-import org.pgpainless.util.BCUtil;
 
 public class BCUtilTest {