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 5ebcf450..d8c22901 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -22,7 +22,6 @@ package de.staropensource.sosengine.base;
 import de.staropensource.sosengine.base.annotations.EngineSubsystem;
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.events.EngineCrashEvent;
@@ -30,13 +29,14 @@ 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.internal.events.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.internal.types.DependencySubsystemVector;
 import de.staropensource.sosengine.base.logging.CrashHandler;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.dependency.DependencySubsystemVector;
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
 import de.staropensource.sosengine.base.types.immutable.ImmutableLinkedList;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.DependencyResolver;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
index a32ac8a4..99e80067 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
@@ -20,11 +20,11 @@
 package de.staropensource.sosengine.base;
 
 import de.staropensource.sosengine.base.classes.SubsystemConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.logging.CrashHandler;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.converter.AnsiShortcodeConverter;
 import de.staropensource.sosengine.base.utility.parser.PropertyParser;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java b/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java
index 1e571a53..63f22d28 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/annotations/EventListener.java
@@ -19,8 +19,8 @@
 
 package de.staropensource.sosengine.base.annotations;
 
-import de.staropensource.sosengine.base.classes.events.Event;
-import de.staropensource.sosengine.base.classes.events.EventPriority;
+import de.staropensource.sosengine.base.classes.Event;
+import de.staropensource.sosengine.base.types.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.annotation.*;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/events/Event.java b/base/src/main/java/de/staropensource/sosengine/base/classes/Event.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/events/Event.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/Event.java
index 8f400ef0..e622d557 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/events/Event.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/Event.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.events;
+package de.staropensource.sosengine.base.classes;
 
 /**
  * Represents an event.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/classes/LoggerImpl.java
similarity index 92%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/LoggerImpl.java
index b94c88e7..784029d8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/LoggerImpl.java
@@ -17,8 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.logging;
+package de.staropensource.sosengine.base.classes;
 
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/ShortcodeParserSkeleton.java b/base/src/main/java/de/staropensource/sosengine/base/classes/ShortcodeParserSkeleton.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/types/ShortcodeParserSkeleton.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/ShortcodeParserSkeleton.java
index 9ffcbf08..46edba90 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/ShortcodeParserSkeleton.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/ShortcodeParserSkeleton.java
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types;
+package de.staropensource.sosengine.base.classes;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
+import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import lombok.Getter;
 import org.fusesource.jansi.Ansi;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/SubsystemMainClass.java b/base/src/main/java/de/staropensource/sosengine/base/classes/SubsystemMainClass.java
index b9bbc063..d60760ca 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/SubsystemMainClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/SubsystemMainClass.java
@@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.annotations.EventListener;
 import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersioningSystem.java b/base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersioningSystem.java
rename to base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java
index 6a91c446..54c0b4ec 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersioningSystem.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/VersioningSystem.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types.versioning;
+package de.staropensource.sosengine.base.classes;
 
 import de.staropensource.sosengine.base.exceptions.IncompatibleVersioningSystemException;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java b/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
index 3b106917..379de6bc 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/classes/helpers/EventHelper.java
@@ -21,9 +21,9 @@ package de.staropensource.sosengine.base.classes.helpers;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.events.Event;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.logging.Logger;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.ListFormatter;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java b/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java
index f07b9daf..5a7e3f11 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/info/EngineInformation.java
@@ -20,10 +20,10 @@
 package de.staropensource.sosengine.base.data.info;
 
 import de.staropensource.sosengine.base.Engine;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.versioning.VersionType;
+import de.staropensource.sosengine.base.types.VersionType;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.parser.PropertyParser;
 import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java b/base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java
index a675291f..9d2bf6f1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java
@@ -19,9 +19,9 @@
 
 package de.staropensource.sosengine.base.data.info;
 
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.management.ManagementFactory;
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 e592d4d4..3677747c 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
@@ -19,9 +19,9 @@
 
 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.types.versioning.VersioningSystem;
 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 aa6567ea..2bafd528 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
@@ -19,9 +19,9 @@
 
 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.types.versioning.VersioningSystem;
 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 290ab136..26877e54 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
@@ -19,9 +19,9 @@
 
 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.types.versioning.VersioningSystem;
 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 fa492212..999ea1fb 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
@@ -19,10 +19,10 @@
 
 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.types.versioning.VersionType;
-import de.staropensource.sosengine.base.types.versioning.VersioningSystem;
+import de.staropensource.sosengine.base.types.VersionType;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
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 4882bd8e..72923e8c 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
@@ -19,9 +19,9 @@
 
 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.types.versioning.VersioningSystem;
 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 ac1936f8..5f98141d 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
@@ -19,9 +19,9 @@
 
 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.types.versioning.VersioningSystem;
 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/events/EngineCrashEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java
index 3e8fcb4d..092cd7d1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/EngineCrashEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
index 202defb6..019f4fcc 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/EngineShutdownEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/EngineSoftCrashEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/EngineSoftCrashEvent.java
index 4c31250d..65f0464c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/EngineSoftCrashEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/EngineSoftCrashEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
index 6cd32750..e5ce6b4b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/LogEvent.java
@@ -20,10 +20,10 @@
 package de.staropensource.sosengine.base.events;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java b/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java
index 1a62149d..6eb5f324 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/events/ThrowableCatchEvent.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.events;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java
index ef841e99..de2628c4 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/IncompatibleVersioningSystemException.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.exceptions;
 
-import de.staropensource.sosengine.base.types.versioning.VersioningSystem;
+import de.staropensource.sosengine.base.classes.VersioningSystem;
 
 /**
  * Represents an exception caused by supplying an invalid or unexpected versioning system.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java
index d57765df..390c949d 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/InvalidVersionStringException.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.exceptions;
 
-import de.staropensource.sosengine.base.types.versioning.VersioningSystem;
+import de.staropensource.sosengine.base.classes.VersioningSystem;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java b/base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java
index d324cdaa..1139a693 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/exceptions/UnmetDependenciesException.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.exceptions;
 
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java b/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
index 63599fec..5cb0f091 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/events/InternalEngineShutdownEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.internal.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
index 35f417fd..7b10a8cb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerClass.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java
index 12990c73..caffa355 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerCodePart.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java
index 3950d06b..c3140f91 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerInfo.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
index bbbf9164..5be71234 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPackage.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
index 159411a4..217c6a22 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/IssuerPath.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
index 947bff05..b85c60f7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogClass.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java
index 1894c07a..a5eef638 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogCodePart.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
index 9ed48cea..ab351715 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorPrimary.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
index 07a46469..de00dbf5 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogColorSecondary.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java
index 2e4de394..8515bf64 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogInfo.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
index 22636b38..35647275 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogLevel.java
@@ -31,20 +31,20 @@ import org.jetbrains.annotations.NotNull;
 @SuppressWarnings({ "unused" })
 public final class LogLevel implements Placeholder {
     /**
-     * The {@link de.staropensource.sosengine.base.classes.logging.LogLevel} to use.
+     * The {@link de.staropensource.sosengine.base.types.logging.LogLevel} to use.
      *
      * @since 1-alpha0
      */
     @NotNull
