diff --git a/base/src/main/java/de/staropensource/sosengine/base/Engine.java b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
index e84d5d8..1fd8342 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -27,7 +27,7 @@ import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioning
 import de.staropensource.sosengine.base.events.EngineCrashEvent;
 import de.staropensource.sosengine.base.events.EngineShutdownEvent;
 import de.staropensource.sosengine.base.events.LogEvent;
-import de.staropensource.sosengine.base.exceptions.UnmetDependenciesException;
+import de.staropensource.sosengine.base.exceptions.dependency.UnmetDependenciesException;
 import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.internal.types.DependencySubsystemVector;
 import de.staropensource.sosengine.base.logging.CrashHandler;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java
index 7235dcb..dc9a304 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.classes;
 
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/FourNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/FourNumberVersioningSystem.java
index a116ff1..6980bad 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/FourNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/FourNumberVersioningSystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/OneNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/OneNumberVersioningSystem.java
index f228e24..5677c1f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/OneNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/OneNumberVersioningSystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/SemanticVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/SemanticVersioningSystem.java
index e602369..1c32dcb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/SemanticVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/SemanticVersioningSystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/StarOpenSourceVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/StarOpenSourceVersioningSystem.java
index b3ac4f9..b508ee2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/StarOpenSourceVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/StarOpenSourceVersioningSystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.types.VersionType;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/ThreeNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/ThreeNumberVersioningSystem.java
index af9837d..4fdeba2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/ThreeNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/ThreeNumberVersioningSystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/TwoNumberVersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/TwoNumberVersioningSystem.java
index 26c0f2c..74eae14 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/versioning/TwoNumberVersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/versioning/TwoNumberVersioningSystem.java
@@ -20,8 +20,8 @@
 package de.staropensource.sosengine.base.data.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
-import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.IncompatibleVersioningSystemException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/DependencyCycleException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/dependency/DependencyCycleException.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/exceptions/DependencyCycleException.java
rename to base/src/main/java/de/staropensource/sosengine/base/exceptions/dependency/DependencyCycleException.java
index 11aa05f..3994471 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/DependencyCycleException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/dependency/DependencyCycleException.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.exceptions;
+package de.staropensource.sosengine.base.exceptions.dependency;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/dependency/UnmetDependenciesException.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java
rename to base/src/main/java/de/staropensource/sosengine/base/exceptions/dependency/UnmetDependenciesException.java
index 5202598..c24225b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/dependency/UnmetDependenciesException.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.exceptions;
+package de.staropensource.sosengine.base.exceptions.dependency;
 
 import de.staropensource.sosengine.base.types.DependencyVector;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/versioning/IncompatibleVersioningSystemException.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java
rename to base/src/main/java/de/staropensource/sosengine/base/exceptions/versioning/IncompatibleVersioningSystemException.java
index 1c0c06a..dcd4f97 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/versioning/IncompatibleVersioningSystemException.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.exceptions;
+package de.staropensource.sosengine.base.exceptions.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/versioning/InvalidVersionStringException.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java
rename to base/src/main/java/de/staropensource/sosengine/base/exceptions/versioning/InvalidVersionStringException.java
index e2b2ee4..3e65590 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/versioning/InvalidVersionStringException.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.exceptions;
+package de.staropensource.sosengine.base.exceptions.versioning;
 
 import de.staropensource.sosengine.base.classes.VersioningSystem;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/DependencyResolver.java b/base/src/main/java/de/staropensource/sosengine/base/utility/DependencyResolver.java
index 3f713f5..7a346d7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/DependencyResolver.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/DependencyResolver.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.utility;
 
 import de.staropensource.sosengine.base.exceptions.UnexpectedThrowableException;
-import de.staropensource.sosengine.base.exceptions.UnmetDependenciesException;
+import de.staropensource.sosengine.base.exceptions.dependency.UnmetDependenciesException;
 import de.staropensource.sosengine.base.types.DependencyVector;
 import de.staropensource.sosengine.base.types.immutable.ImmutableArrayList;
 import de.staropensource.sosengine.base.types.immutable.ImmutableLinkedList;
diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java
index 5de2afa..fb14173 100644
--- a/base/src/main/java/module-info.java
+++ b/base/src/main/java/module-info.java
@@ -20,7 +20,9 @@ module sosengine.base {
     exports de.staropensource.sosengine.base.data.versioning;
     exports de.staropensource.sosengine.base.events;
     exports de.staropensource.sosengine.base.exceptions;
+    exports de.staropensource.sosengine.base.exceptions.dependency;
     exports de.staropensource.sosengine.base.exceptions.reflection;
+    exports de.staropensource.sosengine.base.exceptions.versioning;
     exports de.staropensource.sosengine.base.logging;
     exports de.staropensource.sosengine.base.logging.implementation;
     exports de.staropensource.sosengine.base.reflection;
@@ -46,7 +48,9 @@ module sosengine.base {
     opens de.staropensource.sosengine.base.data.versioning;
     opens de.staropensource.sosengine.base.events;
     opens de.staropensource.sosengine.base.exceptions;
+    opens de.staropensource.sosengine.base.exceptions.dependency;
     opens de.staropensource.sosengine.base.exceptions.reflection;
+    opens de.staropensource.sosengine.base.exceptions.versioning;
     opens de.staropensource.sosengine.base.logging;
     opens de.staropensource.sosengine.base.logging.implementation;
     opens de.staropensource.sosengine.base.reflection;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java
index d31dfa9..6381b9e 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/FourNumberVersioningSystemTest.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.srctests.data.versioning;
 
 import de.staropensource.sosengine.base.data.versioning.FourNumberVersioningSystem;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java
index d83d81b..d8c5b5f 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/OneNumberVersioningSystemTest.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.srctests.data.versioning;
 
 import de.staropensource.sosengine.base.data.versioning.OneNumberVersioningSystem;
 import de.staropensource.sosengine.base.data.versioning.TwoNumberVersioningSystem;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java
index e2d5766..02926b7 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/SemanticVersioningSystemTest.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.srctests.data.versioning;
 
 import de.staropensource.sosengine.base.data.versioning.SemanticVersioningSystem;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java
index 697e718..a83f35f 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/StarOpenSourceVersioningSystemTest.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.srctests.data.versioning;
 
 import de.staropensource.sosengine.base.data.versioning.SemanticVersioningSystem;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java
index 3583951..939e929 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/ThreeNumberVersioningSystemTest.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.srctests.data.versioning;
 
 import de.staropensource.sosengine.base.data.versioning.ThreeNumberVersioningSystem;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java
index cf8bbcb..ee01993 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/data/versioning/TwoNumberVersioningSystemTest.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.srctests.data.versioning;
 
 import de.staropensource.sosengine.base.data.versioning.TwoNumberVersioningSystem;
-import de.staropensource.sosengine.base.exceptions.InvalidVersionStringException;
+import de.staropensource.sosengine.base.exceptions.versioning.InvalidVersionStringException;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/build.gradle b/build.gradle
index 6aff4f5..3446485 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,7 @@ tasks.register("javadocAll", Javadoc) {
         logger.log(LogLevel.WARN, "If this task fails, make sure to reset all module-info.java files using git or you may have issues.")
 
         for (String subproject : subprojects) {
-            File source = new File(project(subproject).projectDir.getPath() + "/src/main/java/module-info.java");
+            File source = new File(project(subproject).projectDir.getPath() + "/src/main/java/module-info.java")
             File target = new File(project(subproject).projectDir.getPath() + "/src/main/module-info.java")
 
             if (source.exists()) {
@@ -76,7 +76,7 @@ tasks.register("javadocAll", Javadoc) {
     }
     doLast {
         for (String subproject : subprojects) {
-            File source = new File(project(subproject).projectDir.getPath() + "/src/main/module-info.java");
+            File source = new File(project(subproject).projectDir.getPath() + "/src/main/module-info.java")
             File target = new File(project(subproject).projectDir.getPath() + "/src/main/java/module-info.java")
 
             if (source.exists()) {