diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index ad25f04..f4ed6b6 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/bcsop-cli/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bcsop-cli/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bcsop/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bcsop/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../bc-sop-api/bcsop/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../bc-sop-api/bcsop/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/bc-sop-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/bc-sop-api/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/bc-sop-cli/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/bc-sop-cli/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
diff --git a/bcsop/pom.xml b/bc-sop-api/pom.xml
similarity index 98%
rename from bcsop/pom.xml
rename to bc-sop-api/pom.xml
index b8d37fb..34e9867 100644
--- a/bcsop/pom.xml
+++ b/bc-sop-api/pom.xml
@@ -9,7 +9,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>bcsop</artifactId>
+    <artifactId>bc-sop-api</artifactId>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOP.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOP.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOP.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOP.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/DetachedVerifyTest.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/DetachedVerifyTest.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/DetachedVerifyTest.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/DetachedVerifyTest.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/AbstractBCOperation.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/AbstractBCOperation.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/AbstractBCOperation.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/AbstractBCOperation.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCArmor.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCArmor.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCArmor.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCArmor.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDearmor.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDearmor.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDearmor.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDearmor.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDecrypt.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDecrypt.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDecrypt.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDecrypt.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedSign.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedSign.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedSign.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedSign.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedVerify.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedVerify.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedVerify.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCDetachedVerify.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCEncrypt.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCEncrypt.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCEncrypt.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCEncrypt.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCExtractCert.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCExtractCert.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCExtractCert.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCExtractCert.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCGenerateKey.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCGenerateKey.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCGenerateKey.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCGenerateKey.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineSign.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineSign.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineSign.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineSign.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineVerify.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineVerify.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineVerify.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCInlineVerify.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCListProfiles.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCListProfiles.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCListProfiles.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCListProfiles.java
diff --git a/bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCVersion.java b/bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCVersion.java
similarity index 100%
rename from bcsop/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCVersion.java
rename to bc-sop-api/src/main/java/org/pgpainless/bouncycastle/sop/operation/BCVersion.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOPInstanceFactory.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOPInstanceFactory.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOPInstanceFactory.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/BouncyCastleSOPInstanceFactory.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopArmorDearmorTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopArmorDearmorTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopArmorDearmorTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopArmorDearmorTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopChangeKeyPasswordTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopChangeKeyPasswordTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopChangeKeyPasswordTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopChangeKeyPasswordTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDecryptWithSessionKeyTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDecryptWithSessionKeyTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDecryptWithSessionKeyTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDecryptWithSessionKeyTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDetachedSignDetachedVerifyTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDetachedSignDetachedVerifyTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDetachedSignDetachedVerifyTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopDetachedSignDetachedVerifyTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopEncryptDecryptTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopEncryptDecryptTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopEncryptDecryptTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopEncryptDecryptTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopExtractCertTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopExtractCertTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopExtractCertTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopExtractCertTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopGenerateKeyTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopGenerateKeyTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopGenerateKeyTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopGenerateKeyTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineDetachDetachedVerifyTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineDetachDetachedVerifyTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineDetachDetachedVerifyTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineDetachDetachedVerifyTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineVerifyTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineVerifyTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineVerifyTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopInlineSignInlineVerifyTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopRevokeKeyTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopRevokeKeyTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopRevokeKeyTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopRevokeKeyTest.java
diff --git a/bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopVersionTest.java b/bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopVersionTest.java
similarity index 100%
rename from bcsop/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopVersionTest.java
rename to bc-sop-api/src/test/java/org/pgpainless/bouncycastle/sop/operation/BCSopVersionTest.java
diff --git a/bcsop-cli/pom.xml b/bc-sop-cli/pom.xml
similarity index 98%
rename from bcsop-cli/pom.xml
rename to bc-sop-cli/pom.xml
index 23af016..f869df2 100644
--- a/bcsop-cli/pom.xml
+++ b/bc-sop-cli/pom.xml
@@ -9,7 +9,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>bcsop-cli</artifactId>
+    <artifactId>bc-sop-cli</artifactId>
     <packaging>jar</packaging>
 
     <properties>
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>org.pgpainless</groupId>
-            <artifactId>bcsop</artifactId>
+            <artifactId>bc-sop-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
diff --git a/bcsop-cli/src/main/java/org/pgpainless/BcSopCLI.java b/bc-sop-cli/src/main/java/org/pgpainless/BcSopCLI.java
similarity index 100%
rename from bcsop-cli/src/main/java/org/pgpainless/BcSopCLI.java
rename to bc-sop-cli/src/main/java/org/pgpainless/BcSopCLI.java
diff --git a/pom.xml b/pom.xml
index 076c524..e522f76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
-        <module>bcsop</module>
-        <module>bcsop-cli</module>
+        <module>bc-sop-api</module>
+        <module>bc-sop-cli</module>
     </modules>
 
     <properties>
diff --git a/src/main/java/org/pgpainless/Main.java b/src/main/java/org/pgpainless/Main.java
deleted file mode 100644
index e6dea03..0000000
--- a/src/main/java/org/pgpainless/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.pgpainless;
-
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}
\ No newline at end of file