-    private final de.staropensource.sosengine.base.classes.logging.LogLevel level;
+    private final de.staropensource.sosengine.base.types.logging.LogLevel level;
 
     /**
      * Constructs this class.
      *
-     * @param level {@link de.staropensource.sosengine.base.classes.logging.LogLevel} to use
+     * @param level {@link de.staropensource.sosengine.base.types.logging.LogLevel} to use
      * @since 1-alpha0
      */
-    public LogLevel(@NotNull de.staropensource.sosengine.base.classes.logging.LogLevel level) {
+    public LogLevel(@NotNull de.staropensource.sosengine.base.types.logging.LogLevel level) {
         this.level = level;
     }
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
index 1eea6ae1..2ca7ac84 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPackage.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
index fb79b993..8698891f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/logger/LogPath.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.internal.placeholders.logger;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencySubsystemVector.java b/base/src/main/java/de/staropensource/sosengine/base/internal/types/DependencySubsystemVector.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencySubsystemVector.java
rename to base/src/main/java/de/staropensource/sosengine/base/internal/types/DependencySubsystemVector.java
index ed20696c..5e1e1364 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencySubsystemVector.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/types/DependencySubsystemVector.java
@@ -17,10 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types.dependency;
+package de.staropensource.sosengine.base.internal.types;
 
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
-import de.staropensource.sosengine.base.types.versioning.VersioningSystem;
+import de.staropensource.sosengine.base.classes.VersioningSystem;
+import de.staropensource.sosengine.base.types.DependencyVector;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java b/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
index c2c41077..0e9dfe62 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/internal/types/QueuedLogMessage.java
@@ -19,8 +19,8 @@
 
 package de.staropensource.sosengine.base.internal.types;
 
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/CrashHandler.java b/base/src/main/java/de/staropensource/sosengine/base/logging/CrashHandler.java
index 3b04c37c..60747097 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/CrashHandler.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/CrashHandler.java
@@ -22,11 +22,11 @@ package de.staropensource.sosengine.base.logging;
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.events.EngineCrashEvent;
 import de.staropensource.sosengine.base.events.EngineSoftCrashEvent;
 import de.staropensource.sosengine.base.internal.placeholders.crashhandler.*;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/Logger.java b/base/src/main/java/de/staropensource/sosengine/base/logging/Logger.java
index 34ac945e..9b0952c8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/Logger.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/Logger.java
@@ -21,13 +21,16 @@ package de.staropensource.sosengine.base.logging;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
+import de.staropensource.sosengine.base.classes.LoggerImpl;
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
-import de.staropensource.sosengine.base.classes.logging.*;
 import de.staropensource.sosengine.base.events.LogEvent;
 import de.staropensource.sosengine.base.internal.placeholders.logger.*;
 import de.staropensource.sosengine.base.internal.types.QueuedLogMessage;
 import de.staropensource.sosengine.base.logging.implementation.ColoredLoggerImpl;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogRule;
+import de.staropensource.sosengine.base.types.logging.LogRuleType;
 import de.staropensource.sosengine.base.utility.PlaceholderEngine;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java b/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java
index fdd90b51..40f294b0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/LoggerInstance.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.logging;
 
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/ColoredLoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/ColoredLoggerImpl.java
index 150305f4..71fa5fe7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/ColoredLoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/ColoredLoggerImpl.java
@@ -20,10 +20,10 @@
 package de.staropensource.sosengine.base.logging.implementation;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
-import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
+import de.staropensource.sosengine.base.classes.LoggerImpl;
 import de.staropensource.sosengine.base.logging.Logger;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.converter.AnsiShortcodeConverter;
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImpl.java
index af09f372..75cc6298 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/PlainLoggerImpl.java
@@ -20,10 +20,10 @@
 package de.staropensource.sosengine.base.logging.implementation;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
-import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
+import de.staropensource.sosengine.base.classes.LoggerImpl;
 import de.staropensource.sosengine.base.logging.Logger;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import de.staropensource.sosengine.base.utility.converter.EmptyShortcodeConverter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImpl.java b/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImpl.java
index 6f9c66cf..65a4a2c7 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImpl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/logging/implementation/RawLoggerImpl.java
@@ -20,10 +20,10 @@
 package de.staropensource.sosengine.base.logging.implementation;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
-import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
+import de.staropensource.sosengine.base.classes.LoggerImpl;
 import de.staropensource.sosengine.base.logging.Logger;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java b/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java
index a9d08b00..e7bd5087 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/CodePart.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.types;
 
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 
 /**
  * Indicates whether the class belongs to the engine, application or modification.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyVector.java b/base/src/main/java/de/staropensource/sosengine/base/types/DependencyVector.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyVector.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/DependencyVector.java
index c25b3cc2..38e8e0ac 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/dependency/DependencyVector.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/DependencyVector.java
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types.dependency;
+package de.staropensource.sosengine.base.types;
 
-import de.staropensource.sosengine.base.types.versioning.VersioningSystem;
+import de.staropensource.sosengine.base.classes.VersioningSystem;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/events/EventPriority.java b/base/src/main/java/de/staropensource/sosengine/base/types/EventPriority.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/events/EventPriority.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/EventPriority.java
index fac956f7..c934b13c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/events/EventPriority.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/EventPriority.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.events;
+package de.staropensource.sosengine.base.types;
 
 import de.staropensource.sosengine.base.annotations.EventListener;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersionType.java b/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersionType.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
index ca09a0e1..4d543169 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/versioning/VersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.types.versioning;
+package de.staropensource.sosengine.base.types;
 
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/events/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/types/immutable/package-info.java
similarity index 89%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/events/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/immutable/package-info.java
index bade504b..238f22ae 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/events/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/immutable/package-info.java
@@ -18,8 +18,8 @@
  */
 
 /**
- * Contains event-related interfaces and classes.
+ * Contains immutable versions of data types.
  *
  * @since 1-alpha1
  */
-package de.staropensource.sosengine.base.classes.events;
+package de.staropensource.sosengine.base.types.immutable;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogIssuer.java b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogIssuer.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogIssuer.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/logging/LogIssuer.java
index c29b4d9a..bd84f487 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogIssuer.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogIssuer.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.logging;
+package de.staropensource.sosengine.base.types.logging;
 
 import de.staropensource.sosengine.base.types.CodePart;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogLevel.java b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogLevel.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogLevel.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/logging/LogLevel.java
index ad2ddd4d..af7641a1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogLevel.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogLevel.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.logging;
+package de.staropensource.sosengine.base.types.logging;
 
 /**
  * Used for determining a log message's priority.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogRule.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/logging/LogRule.java
index 0ef57bb0..dd5d8e31 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRule.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogRule.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.logging;
+package de.staropensource.sosengine.base.types.logging;
 
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRuleType.java b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogRuleType.java
similarity index 95%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRuleType.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/logging/LogRuleType.java
index ea2be235..df9c0edf 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/LogRuleType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/logging/LogRuleType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.classes.logging;
+package de.staropensource.sosengine.base.types.logging;
 
 /**
  * Used for determining if a {@link LogRule} should allow (whitelist) or prevent (blacklist) log call processing.
diff --git a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/types/logging/package-info.java
similarity index 88%
rename from base/src/main/java/de/staropensource/sosengine/base/classes/logging/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/types/logging/package-info.java
index a228545f..ca57a862 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/classes/logging/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/logging/package-info.java
@@ -18,8 +18,8 @@
  */
 
 /**
- * Contains logging-related interfaces and classes.
+ * Contains logging-related data types.
  *
  * @since 1-alpha1
  */
-package de.staropensource.sosengine.base.classes.logging;
+package de.staropensource.sosengine.base.types.logging;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/vectors/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/package-info.java
new file mode 100644
index 00000000..acc7d6f6
--- /dev/null
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/vectors/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * STAROPENSOURCE ENGINE SOURCE FILE
+ * Copyright (c) 2024 The StarOpenSource Engine Contributors
+ * Licensed under the GNU Affero General Public License v3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Contains data types operating with numbers.
+ *
+ * @since 1-alpha1
+ */
+package de.staropensource.sosengine.base.types.vectors;
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 314aa885..e783671c 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
@@ -21,7 +21,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.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
 import de.staropensource.sosengine.base.types.immutable.ImmutableArrayList;
 import de.staropensource.sosengine.base.types.immutable.ImmutableLinkedList;
 import lombok.Getter;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java b/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
index 0b20023b..7e831e31 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
@@ -21,10 +21,10 @@ package de.staropensource.sosengine.base.utility;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.internal.placeholders.*;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/AnsiShortcodeConverter.java b/base/src/main/java/de/staropensource/sosengine/base/utility/converter/AnsiShortcodeConverter.java
index 5373bca1..e2e08bec 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/AnsiShortcodeConverter.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/converter/AnsiShortcodeConverter.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.utility.converter;
 
-import de.staropensource.sosengine.base.types.ShortcodeParserSkeleton;
+import de.staropensource.sosengine.base.classes.ShortcodeParserSkeleton;
 import org.fusesource.jansi.Ansi;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java b/base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java
index 70f61ab5..1c3686af 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/converter/EmptyShortcodeConverter.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.utility.converter;
 
-import de.staropensource.sosengine.base.types.ShortcodeParserSkeleton;
+import de.staropensource.sosengine.base.classes.ShortcodeParserSkeleton;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java
index 6b5a35c3..16433058 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/parser/PropertyParser.java
@@ -19,10 +19,10 @@
 
 package de.staropensource.sosengine.base.utility.parser;
 
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
 import de.staropensource.sosengine.base.types.Tristate;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java b/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
index 0a8212ae..cacd48db 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittests/UnitConfig.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.unittests;
 
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 
 /**
  * Static configuration for the sos!engine unit testing helpers.
diff --git a/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java b/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
index e8a7d578..84031c0b 100644
--- a/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
+++ b/base/src/main/java/de/staropensource/sosengine/unittests/UnitLogger.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.unittests;
 
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java
index e42c9947..9abd19de 100644
--- a/base/src/main/java/module-info.java
+++ b/base/src/main/java/module-info.java
@@ -15,9 +15,8 @@ module sosengine.base {
     exports de.staropensource.sosengine.base;
     exports de.staropensource.sosengine.base.annotations;
     exports de.staropensource.sosengine.base.classes;
-    exports de.staropensource.sosengine.base.classes.events;
     exports de.staropensource.sosengine.base.classes.helpers;
-    exports de.staropensource.sosengine.base.classes.logging;
+    exports de.staropensource.sosengine.base.types.logging;
     exports de.staropensource.sosengine.base.data.info;
     exports de.staropensource.sosengine.base.data.versioning;
     exports de.staropensource.sosengine.base.events;
@@ -25,10 +24,8 @@ module sosengine.base {
     exports de.staropensource.sosengine.base.logging;
     exports de.staropensource.sosengine.base.logging.implementation;
     exports de.staropensource.sosengine.base.types;
-    exports de.staropensource.sosengine.base.types.dependency;
     exports de.staropensource.sosengine.base.types.immutable;
     exports de.staropensource.sosengine.base.types.vectors;
-    exports de.staropensource.sosengine.base.types.versioning;
     exports de.staropensource.sosengine.base.utility;
     exports de.staropensource.sosengine.base.utility.converter;
     exports de.staropensource.sosengine.base.utility.parser;
@@ -41,9 +38,8 @@ module sosengine.base {
     opens de.staropensource.sosengine.base;
     opens de.staropensource.sosengine.base.annotations;
     opens de.staropensource.sosengine.base.classes;
-    opens de.staropensource.sosengine.base.classes.events;
     opens de.staropensource.sosengine.base.classes.helpers;
-    opens de.staropensource.sosengine.base.classes.logging;
+    opens de.staropensource.sosengine.base.types.logging;
     opens de.staropensource.sosengine.base.data.info;
     opens de.staropensource.sosengine.base.data.versioning;
     opens de.staropensource.sosengine.base.events;
@@ -51,10 +47,8 @@ module sosengine.base {
     opens de.staropensource.sosengine.base.logging;
     opens de.staropensource.sosengine.base.logging.implementation;
     opens de.staropensource.sosengine.base.types;
-    opens de.staropensource.sosengine.base.types.dependency;
     opens de.staropensource.sosengine.base.types.immutable;
     opens de.staropensource.sosengine.base.types.vectors;
-    opens de.staropensource.sosengine.base.types.versioning;
     opens de.staropensource.sosengine.base.utility;
     opens de.staropensource.sosengine.base.utility.converter;
     opens de.staropensource.sosengine.base.utility.parser;
diff --git a/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java b/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
index df8225c8..f1371271 100644
--- a/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
+++ b/base/src/test/java/de/staropensource/sosengine/base/srctests/EngineConfigurationTest.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.srctests;
 
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import de.staropensource.sosengine.unittests.UnitLogger;
 import org.jetbrains.annotations.NotNull;
 import org.joor.Reflect;
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
index 4d09b082..710ba2eb 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
@@ -21,14 +21,14 @@ package de.staropensource.sosengine.graphics.opengl;
 
 import de.staropensource.sosengine.base.annotations.EngineSubsystem;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
+import de.staropensource.sosengine.base.types.EventPriority;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java
index 6a04f05e..6be78b0c 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/classes/Window.java
@@ -19,9 +19,9 @@
 
 package de.staropensource.sosengine.graphics.opengl.classes;
 
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.events.GraphicsApiErrorEvent;
 import lombok.Getter;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
index 8faafb64..0328f8ec 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystem.java
@@ -22,15 +22,15 @@ package de.staropensource.sosengine.graphics;
 import de.staropensource.sosengine.base.annotations.EngineSubsystem;
 import de.staropensource.sosengine.base.annotations.EventListener;
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
-import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
+import de.staropensource.sosengine.base.types.EventPriority;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.ListFormatter;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
index 00278f68..69884ea0 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/GraphicsSubsystemConfiguration.java
@@ -20,9 +20,9 @@
 package de.staropensource.sosengine.graphics;
 
 import de.staropensource.sosengine.base.classes.SubsystemConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.parser.PropertyParser;
 import de.staropensource.sosengine.graphics.events.GraphicsErrorEvent;
 import lombok.Getter;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java
index 1ef88eea..7fd826b5 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/classes/ApiMainClass.java
@@ -22,8 +22,8 @@ package de.staropensource.sosengine.graphics.classes;
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.annotations.EventListener;
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
-import de.staropensource.sosengine.base.classes.events.EventPriority;
 import de.staropensource.sosengine.base.internal.events.InternalEngineShutdownEvent;
+import de.staropensource.sosengine.base.types.EventPriority;
 import de.staropensource.sosengine.graphics.events.GraphicsErrorEvent;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java
index fcb70abd..c6131702 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiErrorEvent.java
@@ -19,11 +19,11 @@
 
 package de.staropensource.sosengine.graphics.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.events.LogEvent;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java
index 3b742bfc..453bac91 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsApiShutdownEvent.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.graphics.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 
 /**
diff --git a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
index 0c35f91c..d110652d 100644
--- a/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
+++ b/graphics/src/main/java/de/staropensource/sosengine/graphics/events/GraphicsErrorEvent.java
@@ -19,11 +19,11 @@
 
 package de.staropensource.sosengine.graphics.events;
 
-import de.staropensource.sosengine.base.classes.events.Event;
+import de.staropensource.sosengine.base.classes.Event;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.events.LogEvent;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java
index 714d6c03..01b425fa 100644
--- a/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java
+++ b/graphics/vulkan/src/main/java/de/staropensource/sosengine/graphics/vulkan/VulkanSubsystem.java
@@ -21,13 +21,13 @@ package de.staropensource.sosengine.graphics.vulkan;
 
 import de.staropensource.sosengine.base.annotations.EngineSubsystem;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.events.EventPriority;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
+import de.staropensource.sosengine.base.types.EventPriority;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
diff --git a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java
index e5a0d873..637797ba 100644
--- a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java
+++ b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/CompatibilityLogger.java
@@ -21,10 +21,10 @@ package de.staropensource.sosengine.slf4j_compat;
 
 import de.staropensource.sosengine.base.Engine;
 import de.staropensource.sosengine.base.EngineConfiguration;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.classes.logging.LogLevel;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
+import de.staropensource.sosengine.base.types.logging.LogLevel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Marker;
diff --git a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java
index 28bd7c77..4920cf86 100644
--- a/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java
+++ b/slf4j-compat/src/main/java/de/staropensource/sosengine/slf4j_compat/Slf4jCompatibilitySubsystem.java
@@ -21,13 +21,13 @@ package de.staropensource.sosengine.slf4j_compat;
 
 import de.staropensource.sosengine.base.annotations.EngineSubsystem;
 import de.staropensource.sosengine.base.classes.SubsystemMainClass;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.events.LogEvent;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
-import de.staropensource.sosengine.base.types.dependency.DependencyVector;
+import de.staropensource.sosengine.base.types.DependencyVector;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java b/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
index ed4f29d9..bac35c36 100644
--- a/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
+++ b/testapp/src/main/java/de/staropensource/sosengine/testapp/Main.java
@@ -20,9 +20,9 @@
 package de.staropensource.sosengine.testapp;
 
 import de.staropensource.sosengine.base.Engine;
-import de.staropensource.sosengine.base.classes.logging.LogIssuer;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
+import de.staropensource.sosengine.base.types.logging.LogIssuer;
 import de.staropensource.sosengine.base.types.vectors.Vec2i;
 import de.staropensource.sosengine.graphics.GraphicsSubsystem;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;