diff --git a/pom.xml b/pom.xml
index a0fa594..b8e5124 100755
--- a/pom.xml
+++ b/pom.xml
@@ -129,10 +129,10 @@
 	</dependencyManagement>
 
 	<modules>
-		<module>core</module>
-		<module>mina</module>
-		<module>bcprov</module>
-		<module>i2pcrypto</module>
+		<module>sshsig-core</module>
+		<module>sshsig-mina</module>
+		<module>sshsig-bcprov</module>
+		<module>sshsig-i2pcrypto</module>
 	</modules>
 
 	<build>
diff --git a/bcprov/SshSignatureGeneratorTest (bcprov)(JDK17).launch b/sshsig-bcprov/SshSignatureGeneratorTest (bcprov)(JDK17).launch
similarity index 100%
rename from bcprov/SshSignatureGeneratorTest (bcprov)(JDK17).launch
rename to sshsig-bcprov/SshSignatureGeneratorTest (bcprov)(JDK17).launch
diff --git a/bcprov/SshSignatureGeneratorTest (bcprov)(JDK8).launch b/sshsig-bcprov/SshSignatureGeneratorTest (bcprov)(JDK8).launch
similarity index 100%
rename from bcprov/SshSignatureGeneratorTest (bcprov)(JDK8).launch
rename to sshsig-bcprov/SshSignatureGeneratorTest (bcprov)(JDK8).launch
diff --git a/bcprov/pom.xml b/sshsig-bcprov/pom.xml
similarity index 100%
rename from bcprov/pom.xml
rename to sshsig-bcprov/pom.xml
diff --git a/bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshKeyUtil.java b/sshsig-bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshKeyUtil.java
similarity index 100%
rename from bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshKeyUtil.java
rename to sshsig-bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshKeyUtil.java
diff --git a/bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshSignatureGeneratorTest.java b/sshsig-bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshSignatureGeneratorTest.java
similarity index 100%
rename from bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshSignatureGeneratorTest.java
rename to sshsig-bcprov/src/test/java/de/profhenry/sshsig/bcprov/SshSignatureGeneratorTest.java
diff --git a/bcprov/src/test/resources/simplelogger.properties b/sshsig-bcprov/src/test/resources/simplelogger.properties
similarity index 100%
rename from bcprov/src/test/resources/simplelogger.properties
rename to sshsig-bcprov/src/test/resources/simplelogger.properties
diff --git a/core/SshSignatureGeneratorTest (core)(JDK17).launch b/sshsig-core/SshSignatureGeneratorTest (core)(JDK17).launch
similarity index 100%
rename from core/SshSignatureGeneratorTest (core)(JDK17).launch
rename to sshsig-core/SshSignatureGeneratorTest (core)(JDK17).launch
diff --git a/core/SshSignatureGeneratorTest (core)(JDK8).launch b/sshsig-core/SshSignatureGeneratorTest (core)(JDK8).launch
similarity index 100%
rename from core/SshSignatureGeneratorTest (core)(JDK8).launch
rename to sshsig-core/SshSignatureGeneratorTest (core)(JDK8).launch
diff --git a/core/pom.xml b/sshsig-core/pom.xml
similarity index 100%
rename from core/pom.xml
rename to sshsig-core/pom.xml
diff --git a/core/src/main/java/de/profhenry/sshsig/core/HashAlgorithm.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/HashAlgorithm.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/HashAlgorithm.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/HashAlgorithm.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/JcaSingingBackend.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/JcaSingingBackend.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/JcaSingingBackend.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/JcaSingingBackend.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/PublicKeyEncoder.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/PublicKeyEncoder.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/PublicKeyEncoder.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/PublicKeyEncoder.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/SignatureAlgorithm.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/SignatureAlgorithm.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/SignatureAlgorithm.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/SignatureAlgorithm.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/SshBuffer.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/SshBuffer.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/SshBuffer.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/SshBuffer.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/SshSignature.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/SshSignature.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/SshSignature.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/SshSignature.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/SshSignatureException.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/SshSignatureException.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/SshSignatureException.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/SshSignatureException.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/SshSignatureGenerator.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/SshSignatureGenerator.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/SshSignatureGenerator.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/SshSignatureGenerator.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/spi/SigningBackend.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/spi/SigningBackend.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/spi/SigningBackend.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/spi/SigningBackend.java
diff --git a/core/src/main/java/de/profhenry/sshsig/core/util/HexUtil.java b/sshsig-core/src/main/java/de/profhenry/sshsig/core/util/HexUtil.java
similarity index 100%
rename from core/src/main/java/de/profhenry/sshsig/core/util/HexUtil.java
rename to sshsig-core/src/main/java/de/profhenry/sshsig/core/util/HexUtil.java
diff --git a/core/src/test/java/de/profhenry/sshsig/core/SshKeyUtil.java b/sshsig-core/src/test/java/de/profhenry/sshsig/core/SshKeyUtil.java
similarity index 100%
rename from core/src/test/java/de/profhenry/sshsig/core/SshKeyUtil.java
rename to sshsig-core/src/test/java/de/profhenry/sshsig/core/SshKeyUtil.java
diff --git a/core/src/test/java/de/profhenry/sshsig/core/SshSignatureGeneratorTest.java b/sshsig-core/src/test/java/de/profhenry/sshsig/core/SshSignatureGeneratorTest.java
similarity index 100%
rename from core/src/test/java/de/profhenry/sshsig/core/SshSignatureGeneratorTest.java
rename to sshsig-core/src/test/java/de/profhenry/sshsig/core/SshSignatureGeneratorTest.java
diff --git a/core/src/test/resources/simplelogger.properties b/sshsig-core/src/test/resources/simplelogger.properties
similarity index 100%
rename from core/src/test/resources/simplelogger.properties
rename to sshsig-core/src/test/resources/simplelogger.properties
diff --git a/i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK17).launch b/sshsig-i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK17).launch
similarity index 95%
rename from i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK17).launch
rename to sshsig-i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK17).launch
index ccf33c0..419effe 100644
--- a/i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK17).launch	
+++ b/sshsig-i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK17).launch	
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/sshsig.i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java"/>
+        <listEntry value="/sshsig-i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
@@ -18,7 +18,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="de.profhenry.sshsig.i2pcrypto.SshSignatureGeneratorTest"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="sshsig.i2pcrypto"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="sshsig-i2pcrypto"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 </launchConfiguration>
diff --git a/i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK8).launch b/sshsig-i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK8).launch
similarity index 94%
rename from i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK8).launch
rename to sshsig-i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK8).launch
index e14ec8b..596ba3b 100644
--- a/i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK8).launch	
+++ b/sshsig-i2pcrypto/SshSignatureGeneratorTest (i2pcrypto)(JDK8).launch	
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/sshsig.i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java"/>
+        <listEntry value="/sshsig-i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
@@ -14,7 +14,7 @@
     <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="de.profhenry.sshsig.i2pcrypto.SshSignatureGeneratorTest"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="sshsig.i2pcrypto"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="sshsig-i2pcrypto"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 </launchConfiguration>
diff --git a/i2pcrypto/pom.xml b/sshsig-i2pcrypto/pom.xml
similarity index 97%
rename from i2pcrypto/pom.xml
rename to sshsig-i2pcrypto/pom.xml
index 29b86c3..804301e 100644
--- a/i2pcrypto/pom.xml
+++ b/sshsig-i2pcrypto/pom.xml
@@ -9,7 +9,7 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>sshsig.i2pcrypto</artifactId>
+	<artifactId>sshsig-i2pcrypto</artifactId>
 	<name>SSHSIG :: Tests for net.i2p.crypto:eddsa</name>
 
 	<properties>
diff --git a/i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshKeyUtil.java b/sshsig-i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshKeyUtil.java
similarity index 100%
rename from i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshKeyUtil.java
rename to sshsig-i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshKeyUtil.java
diff --git a/i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java b/sshsig-i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java
similarity index 100%
rename from i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java
rename to sshsig-i2pcrypto/src/test/java/de/profhenry/sshsig/i2pcrypto/SshSignatureGeneratorTest.java
diff --git a/i2pcrypto/src/test/resources/simplelogger.properties b/sshsig-i2pcrypto/src/test/resources/simplelogger.properties
similarity index 100%
rename from i2pcrypto/src/test/resources/simplelogger.properties
rename to sshsig-i2pcrypto/src/test/resources/simplelogger.properties
diff --git a/mina/SshSignatureGeneratorTest (mina)(JDK17).launch b/sshsig-mina/SshSignatureGeneratorTest (mina)(JDK17).launch
similarity index 100%
rename from mina/SshSignatureGeneratorTest (mina)(JDK17).launch
rename to sshsig-mina/SshSignatureGeneratorTest (mina)(JDK17).launch
diff --git a/mina/SshSignatureGeneratorTest (mina)(JDK8).launch b/sshsig-mina/SshSignatureGeneratorTest (mina)(JDK8).launch
similarity index 100%
rename from mina/SshSignatureGeneratorTest (mina)(JDK8).launch
rename to sshsig-mina/SshSignatureGeneratorTest (mina)(JDK8).launch
diff --git a/mina/pom.xml b/sshsig-mina/pom.xml
similarity index 100%
rename from mina/pom.xml
rename to sshsig-mina/pom.xml
diff --git a/mina/src/main/java/de/profhenry/sshsig/mina/ApacheMinaSshAgentEngine.java b/sshsig-mina/src/main/java/de/profhenry/sshsig/mina/ApacheMinaSshAgentEngine.java
similarity index 100%
rename from mina/src/main/java/de/profhenry/sshsig/mina/ApacheMinaSshAgentEngine.java
rename to sshsig-mina/src/main/java/de/profhenry/sshsig/mina/ApacheMinaSshAgentEngine.java
diff --git a/mina/src/test/java/de/profhenry/sshsig/mina/SshKeyUtil.java b/sshsig-mina/src/test/java/de/profhenry/sshsig/mina/SshKeyUtil.java
similarity index 100%
rename from mina/src/test/java/de/profhenry/sshsig/mina/SshKeyUtil.java
rename to sshsig-mina/src/test/java/de/profhenry/sshsig/mina/SshKeyUtil.java
diff --git a/mina/src/test/java/de/profhenry/sshsig/mina/SshSignatureGeneratorTest.java b/sshsig-mina/src/test/java/de/profhenry/sshsig/mina/SshSignatureGeneratorTest.java
similarity index 100%
rename from mina/src/test/java/de/profhenry/sshsig/mina/SshSignatureGeneratorTest.java
rename to sshsig-mina/src/test/java/de/profhenry/sshsig/mina/SshSignatureGeneratorTest.java
diff --git a/mina/src/test/resources/simplelogger.properties b/sshsig-mina/src/test/resources/simplelogger.properties
similarity index 100%
rename from mina/src/test/resources/simplelogger.properties
rename to sshsig-mina/src/test/resources/simplelogger.properties